From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 2 Sep 2007 17:35:49 +0000 (+0000)
Subject: Require Gtk/Glib 2.6.
X-Git-Tag: emacs-pretest-22.1.90~862
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aee22295d4ead21228f98c76bb01ecaa9adf2963;p=emacs.git

Require Gtk/Glib 2.6.
---

diff --git a/ChangeLog b/ChangeLog
index 306a37fd48a..0a31582cf4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* configure.in: Require Gtk/Glib 2.6.
+
 2007-07-28  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.in (install-arch-indep): Use "rm -f" for removing DOC,
diff --git a/configure.in b/configure.in
index eed8891aa5c..3a3c56d196d 100644
--- a/configure.in
+++ b/configure.in
@@ -2100,8 +2100,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.4
-  GTK_REQUIRED=2.4
+  GLIB_REQUIRED=2.6
+  GTK_REQUIRED=2.6
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Check if --with-pkg-config-prog has been given.