[Emacs-diffs] /srv/bzr/emacs/trunk r109113: Fix toolkit configuration report.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109113
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-17 11:30:25 +0400
message:
  Fix toolkit configuration report.
  * configure.ac (USE_X_TOOLKIT): Report toolkit as GTK3 if
  --with-x-toolkit=gtk3 is used.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-17 02:09:58 +0000
+++ b/ChangeLog 2012-07-17 07:30:25 +0000
@@ -1,3 +1,9 @@
+2012-07-17  Dmitry Antipov  <address@hidden>
+
+       Fix toolkit configuration report.
+       * configure.ac (USE_X_TOOLKIT): Report toolkit as GTK3 if
+       --with-x-toolkit=gtk3 is used.
+
 2012-07-17  Paul Eggert  <address@hidden>
 
        Fix regression with pthread_sigmask on FreeBSD (Bug#11884).

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-17 02:09:58 +0000
+++ b/configure.ac      2012-07-17 07:30:25 +0000
@@ -4298,7 +4298,11 @@
 #### 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
+  if test "${with_gtk3}" = "yes"; then
+    USE_X_TOOLKIT=GTK3
+  else
+    USE_X_TOOLKIT=GTK
+  fi
 fi
 
 echo "