[Gnash-commit] gnash ChangeLog macros/glib.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/28 01:27:48

Modified files:
        .              : ChangeLog 
        macros         : glib.m4 

Log message:
        * macros/glib.m4: Fix the fix of --with-glib-lib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.542&r2=1.543
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -b -r1.542 -r1.543
--- ChangeLog   27 Jul 2006 17:30:50 -0000      1.542
+++ ChangeLog   28 Jul 2006 01:27:48 -0000      1.543
@@ -1,3 +1,7 @@
+2006-07-27 Sandro Santilli <address@hidden>
+
+       * macros/glib.m4: Fix the fix of --with-glib-lib.
+
 2006-07-27  Rob Savoye  <address@hidden>
 
        * macros/glib.m4: Fix --with-glib-incl and --with-glib-lib options

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/glib.m4      27 Jul 2006 17:30:50 -0000      1.12
+++ macros/glib.m4      28 Jul 2006 01:27:48 -0000      1.13
@@ -133,7 +133,16 @@
         fi
       done
     ])
-  else
+  fi
+
+dnl
+dnl The problem with these macros is that ac_cv_path_package_lib
+dnl is ambiguos. Sometimes it refers to a directory, some other
+dnl times it refers to full LDFLAGS
+dnl
+
+if false; then
+dnl  else
     if test -f $i/libglib-${gnash_glib_version}.a -o -f 
$i/libglib-${gnash_glib_version}.so; then
       if test x"${ac_cv_path_glib_lib}" != x"/usr/lib"; then
         ac_cv_path_glib_lib="-L${ac_cv_path_glib_lib} 
-lglib-${gnash_glib_version}"
@@ -141,7 +150,8 @@
         ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"
       fi
     fi
-  fi
+dnl  fi
+fi
 
   if test x"${ac_cv_path_glib_incl}" != x ; then
     libslist="${with_glib_lib} ${ac_cv_path_glib_incl}/../../lib 
${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib 
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."