From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 31 Jan 2006 15:34:16 +0000 (+0000)
Subject: * configure.in: Require GTK 2.4 or newer.
X-Git-Tag: emacs-pretest-22.0.90~4476
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=448541bcd937b7fe28b5b61343cd3b7149f43ef6;p=emacs.git

* configure.in: Require GTK 2.4 or newer.
	* configure: Regenerate
---

diff --git a/ChangeLog b/ChangeLog
index 37e9613c706..cb2d6730c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-31  Jan Dj,Ad(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.
diff --git a/configure b/configure
index 9f11d615a04..153ec5ee985 100755
--- 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
diff --git a/configure.in b/configure.in
index 2318c1b9197..2982f4c2fc2 100644
--- a/configure.in
+++ b/configure.in
@@ -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.