diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-10-18 20:12:53 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-10-18 20:12:53 +0200 |
| commit | 0ffe10653bb4366a03ce79fde9847ae810bc78d4 (patch) | |
| tree | 78d327484f911b7b0adf5d07e138a5c5e63d2ae5 | |
| parent | 4787455fb7e0a33fe5420b4414a3b6e87685e45d (diff) | |
| download | emacs-0ffe10653bb4366a03ce79fde9847ae810bc78d4.tar.gz | |
* configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10.
Fixes: debbugs:9786
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
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 @@ +2011-10-18 Jan Djärv <jan.h.d@swipnet.se> + + * configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10 (Bug#9786). + 2011-10-18 Chong Yidong <cyd@gnu.org> * 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 if test "$pkg_check_gtk" != "yes"; then HAVE_GTK=no if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.6 - GTK_REQUIRED=2.6 + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Checks for libraries. |