New file to check for libxml.
2000-01-12 Martin Baulig <martin@home-of-linux.org> * 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.
This commit is contained in:
committed by
Martin Baulig
parent
fe86288e76
commit
bb15be7198
@@ -1,3 +1,10 @@
|
|||||||
|
2000-01-12 Martin Baulig <martin@home-of-linux.org>
|
||||||
|
|
||||||
|
* 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 <martin@home-of-linux.org>
|
2000-01-12 Martin Baulig <martin@home-of-linux.org>
|
||||||
|
|
||||||
* lib/sysdeps.c (_glibtop_init_hook_s): This has been moved
|
* lib/sysdeps.c (_glibtop_init_hook_s): This has been moved
|
||||||
|
@@ -113,11 +113,13 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
|
|||||||
GNOME_LIBGTOP_SYSDEPS
|
GNOME_LIBGTOP_SYSDEPS
|
||||||
GNOME_LIBGTOP_TYPES
|
GNOME_LIBGTOP_TYPES
|
||||||
|
|
||||||
|
LIBGTOP_XML_HOOK([],)
|
||||||
|
|
||||||
AC_ARG_WITH(libgtop-inodedb,
|
AC_ARG_WITH(libgtop-inodedb,
|
||||||
[ --with-libgtop-inodedb Build the inodedb stuff (default=no)],
|
[ --with-libgtop-inodedb Build the inodedb stuff (default=no)],
|
||||||
[build_inodedb="$withval"], [build_inodedb=no])
|
[build_inodedb="$withval"], [build_inodedb=no])
|
||||||
|
|
||||||
LIBGTOP_EXTRA_LIBS=
|
LIBGTOP_EXTRA_LIBS="$LIBGTOP_XML_LIBS"
|
||||||
|
|
||||||
if test x$build_inodedb = xyes ; then
|
if test x$build_inodedb = xyes ; then
|
||||||
AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
|
AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
|
||||||
|
36
xml.m4
Normal file
36
xml.m4
Normal file
@@ -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)
|
||||||
|
])
|
Reference in New Issue
Block a user