* configure.in (HAVE_GTK): Only set with_toolkit_scroll_bars if not

explicitly set to no.

diff --git a/ChangeLog b/ChangeLog
index 1f07f82dfc0162b2f4ed742392c6f5a4b531c66f..fea2ce35e64591899138f58577c4dfc7428b7e30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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\e,Ad\e(Brv  <jan.h.d@swipnet.se>

diff --git a/configure b/configure
index d966346868d5694745ce532ed48e52f29facf6f8..c776e1fd63340d184edde5b6f4b3417a6e69eaf8 100755 (executable)
--- a/configure
+++ b/configure
@@ -9797,7 +9797,9 @@ _ACEOF
 
   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 --git a/configure.in b/configure.in
index 1f49cc536aa228135d8dd7cc7c54eb900c708526..1478d4d4b5df507e508e72c3f1ed662381b2a43f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1967,7 +1967,9 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
 
   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.