@@ -5,6 +5,7 @@ AC_ARG_ENABLE([xml],

 want_xml=$enableval, want_xml="auto")

 XML_HOME=""

+xmlconfig=""

 if test "X$want_xml" != "Xno"; then

   AC_MSG_CHECKING([for libxml2 installation])

   AC_ARG_WITH([xml],

@@ -27,6 +28,7 @@ if test "X$want_xml" != "Xno"; then

   if test "x$XML_HOME" != "x"; then

     AC_MSG_RESULT([$XML_HOME])

+    with_xml="yes"

   else

     AC_MSG_RESULT([not found])

   fi

@@ -35,26 +37,47 @@ if test "X$want_xml" != "Xno"; then

   XMLCONF_VERSION=""

   XML_CPPFLAGS=""

   XML_LIBS=""

-  if test "x$XML_HOME" != "x"; then

-    AC_MSG_CHECKING([xml2-config version])

-    XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"

-    if test "x%XMLCONF_VERSION" != "x"; then

-      AC_MSG_RESULT([$XMLCONF_VERSION])

-      found_xml="yes"

-      XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"

-      XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"

-      AS_ECHO("$XML_CPPFLAGS")

-      AS_ECHO("$XML_LIBS")

-    else

-      AC_MSG_ERROR([xml2-config failed])

-    fi

-  fi

+  case "$with_xml" in

+    yes) AC_PATH_PROG([xmlconfig], [xml2-config])

+        if test "x$xmlconfig" = x ; then

+            AC_MSG_NOTICE([can not locate xml2-config in PATH, will search default XML_HOME variants])

+            

+            if test "x$XML_HOME" != "x"; then

+                AC_MSG_CHECKING([xml2-config version])

+                XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"

+

+                if test "x%XMLCONF_VERSION" != "x"; then

+                    AC_MSG_RESULT([$XMLCONF_VERSION])

+                    found_xml="yes"

+                    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"

+                    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"

+                    AS_ECHO("$XML_CPPFLAGS")

+                    AS_ECHO("$XML_LIBS")

+                else

+                    AC_MSG_ERROR([xml2-config failed])

+                fi

+            fi

+        else

+            found_xml="yes"

+            XMLCONF_VERSION="`$xmlconfig --version`"

+            XML_CPPFLAGS="`$xmlconfig --cflags`"

+            XML_LIBS="`$xmlconfig --libs`"

+        fi

+  esac

   working_xml="no"

   if test "X$found_xml" != "Xno"; then

-    AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])

-    if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then

+    readerresult=""

+    if test "x$xmlconfig" = x ; then

+        readerresult="$XML_HOME/include/libxml2/libxml/xmlreader.h"

+    else

+        readerresult="`$xmlconfig --prefix`/include/libxml2/libxml/xmlreader.h"

+    fi

+    

+    AC_MSG_CHECKING([for xmlreader.h in $readerresult])

+    

+    if test ! -f "$readerresult"; then

       AC_MSG_RESULT([not found])

     else

       AC_MSG_RESULT([found])