From bb15be7198839db060aec051034b8ba8d32c5e9a Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Wed, 12 Jan 2000 16:13:56 +0000 Subject: [PATCH] New file to check for libxml. 2000-01-12 Martin Baulig * xml.m4: New file to check for libxml. * configure.in: Call `LIBGTOP_XML_HOOK' from `xml.m4' and add libxml libraries to `LIBGTOP_EXTRA_LIBS' when found. --- ChangeLog | 7 +++++++ configure.in | 4 +++- xml.m4 | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 xml.m4 diff --git a/ChangeLog b/ChangeLog index 828c45be..c49f65cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-01-12 Martin Baulig + + * xml.m4: New file to check for libxml. + + * configure.in: Call `LIBGTOP_XML_HOOK' from `xml.m4' and + add libxml libraries to `LIBGTOP_EXTRA_LIBS' when found. + 2000-01-12 Martin Baulig * lib/sysdeps.c (_glibtop_init_hook_s): This has been moved diff --git a/configure.in b/configure.in index 5c25fd78..55073c0a 100644 --- a/configure.in +++ b/configure.in @@ -113,11 +113,13 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) GNOME_LIBGTOP_SYSDEPS GNOME_LIBGTOP_TYPES +LIBGTOP_XML_HOOK([],) + AC_ARG_WITH(libgtop-inodedb, [ --with-libgtop-inodedb Build the inodedb stuff (default=no)], [build_inodedb="$withval"], [build_inodedb=no]) -LIBGTOP_EXTRA_LIBS= +LIBGTOP_EXTRA_LIBS="$LIBGTOP_XML_LIBS" if test x$build_inodedb = xyes ; then AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no) diff --git a/xml.m4 b/xml.m4 new file mode 100644 index 00000000..3026db9b --- /dev/null +++ b/xml.m4 @@ -0,0 +1,36 @@ +dnl +dnl LIBGTOP_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([LIBGTOP_XML_HOOK],[ + LIBGTOP_XML_LIB= + AC_PATH_PROG(XML_CONFIG,xml-config,no) + if test "$XML_CONFIG" = no; then + if test x$2 = xfailure; then + AC_MSG_ERROR(Could not find xml-config) + else + AC_MSG_WARN(Could not find xml-config) + fi + else + AC_CHECK_LIB(xml, xmlNewDoc, [ + $1 + LIBGTOP_XML_LIB=`$XML_CONFIG --libs` + ], [ + if test x$2 = xfailure; then + AC_MSG_ERROR(Could not link sample xml program) + else + AC_MSG_WARN(Could not link sample xml program) + fi + ], `$XML_CONFIG --libs`) + fi + AC_SUBST(LIBGTOP_XML_LIB) +]) + +AC_DEFUN([LIBGTOP_XML_CHECK], [ + LIBGTOP_XML_HOOK([],failure) +])