diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1998-09-08 01:30:43 +0800 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-09-08 01:30:43 +0800 |
| commit | 3fc82537c59b03c0c0c927d47a7126c85d7b08f6 (patch) | |
| tree | a3e61586cf5f83d54ee8963a4349c780ed920558 | |
| parent | 40be5aa2abf0aa471f32122f4a9028922f94090d (diff) | |
| download | gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar.gz gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar.bz2 gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar.lz gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar.xz gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.tar.zst gsoc2013-evolution-3fc82537c59b03c0c0c927d47a7126c85d7b08f6.zip | |
Fixed detection of xml in gnome-xml macros -mig
svn path=/trunk/; revision=364
| -rw-r--r-- | macros/gnome-xml-check.m4 | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/macros/gnome-xml-check.m4 b/macros/gnome-xml-check.m4 index 9406b640cc..5788770905 100644 --- a/macros/gnome-xml-check.m4 +++ b/macros/gnome-xml-check.m4 @@ -1,26 +1,24 @@ dnl +dnl GNOME_XML_HOOK (script-if-xml-found, failflag) +dnl +dnl If failflag is "failure", script aborts due to lack of XML +dnl dnl Check for availability of the libxml library dnl the XML parser uses libz if available too dnl AC_DEFUN([GNOME_XML_HOOK],[ - dnl Checks for zlib library. - Z_LIBS= - AC_CHECK_LIB(z, inflate, - AC_CHECK_HEADER(zlib.h, Z_LIBS="-lz")) - - AC_REQUIRE([GNOME_INIT_HOOK]) - GNOME_XML_LIB="" - AC_CHECK_LIB(xml, xmlNewDoc, GNOME_XML_LIB="-lxml", - GNOME_XML_LIB="itwwci", -L$gnome_prefix $Z_LIBS) - AC_SUBST(GNOME_XML_LIB) - AC_PROVIDE([GNOME_XML_HOOK]) - - if test "$GNOME_XML_LIB" = "itwwci"; then + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + if test "$GNOME_CONFIG" = no; then if test x$2 = xfailure; then - AC_MSG_ERROR(Could not find xml) + AC_MSG_ERROR(Could not find gnome-config) fi fi + AC_CHECK_LIB(xml, xmlNewDoc, [$1], [ + if text x$2 = failure; then + AC_MSG_ERROR(Could not link sample xml program) + fi + ], gnome-config --libs xml) ]) AC_DEFUN([GNOME_XML_CHECK], [ |