diff options
| author | Martin Baulig <martin@src.gnome.org> | 1999-09-17 00:37:41 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-09-17 00:37:41 +0000 |
| commit | a0477c621257ecdf572f0a2508e1c10887664e5c (patch) | |
| tree | 7e353988fde60eb39e794a51b8094f338272f9e7 | |
| parent | 6780e78a6b7f2b43d353c029aef4b013592d436c (diff) | |
| download | libgtop-a0477c621257ecdf572f0a2508e1c10887664e5c.tar.gz | |
**** Merged from HEAD ****
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 19 insertions, 2 deletions
@@ -1,5 +1,10 @@ 1999-09-17 Martin Baulig <martin@home-of-linux.org> + * configure.in: Make it work if we have GNOME and the user + gave use --without-gnome (fixes bug #1735). + +1999-09-17 Martin Baulig <martin@home-of-linux.org> + * LIBGTOP-VERSION: Set version number to 1.0.4 binary age 3, interface age 3. @@ -8,6 +13,13 @@ Merged everything since May 31 from HEAD and released LibGTop 1.0.3. +1999-07-29 Martin Baulig <martin@home-of-linux.org> + + * include/glibtop/error.h: Use G_GNUC_UNUSED. + + * configure.in (ENABLE_STATIC, ENABLE_SHARED): New automake + conditionals. + 1999-07-11 Tomas Ogren <stric@ing.umu.se> * configure.in: Added sv to ALL_LINGUAS diff --git a/configure.in b/configure.in index a9919589..7138e411 100644 --- a/configure.in +++ b/configure.in @@ -97,10 +97,15 @@ if test "x$gnome_found" != xyes; then fi GNOME_SUPPORT_CHECKS else - AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false) - AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) + if test "x$want_gnome" != xno ; then + AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false) + else + GNOME_SUPPORT_CHECKS + fi fi +AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) + GNOME_LIBGTOP_SYSDEPS GNOME_LIBGTOP_TYPES |