patch for libxml2 new release

diff --git a/helm/minidom/Makefile.am b/helm/minidom/Makefile.am
index e73dd9b761b34e577fbcb126a8ce73273b328565..2bc9d7189dbb9d63a0606018c620de8d1e03c7ad 100644 (file)
--- a/helm/minidom/Makefile.am
+++ b/helm/minidom/Makefile.am
@@ -18,6 +18,7 @@ minidom-config: minidom-config.in
        @echo "#!/bin/sh" >minidom-config
        @echo >>minidom-config
        @echo VERSION=\"$(VERSION)\" >>minidom-config
+       @echo XML_CONFIG=\"$(XML_CONFIG)\" >>minidom-config
        @echo libdir=\"$(libdir)\" >>minidom-config
        @echo pkglibdir=\"$(pkglibdir)\" >>minidom-config
        @echo includedir=\"$(includedir)\" >>minidom-config

diff --git a/helm/minidom/configure.in b/helm/minidom/configure.in
index f8674dbe14462760eb8ff4cbcd215eb310cd622c..5e395485b8aaecc2264bce32ea27c03af3cdfe86 100644 (file)
--- a/helm/minidom/configure.in
+++ b/helm/minidom/configure.in
@@ -39,6 +39,7 @@ AC_CHECK_LIB(glib, g_malloc,
 
 AC_CHECK_PROG(XML_CONFIG, xml2-config, xml2-config)
 AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config, no)
+AC_SUBST(XML_CONFIG)
 
 if test $XML_CONFIG = "no"; then
        AC_MSG_ERROR(could not find configuration script for libxml)

diff --git a/helm/minidom/minidom-config.in b/helm/minidom/minidom-config.in
index cdae66aaa7c56dab1aa9234e64945de3dbf01a83..5ed30292533088ac67e6218a5a35f3851f2e25b8 100644 (file)
--- a/helm/minidom/minidom-config.in
+++ b/helm/minidom/minidom-config.in
@@ -39,10 +39,10 @@ while test $# -gt 0; do
 done
 
 if test "$echo_cflags" = "yes"; then
-    echo `xml-config --cflags` -I$pkgincludedir
+    echo `$XML_CONFIG --cflags` -I$pkgincludedir
 fi
 
 if test "$echo_libs" = "yes"; then
-    echo `xml-config --libs` -L$libdir -lminidom
+    echo `$XML_CONFIG --libs` -L$libdir -lminidom
 fi