# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1099412806 0
# Node ID 2cc8d9bbb72b7ab011f6c7d888a0c10263f9637c
# Parent  cdbca26f9090444d8013819ecbdc9685b7d0bac5
* configure.in (HAVE_GTK): Only set with_toolkit_scroll_bars if not
explicitly set to no.

diff -r cdbca26f9090 -r 2cc8d9bbb72b ChangeLog
--- a/ChangeLog	Tue Nov 02 16:25:50 2004 +0000
+++ b/ChangeLog	Tue Nov 02 16:26:46 2004 +0000
@@ -2,6 +2,9 @@
 
 	* configure.in (HAVE_GTK_FILE_CHOOSER, $HAVE_GTK_FILE_SELECTION): New
 	tests for new and old GTK file dialogs.
+	(HAVE_GTK): Only set with_toolkit_scroll_bars if not explicitly set
+	to no.
+
 	* configure: Rebuild
 
 2004-10-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
diff -r cdbca26f9090 -r 2cc8d9bbb72b configure
--- a/configure	Tue Nov 02 16:25:50 2004 +0000
+++ b/configure	Tue Nov 02 16:26:46 2004 +0000
@@ -9797,7 +9797,9 @@
 
   USE_X_TOOLKIT=none
 
-      with_toolkit_scroll_bars=yes
+      if test "$with_toolkit_scroll_bars" != no; then
+    with_toolkit_scroll_bars=yes
+  fi
 
       HAVE_GTK_MULTIDISPLAY=no
 
diff -r cdbca26f9090 -r 2cc8d9bbb72b configure.in
--- a/configure.in	Tue Nov 02 16:25:50 2004 +0000
+++ b/configure.in	Tue Nov 02 16:26:46 2004 +0000
@@ -1967,7 +1967,9 @@
 
   dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
   dnl  a lot if #ifdef:s, say we have toolkit scrollbars.
-  with_toolkit_scroll_bars=yes
+  if test "$with_toolkit_scroll_bars" != no; then
+    with_toolkit_scroll_bars=yes
+  fi
 
   dnl  Check if we can use multiple displays with this GTK version.
   dnl  If gdk_display_open exists, assume all others are there also.