diff options
| author | Mark Crichton <crichton@src.gnome.org> | 1998-09-04 20:45:54 +0800 |
|---|---|---|
| committer | Mark Crichton <crichton@src.gnome.org> | 1998-09-04 20:45:54 +0800 |
| commit | df67e4e802d55da255b41f239055344f2d3741b6 (patch) | |
| tree | b0f318ab426312b34fa0f8a716325d860ee01b75 /macros | |
| parent | 84fa00e42a593a4e4e64866090df30c9d7c066b9 (diff) | |
| download | gsoc2013-evolution-df67e4e802d55da255b41f239055344f2d3741b6.tar.gz gsoc2013-evolution-df67e4e802d55da255b41f239055344f2d3741b6.tar.zst gsoc2013-evolution-df67e4e802d55da255b41f239055344f2d3741b6.zip | |
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=362
Diffstat (limited to 'macros')
| -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 6649890fb6..9406b640cc 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) ]) |