diff options
| author | Jan Djärv | 2007-09-02 17:35:49 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-09-02 17:35:49 +0000 |
| commit | aee22295d4ead21228f98c76bb01ecaa9adf2963 (patch) | |
| tree | 3a3c64de3c9ae2a2aeff67b89d3669b8e8ee2907 | |
| parent | a017b5157470ddde480d17812ad78ff6247b643d (diff) | |
| download | emacs-aee22295d4ead21228f98c76bb01ecaa9adf2963.tar.gz emacs-aee22295d4ead21228f98c76bb01ecaa9adf2963.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-07-28 Eli Zaretskii <eliz@gnu.org> | 5 | 2007-07-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (install-arch-indep): Use "rm -f" for removing DOC, | 7 | * 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 | |||
| 2100 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 2100 | if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then |
| 2101 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); | 2101 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); |
| 2102 | fi | 2102 | fi |
| 2103 | GLIB_REQUIRED=2.4 | 2103 | GLIB_REQUIRED=2.6 |
| 2104 | GTK_REQUIRED=2.4 | 2104 | GTK_REQUIRED=2.6 |
| 2105 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 2105 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 2106 | 2106 | ||
| 2107 | dnl Check if --with-pkg-config-prog has been given. | 2107 | dnl Check if --with-pkg-config-prog has been given. |