diff options
| author | Jan Djärv | 2007-09-02 17:30:16 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-09-02 17:30:16 +0000 |
| commit | f893281966b564ac2b866513709b0d3fdd65ccfa (patch) | |
| tree | 7169a532d115b5d8897fd4147a2e0fc4e0c79ad3 | |
| parent | 5db55b9e50a9b498b1ac3a8cf28202783464a40a (diff) | |
| download | emacs-f893281966b564ac2b866513709b0d3fdd65ccfa.tar.gz emacs-f893281966b564ac2b866513709b0d3fdd65ccfa.zip | |
Require Gtk/Glib 2.6.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 6 insertions, 2 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-09-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * configure.in: Require Gtk/Glib 2.6. | ||
| 4 | |||
| 1 | 2007-09-02 Thien-Thi Nguyen <ttn@gnuvola.org> | 5 | 2007-09-02 Thien-Thi Nguyen <ttn@gnuvola.org> |
| 2 | 6 | ||
| 3 | * configure.in (EMACS_ARG_Y, EMACS_ARG_N): New AC_DEFUNs. | 7 | * configure.in (EMACS_ARG_Y, EMACS_ARG_N): New AC_DEFUNs. |
diff --git a/configure.in b/configure.in index c1c8c5cd0b9..b913cf710d5 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -2170,8 +2170,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ | |||
| 2170 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 2170 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then |
| 2171 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); | 2171 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); |
| 2172 | fi | 2172 | fi |
| 2173 | GLIB_REQUIRED=2.4 | 2173 | GLIB_REQUIRED=2.6 |
| 2174 | GTK_REQUIRED=2.4 | 2174 | GTK_REQUIRED=2.6 |
| 2175 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 2175 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 2176 | 2176 | ||
| 2177 | dnl Check if --with-pkg-config-prog has been given. | 2177 | dnl Check if --with-pkg-config-prog has been given. |