From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 18 Sep 2012 18:13:01 +0000 (+0200)
Subject: * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
X-Git-Tag: emacs-24.2.90~269^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fb91e7197bd800240e39a05c070ca37860af68a;p=emacs.git

* configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
---

diff --git a/ChangeLog b/ChangeLog
index d6260f6c228..57f1bec65ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
+
 2012-09-17  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* Makefile.in (bootstrap): Revert last change.  Run config.status
diff --git a/configure.ac b/configure.ac
index d0cbabf3d3d..a6462f7959a 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 "