From 5fb91e7197bd800240e39a05c070ca37860af68a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 18 Sep 2012 20:13:01 +0200 Subject: [PATCH] * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3. --- ChangeLog | 4 ++++ configure.ac | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d6260f6c22..57f1bec65a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-09-18 Jan Djärv + + * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3. + 2012-09-17 Andreas Schwab * Makefile.in (bootstrap): Revert last change. Run config.status diff --git a/configure.ac b/configure.ac index d0cbabf3d3..a6462f7959 100644 --- a/configure.ac +++ b/configure.ac @@ -1914,6 +1914,7 @@ if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOO AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) GTK_OBJ=emacsgtkfixed.o term_header=gtkutil.h + USE_GTK_TOOLKIT="GTK3" else check_gtk2=yes gtk3_pkg_errors="$GTK_PKG_ERRORS " @@ -1932,6 +1933,7 @@ if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then then AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) fi + test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi if test x"$pkg_check_gtk" = xyes; then @@ -4396,7 +4398,7 @@ End: #### It makes printing result more understandable as using GTK sets #### toolkit_scroll_bars to yes by default. if test "${HAVE_GTK}" = "yes"; then - USE_X_TOOLKIT=GTK + USE_X_TOOLKIT="$USE_GTK_TOOLKIT" fi echo " -- 2.20.1