From d0a80c21f31969243fa4ebc98883ba40c9987bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 2 Nov 2004 16:26:46 +0000 Subject: [PATCH] * configure.in (HAVE_GTK): Only set with_toolkit_scroll_bars if not explicitly set to no. --- ChangeLog | 3 +++ configure | 4 +++- configure.in | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f07f82dfc0..fea2ce35e64 100644 --- 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,Ad(Brv diff --git a/configure b/configure index d966346868d..c776e1fd633 100755 --- 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 1f49cc536aa..1478d4d4b5d 100644 --- 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.