From: Luca Padovani <luca.padovani@unito.it>
Date: Thu, 1 Mar 2001 12:38:29 +0000 (+0000)
Subject: patch for libxml2 new release
X-Git-Tag: v0_1_2~102
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=62c4aba9c4c2c182b04e550238903139fdd794f9;p=helm.git

patch for libxml2 new release
---

diff --git a/helm/minidom/Makefile.am b/helm/minidom/Makefile.am
index e73dd9b76..2bc9d7189 100644
--- 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 f8674dbe1..5e395485b 100644
--- 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 cdae66aaa..5ed302925 100644
--- 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