aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1746907e0aa..6147b1131fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-10-18 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10 (Bug#9786).
4
12011-10-18 Chong Yidong <cyd@gnu.org> 52011-10-18 Chong Yidong <cyd@gnu.org>
2 6
3 * make-dist: Remove Cocoa/Emacs.xcodeproj from distribution. 7 * make-dist: Remove Cocoa/Emacs.xcodeproj from distribution.
diff --git a/configure.in b/configure.in
index 67ab4e22d77..4a5788600c8 100644
--- a/configure.in
+++ b/configure.in
@@ -1925,8 +1925,8 @@ fi
1925if test "$pkg_check_gtk" != "yes"; then 1925if test "$pkg_check_gtk" != "yes"; then
1926 HAVE_GTK=no 1926 HAVE_GTK=no
1927if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then 1927if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
1928 GLIB_REQUIRED=2.6 1928 GLIB_REQUIRED=2.10
1929 GTK_REQUIRED=2.6 1929 GTK_REQUIRED=2.10
1930 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 1930 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
1931 1931
1932 dnl Checks for libraries. 1932 dnl Checks for libraries.