diff options
| author | Mark Crichton <crichton@src.gnome.org> | 1998-09-04 12:45:54 +0000 |
|---|---|---|
| committer | Mark Crichton <crichton@src.gnome.org> | 1998-09-04 12:45:54 +0000 |
| commit | 3c0de4f7babfb9bf83456398f27c66bd2fe05de1 (patch) | |
| tree | c15d6ea4c0047992b8cbf3c0f794e0e6f9032f10 | |
| parent | 31622955e41cf8a5da9c268075b2ca4e29697077 (diff) | |
| download | shared-mime-info-3c0de4f7babfb9bf83456398f27c66bd2fe05de1.tar.gz | |
Revamped the GNOME_XML_CHECK macro. Now acts (somewhat) like the
Revamped the GNOME_XML_CHECK macro. Now acts (somewhat) like the GNOME_INIT
and GNOME_INIT_HOOK macros. The GNOME_XML_CHECK macro will abort a config
if XML is not found. GNOME_XML_HOOK will set GNOME_XML_LIB to the value
"iswwci"
Need to continue thinking how to better handle the not-found-but-I-can-survive-
without-it case a little more...
Mark Crichton
svn path=/trunk/; revision=378
| -rw-r--r-- | macros/gnome-xml-check.m4 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4 index 6649890f..9406b640 100644 --- a/macros/gnome-xml-check.m4 +++ b/macros/gnome-xml-check.m4 @@ -2,7 +2,8 @@ dnl dnl Check for availability of the libxml library dnl the XML parser uses libz if available too dnl -AC_DEFUN([GNOME_XML_CHECK],[ + +AC_DEFUN([GNOME_XML_HOOK],[ dnl Checks for zlib library. Z_LIBS= AC_CHECK_LIB(z, inflate, @@ -11,7 +12,17 @@ AC_DEFUN([GNOME_XML_CHECK],[ AC_REQUIRE([GNOME_INIT_HOOK]) GNOME_XML_LIB="" AC_CHECK_LIB(xml, xmlNewDoc, GNOME_XML_LIB="-lxml", - ,-L$gnome_prefix $Z_LIBS) + GNOME_XML_LIB="itwwci", -L$gnome_prefix $Z_LIBS) AC_SUBST(GNOME_XML_LIB) - AC_PROVIDE([GNOME_XML_CHECK]) + AC_PROVIDE([GNOME_XML_HOOK]) + + if test "$GNOME_XML_LIB" = "itwwci"; then + if test x$2 = xfailure; then + AC_MSG_ERROR(Could not find xml) + fi + fi +]) + +AC_DEFUN([GNOME_XML_CHECK], [ + GNOME_XML_HOOK([],failure) ]) |