summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <baulig@taurus.uni-trier.de>1998-06-05 15:06:54 +0000
committerMartin Baulig <martin@src.gnome.org>1998-06-05 15:06:54 +0000
commit0d744987ff74f588e974e4f1e3ccbbe88efc828b (patch)
tree13c5f265b554962619d206fcc076662d5fe80ab3
parente6b544af8094184643ae3ac5af9dfc9adc044025 (diff)
downloadlibgtop-0d744987ff74f588e974e4f1e3ccbbe88efc828b.tar.gz
removed that directory.
1998-06-05 Martin Baulig <baulig@taurus.uni-trier.de> * support: removed that directory. * configure.in: we check whether '-lgnomesupport' is included in $GNOME_LIBS and add it together with $GNOME_LIBDIR to LIBSUPPORT in this case. Gnome (gnome-libs) is now required to build libgtop, added short comment to configure.in how to revert this change. * Makefile.am: removed `support' subdir. I have now removed all the `support' stuff from libgtop. It uses '-lgnomesupport' from gnome-libs when it's required. So you have to build gnome-libs before you can build libgtop. If all works well, this is my last checkin into the stable branch. I will now continue working on the main trunk. Martin
-rw-r--r--ChangeLog14
-rw-r--r--configure.in9
2 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0560dd2..656a795e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1998-06-05 Martin Baulig <baulig@taurus.uni-trier.de>
+
+ * support: removed that directory.
+
+ * configure.in: we check whether '-lgnomesupport' is
+ included in $GNOME_LIBS and add it together with
+ $GNOME_LIBDIR to LIBSUPPORT in this case.
+
+ Gnome (gnome-libs) is now required to build libgtop,
+ added short comment to configure.in how to revert this
+ change.
+
+ * Makefile.am: removed `support' subdir.
+
1998-06-03 Martin Baulig <baulig@merkur.uni-trier.de>
* libgtop.spec: New file.
diff --git a/configure.in b/configure.in
index 37f2ec14..52268dec 100644
--- a/configure.in
+++ b/configure.in
@@ -115,6 +115,15 @@ dnl fi
dnl AC_SUBST(LIBSUPPORT)
dnl AC_SUBST(SUPPORTINCS)
+dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS, we include it here.
+echo "$GNOME_LIBS" | grep -q -e '-lgnomesupport'
+if test $? = 0 ; then
+ LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+ SUPPORTINCS="$GNOME_INCLUDEDIR"
+fi
+AC_SUBST(LIBSUPPORT)
+AC_SUBST(SUPPORTINCS)
+
dnl These definitions are expanded in make.
LIBGTOP_LIBS='-L$(libdir)'
LIBGTOP_INCS='-I$(includedir)'