Mercurial > emacs
changeset 68501:d10c5b8ae128
* configure.in: Require GTK 2.4 or newer.
* configure: Regenerate
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 31 Jan 2006 15:34:16 +0000 |
| parents | 4e4d545ce006 |
| children | 6ede67948264 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 31 15:31:50 2006 +0000 +++ b/ChangeLog Tue Jan 31 15:34:16 2006 +0000 @@ -1,3 +1,8 @@ +2006-01-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * configure.in: Require GTK 2.4 or newer. + * configure: Regenerate + 2006-01-29 Michael Olson <mwolson@gnu.org> * Makefile.in (install-arch-indep, uninstall): Add ERC.
--- a/configure Tue Jan 31 15:31:50 2006 +0000 +++ b/configure Tue Jan 31 15:34:16 2006 +0000 @@ -10200,8 +10200,8 @@ echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} { (exit 1); exit 1; }; }; fi - GLIB_REQUIRED=2.0.1 - GTK_REQUIRED=2.0.1 + GLIB_REQUIRED=2.4 + GTK_REQUIRED=2.4 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" if test "X${with_pkg_config_prog}" != X; then
--- a/configure.in Tue Jan 31 15:31:50 2006 +0000 +++ b/configure.in Tue Jan 31 15:34:16 2006 +0000 @@ -2000,8 +2000,8 @@ if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); fi - GLIB_REQUIRED=2.0.1 - GTK_REQUIRED=2.0.1 + GLIB_REQUIRED=2.4 + GTK_REQUIRED=2.4 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Check if --with-pkg-config-prog has been given.