summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--configure.in13
2 files changed, 35 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bdc78be6..65c697904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2001-02-28 Arik Devens <arik@eazel.com>
+
+ reviewed by: Robin * Slomkowski <rslomkow@rslomkow.org>
+
+ Fixed bug 6836, Add scrollkeeper as a dependency of Nautilus in
+ configure.in.
+
+ * configure.in: Added checking for scrollkeeper install.
+ * ChangeLog: Forgot to commit ChangeLog for last checkin. Sorry to
+ all about that.
+
+2001-02-28 Arik Devens <arik@eazel.com>
+
+ reviewed by: Robin * Slomkowski <rslomkow@rslomkow.org>
+
+ Fixed bug 7161, change both configure.in and RPM to require gtk
+ 1.2.9 or newer.
+
+ * configure.in: Updated our GTK+ dep to 1.2.9.
+ * nautilus.spec.in: Updated our GTK+ dep to 1.2.9.
+
2001-02-28 Darin Adler <darin@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
@@ -46,6 +67,7 @@
(nautilus_preferences_dialog_construct): Use stock button instead of
hard-coded OK for translation purposes.
+>>>>>>> 1.4068
2001-02-28 Michael Engber <engber@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
diff --git a/configure.in b/configure.in
index 53bb32f40..9a478d4a1 100644
--- a/configure.in
+++ b/configure.in
@@ -600,6 +600,19 @@ AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
dnl ====================================
+dnl = Begin tests for scrollkeeper
+dnl ====================================
+
+AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+if test x$SCROLLKEEPER_CONFIG = xno; then
+ AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga)
+fi
+
+dnl =======================
+dnl = End tests for scrollkeeper
+dnl =======================
+
+dnl ====================================
dnl = begin gnome-http checks
dnl ====================================
AC_MSG_CHECKING(for gnome-http)