Changeset 1746

Timestamp:

08/11/11 14:50:29 (7 months ago)

Author:

Freddie Akeroyd

Message:

Fix libxml2 reference on RHEL5. Refs #300

File:

• trunk/configure.ac (modified) (5 diffs)

trunk/configure.ac

@@ -366 +366 @@
 AC_SUBST(SHARED_EXT)
 
-AC_CHECK_LIB(xml2, [xml_parse_file, xmlParseFile])
-if test "x$ac_cv_lib_xml2_xml_parse_file__xmlParseFile" = xyes; then
+AC_CHECK_LIB(xml2, [xmlParseFile])
+if test "x$ac_cv_lib_xml2_xmlParseFile" = xyes; then
     LIBXML2_CFLAGS='`xml2-config --cflags`'
-    HAVE_LIBXML2="yes"
+    LIBXML2_MESSAGE="yes"
 else
     LIBXML2_CFLAGS=''
-    HAVE_LIBXML2="no (will not build NXsummary or NXtranslate)"
+    LIBXML2_MESSAGE="no (will not build NXsummary or NXtranslate)"
 fi
 AC_SUBST(LIBXML2_CFLAGS)
@@ -555 +555 @@
         done
     done
+    for i in $HDF5SEARCH; do
+        for j in lib lib64; do
+            if test -z "$H5ROOT" -a -r ${i}/$j/libhdf5.a; then H5ROOT=$i; fi
+        done
+    done
     if test -z "$H5ROOT"; then 
         AC_MSG_RESULT(unknown)
@@ -652 +657 @@
 AC_CHECK_LIB(mfhdf, SDcreate)
 AC_CHECK_LIB(hdf5, H5open)
-AC_CHECK_LIB(xml2, xmlParseDocument)
 AC_CHECK_LIB(termcap, tputs)
 AC_CHECK_LIB(readline, readline)
@@ -718 +722 @@
 AM_CONDITIONAL(HAVE_HDF5, [test ! -z "$H5ROOT"])
 AM_CONDITIONAL(HAVE_XML, [test ! -z "$MXMLROOT"])
-AM_CONDITIONAL(HAVE_LIBXML2, [ test "$ac_cv_lib_xml2_xmlParseDocument" = "yes" ])
+AM_CONDITIONAL(HAVE_LIBXML2, [ test "$ac_cv_lib_xml2_xmlParseFile" = "yes" ])
 dnl AM_CONDITIONAL(HAVE_LIBMXMLPLUS, [ test "$ac_cv_lib_mxmlplus__ZN4MXML4NodeD2Ev" = "yes" ])
 AM_CONDITIONAL(HAVE_DOCBOOK, [test ! -z "$DOCBOOK2TXT" -a ! -z "$DOCBOOK2PDF"])
@@ -903 +907 @@
         application tools:
              ant:              ${ANT_PROG}
-             libxml2:          ${HAVE_LIBXML2}
+             libxml2:          ${LIBXML2_MESSAGE}
              readline:         ${HAVE_READLINE}