From f893281966b564ac2b866513709b0d3fdd65ccfa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 2 Sep 2007 17:30:16 +0000 Subject: [PATCH] Require Gtk/Glib 2.6. --- ChangeLog | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e63bee6fbfc..ea2baff51ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-09-02 Jan Dj,Ad(Brv + + * configure.in: Require Gtk/Glib 2.6. + 2007-09-02 Thien-Thi Nguyen * 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" || \ 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.4 - GTK_REQUIRED=2.4 + GLIB_REQUIRED=2.6 + GTK_REQUIRED=2.6 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Check if --with-pkg-config-prog has been given. -- 2.39.5