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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/28 11:39:17

Modified files:
        .              : ChangeLog 
        macros         : libXML.m4 

Log message:
                * macros/libXML.m4: don't use -L when lib dir is /usr/lib
                  (this prevents polluting the libs search path).
                  Note that this won't work if xml2-config spits out -L/usr/lib,
                  but you can still override it with explicit 
--with-xml-libraries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.544&r2=1.545
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -b -r1.544 -r1.545
--- ChangeLog   28 Jul 2006 02:36:38 -0000      1.544
+++ ChangeLog   28 Jul 2006 11:39:17 -0000      1.545
@@ -1,3 +1,10 @@
+2006-07-28 Sandro Santilli <address@hidden>
+
+       * macros/libXML.m4: don't use -L when lib dir is /usr/lib
+          (this prevents polluting the libs search path).
+         Note that this won't work if xml2-config spits out -L/usr/lib,
+          but you can still override it with explicit --with-xml-libraries.
+
 2006-07-27 Sandro Santilli <address@hidden>
 
        * utilities/Makefile.am: remove all LIBS references, deps

Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/libXML.m4    24 Apr 2006 23:05:55 -0000      1.16
+++ macros/libXML.m4    28 Jul 2006 11:39:17 -0000      1.17
@@ -45,9 +45,17 @@
 dnl AC_ARG_ENABLE(libxmltest, [  --disable-libxmltest       Do not try to 
compile and run a test libxml program],, enable_libxmltest=yes)
 
   if test "x$libxml_libraries" != "x" ; then
+    if test x"$libxml_libraries" != x"/usr/lib"; then
     LIBXML_LIBS="-L$libxml_libraries -lxml2"
+    else
+      LIBXML_LIBS="-lxml2"
+    fi
   elif test "x$libxml_prefix" != "x" ; then
+    if test x"$libxml_prefix" != x"/usr"; then
     LIBXML_LIBS="-L$libxml_prefix/lib -lxml2"
+    else
+      LIBXML_LIBS="-lxml2"
+    fi
   fi
 
   if test "x$libxml_includes" != "x" ; then
@@ -60,6 +68,9 @@
   dnl
   dnl Give xml2-config a chance
   dnl
+  dnl NOTE: LIBXML_LIBS might end up containing
+  dnl       -L/usr/lib, which I really want to avoid!
+  dnl
   #no_libxml=""
   AC_PATH_PROG(XML2_CONFIG, xml2-config, , ,[$PATH])
   if test "x$XML2_CONFIG" != "x" ; then
@@ -93,8 +104,13 @@
       if test "x$LIBXML_LIBS" = "x"; then
         for j in `ls -dr $i/lib 2>/dev/null ` ; do
          if test -f $j/libxml2.so; then
+           if test x"$j" != x"/usr/lib"; then
            LIBXML_LIBS="-L`(cd $j; pwd)` -lxml2"
            break
+           else
+             LIBXML_LIBS="-lxml2"
+             break
+           fi
          fi
         done
       fi