]> git.eshelyaron.com Git - emacs.git/commitdiff
* configure.in: Require GTK 2.4 or newer.
authorJan Djärv <jan.h.d@swipnet.se>
Tue, 31 Jan 2006 15:34:16 +0000 (15:34 +0000)
committerJan Djärv <jan.h.d@swipnet.se>
Tue, 31 Jan 2006 15:34:16 +0000 (15:34 +0000)
* configure: Regenerate

ChangeLog
configure
configure.in

index 37e9613c70658a47ae28a4dfdace72b2aade55d4..cb2d6730c2eaf9fad83b746d1f7e8faf6501f2da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-31  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * configure.in: Require GTK 2.4 or newer.
+       * configure: Regenerate
+
 2006-01-29  Michael Olson  <mwolson@gnu.org>
 
        * Makefile.in (install-arch-indep, uninstall): Add ERC.
index 9f11d615a046c783b428bf06e88bfe7f1e832a72..153ec5ee9851e8e8f8c80547ba6fc336b0cf5784 100755 (executable)
--- a/configure
+++ b/configure
@@ -10200,8 +10200,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
    { (exit 1); exit 1; }; };
   fi
-  GLIB_REQUIRED=2.0.1
-  GTK_REQUIRED=2.0.1
+  GLIB_REQUIRED=2.4
+  GTK_REQUIRED=2.4
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
     if test "X${with_pkg_config_prog}" != X; then
index 2318c1b91979cafb1253b1572adae531037e15f1..2982f4c2fc2631199d03dc103a33738c44947daa 100644 (file)
@@ -2000,8 +2000,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
   if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
     AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
   fi
-  GLIB_REQUIRED=2.0.1
-  GTK_REQUIRED=2.0.1
+  GLIB_REQUIRED=2.4
+  GTK_REQUIRED=2.4
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Check if --with-pkg-config-prog has been given.