[Emacs-diffs] /srv/bzr/emacs/trunk r110089: * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.

[Jan D.]

------------------------------------------------------------
revno: 110089
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-18 20:13:01 +0200
message:
  * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-17 22:43:12 +0000
+++ b/ChangeLog 2012-09-18 18:13:01 +0000
@@ -1,3 +1,7 @@
+2012-09-18  Jan Djärv  <address@hidden>
+
+       * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
+
 2012-09-17  Andreas Schwab  <address@hidden>
 
        * Makefile.in (bootstrap): Revert last change.  Run config.status

=== modified file 'configure.ac'
--- a/configure.ac      2012-09-17 01:02:11 +0000
+++ b/configure.ac      2012-09-18 18:13:01 +0000
@@ -1914,6 +1914,7 @@
      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 @@
   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 @@
 #### 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 "