From 62c59f60877b706982956357a5e51b9727fd694e Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@home-of-linux.org>
Date: Wed, 12 Jan 2000 17:38:45 +0000
Subject: [PATCH] We now require libxml. (LIBGTOP_LIBS): Remove all backend
 libraries.

2000-01-12  Martin Baulig  <martin@home-of-linux.org>

	* configure.in: We now require libxml.
	(LIBGTOP_LIBS): Remove all backend libraries.
	(LIBGTOP_EXTRA_LIBS): Add $(LIBGTOP_XML_LIB) here.

	* configure.in: Don't check for -lXau any longer.
---
 ChangeLog    |  6 ++++++
 configure.in | 29 ++++-------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d235638..a44d01c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-01-12  Martin Baulig  <martin@home-of-linux.org>
 
+	* configure.in: We now require libxml.
+	(LIBGTOP_LIBS): Remove all backend libraries.
+	(LIBGTOP_EXTRA_LIBS): Add $(LIBGTOP_XML_LIB) here.
+
+	* configure.in: Don't check for -lXau any longer.
+
 	* configure.in (LIBGTOP_BACKEND_DIR): Define this to be
 	`$(datadir)/libgtop/backends' and AC_SUBST it.
 
diff --git a/configure.in b/configure.in
index 66788f36..10f40559 100644
--- a/configure.in
+++ b/configure.in
@@ -113,14 +113,13 @@ AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
-LIBGTOP_XML_HOOK([],)
+LIBGTOP_XML_CHECK
 
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])
 
-LIBGTOP_EXTRA_LIBS="$LIBGTOP_XML_LIBS"
-
+LIBGTOP_EXTRA_LIBS=
 if test x$build_inodedb = xyes ; then
   AC_CHECK_LIB(gdbm, gdbm_open, LIBGTOP_EXTRA_LIBS='-lgdbm', build_inodedb=no)
 fi
@@ -257,20 +256,6 @@ for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 $1="$T"
 ])dnl
 
-dnl Autodetect Xauth
-dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
-saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
-test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
-test -z "$with_xauth" && with_xauth=yes
-if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH)
-  XE_SPACE(libs_xauth, $X_LIBS -lXau)
-fi
-CPPFLAGS="$saved_CPPFLAGS"
-AC_SUBST(libs_xauth)
-
 dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS
 
@@ -341,15 +326,9 @@ LIBGTOP_SERVER='$(bindir)/libgtop_server'
 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
-if test -z "$LIBGTOP_EXTRA_LIBS" ; then
-  LIBGTOP_EXTRA_LIBS="$libs_xauth"
-else
-  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
-fi
+LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS $LIBGTOP_XML_LIB"
 
-LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
-
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_sysdeps -lgtop_common -lgtop -lgtop_backend_server -lgtop_backend_sysdeps -lgtop_backend_common"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_sysdeps -lgtop_common -lgtop"
 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"