summaryrefslogtreecommitdiff
path: root/autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-09-19 06:17:35 -0400
committerGlenn Morris <rgm@gnu.org>2012-09-19 06:17:35 -0400
commita732eace5fed6d1264adf2c70c0b17cef0422698 (patch)
treed781b28e825e308dfd724ab10995deebae4aa6a1 /autogen
parent69f6644cd4c2eb5856be503705d7f502422b215c (diff)
downloademacs-a732eace5fed6d1264adf2c70c0b17cef0422698.tar.gz
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-rwxr-xr-xautogen/configure4
1 files changed, 3 insertions, 1 deletions
diff --git a/autogen/configure b/autogen/configure
index 4c6fa8b5cf7..3c53c7f1538 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -10567,6 +10567,7 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
+ USE_GTK_TOOLKIT="GTK3"
else
check_gtk2=yes
gtk3_pkg_errors="$GTK_PKG_ERRORS "
@@ -10634,6 +10635,7 @@ $as_echo "no" >&6; }
then
as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5
fi
+ test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2"
fi
if test x"$pkg_check_gtk" = xyes; then
@@ -24293,7 +24295,7 @@ fi
#### 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 "