aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@src.gnome.org>1999-11-18 05:56:52 +0800
committerJeff Garzik <jgarzik@src.gnome.org>1999-11-18 05:56:52 +0800
commitd8eae19b7cd8e6a336d4d38e8b5deac27882403c (patch)
tree1a27d07ac622d3d8a90bb7215bb60d6b34df1055
parent1a6e677ae7824081451a6e8f9e93b7fa046c6d6e (diff)
downloadgsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar.gz
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar.bz2
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar.lz
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar.xz
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.tar.zst
gsoc2013-evolution-d8eae19b7cd8e6a336d4d38e8b5deac27882403c.zip
Revert previous check-in, wasnt supposed to be committed yet
svn path=/trunk/; revision=1401
-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 c9f129e0e3..5084178e6f 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 e43f4258c8..2410f35db7 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