diff --git a/ChangeLog b/ChangeLog
index 330f0b91..25620c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,
@@ -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