merge from branch DEV tag mergeto_trunk_04apr08

[modules/yacs.git] / adm / unix / config_files / check_libxml.m4

diff --git a/adm/unix/config_files/check_libxml.m4 b/adm/unix/config_files/check_libxml.m4
index bc43b49025c6d9a21759fbcffff26d0ca3020c05..eaa329e14189545c8d73739dfcc13650e1120a80 100644 (file)
--- a/adm/unix/config_files/check_libxml.m4
+++ b/adm/unix/config_files/check_libxml.m4
@@ -3,17 +3,27 @@ AC_DEFUN([AC_CHECK_LIBXML],[
 
 AC_CHECKING(for libxml)
 
+CPPFLAGS_old=$CPPFLAGS
+CXXFLAGS_old=$CXXFLAGS
+
 # Custom location of libxml2 package can be specified
 # thorugh LIBXML_DIR variable
 if test "x$LIBXML_DIR" != "x"
 then
   CPPFLAGS="$CPPFLAGS -I$LIBXML_DIR/include/libxml2"
   CXXFLAGS="$CXXFLAGS -I$LIBXML_DIR/include/libxml2"
-  TMPLIBS="-L$LIBXML_DIR/lib -lxml2 $LIBS"
+  if test "x$LIBXML_DIR" = "x/usr"
+  then
+    TMPLIBS="-lxml2 $LIBS"
+  else
+    TMPLIBS="-L$LIBXML_DIR/lib -lxml2 $LIBS"
+  fi
+  LIBXML_INCLUDES="-I$LIBXML_DIR/include/libxml2"
 else
   CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
   CXXFLAGS="$CXXFLAGS -I/usr/include/libxml2"
   TMPLIBS="-lxml2 $LIBS"
+  LIBXML_INCLUDES="-I/usr/include/libxml2"
 fi
 
 AC_CHECK_HEADER(libxml/parser.h,libxml_ok="yes",libxml_ok="no")
@@ -28,13 +38,16 @@ fi
 
 if test "x$libxml_ok" = "xyes"
 then
-  LIBS=$TMPLIBS
+  LIBXML_LIBS=$TMPLIBS
 fi
 
 AC_MSG_RESULT(for libxml: $libxml_ok)
 
-LIBXML_LIBS=$LIBS
+CXXFLAGS=$CXXFLAGS_old
+CPPFLAGS=$CPPFLAGS_old
+
 AC_SUBST(LIBXML_LIBS)
+AC_SUBST(LIBXML_INCLUDES)
 
 ])dnl
 dnl