diff options
| author | Jan Djärv | 2011-10-18 20:12:53 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-10-18 20:12:53 +0200 |
| commit | 0ffe10653bb4366a03ce79fde9847ae810bc78d4 (patch) | |
| tree | 78d327484f911b7b0adf5d07e138a5c5e63d2ae5 | |
| parent | 4787455fb7e0a33fe5420b4414a3b6e87685e45d (diff) | |
| download | emacs-0ffe10653bb4366a03ce79fde9847ae810bc78d4.tar.gz emacs-0ffe10653bb4366a03ce79fde9847ae810bc78d4.zip | |
* 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
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-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 | |||
| 1 | 2011-10-18 Chong Yidong <cyd@gnu.org> | 5 | 2011-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 | |||
| 1925 | if test "$pkg_check_gtk" != "yes"; then | 1925 | if test "$pkg_check_gtk" != "yes"; then |
| 1926 | HAVE_GTK=no | 1926 | HAVE_GTK=no |
| 1927 | if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then | 1927 | if 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. |