summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@src.gnome.org>1999-11-17 21:56:52 +0000
committerJeff Garzik <jgarzik@src.gnome.org>1999-11-17 21:56:52 +0000
commit393765887663d0cc72fac9ef4dd007fea84223ba (patch)
tree5ec55fdf078cefc1fe550afcd9b93be3580c2e70
parent86b06bf1f907c7d1747926e8a79df0c06452a1db (diff)
downloadshared-mime-info-393765887663d0cc72fac9ef4dd007fea84223ba.tar.gz
Revert previous check-in, wasnt supposed to be committed yet
svn path=/trunk/; revision=999
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-xml-check.m43
2 files changed, 1 insertions, 7 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index c9f129e0..5084178e 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,8 +1,3 @@
-1999-11-16 Jeff Garzik <jgarzik@mandrakesoft.com>
-
- * gnome-xml-check.m4: always AC_SUBST GNOME_XML_LIB, so that
- output variable will always be present.
-
1999-11-09 Eskil Heyn Olsen <deity@eskil.dk>
* gnome-pilot.m4: uses test -r instead of test -e, was reported as
diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4
index e43f4258..2410f35d 100644
--- a/macros/gnome-xml-check.m4
+++ b/macros/gnome-xml-check.m4
@@ -7,8 +7,6 @@ dnl Check for availability of the libxml library
dnl the XML parser uses libz if available too
dnl
-AC_SUBST(GNOME_XML_LIB)
-
AC_DEFUN([GNOME_XML_HOOK],[
AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
if test "$GNOME_CONFIG" = no; then
@@ -18,6 +16,7 @@ AC_DEFUN([GNOME_XML_HOOK],[
fi
AC_CHECK_LIB(xml, xmlNewDoc, [
$1
+ AC_SUBST(GNOME_XML_LIB)
GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
], [
if test x$2 = xfailure; then