-AC_CHECK_LIB(xml, xmlParseDocument,
- [
- CFLAGS="$CFLAGS `xml-config --cflags`"
- CXXFLAGS="$CXXFLAGS `xml-config --cflags`"
- LIBS="$LIBS `xml-config --libs`"
- ],
- ,
- `xml-config --libs`
-)
+AC_CHECK_PROG(XML_CONFIG, xml2-config, xml2-config, no)
+if test $XML_CONFIG = "no"; then
+ AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config, no)
+fi
+AC_SUBST(XML_CONFIG)
+
+if test $XML_CONFIG = "no"; then
+ AC_MSG_ERROR(could not find configuration script for libxml)
+fi
+
+if test $XML_CONFIG = "xml2-config" -a $libxml2 = "auto"; then
+ libxml2="yes"
+fi
+
+CFLAGS="$CFLAGS `$XML_CONFIG --cflags`"
+CXXFLAGS="$CXXFLAGS `$XML_CONFIG --cflags`"
+LIBS="$LIBS `$XML_CONFIG --libs`"