From 0a9e3248af3bab4f35da1473a6330292f5857ccd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Jun 2015 21:25:11 -0400 Subject: [PATCH] * configure.ac (emacs_config_features): Add X toolkit and scroll-bars. --- configure.ac | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8b1556b6f32..9c6a74aface 100644 --- a/configure.ac +++ b/configure.ac @@ -5144,14 +5144,24 @@ optsep= emacs_config_features= for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \ GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \ - LIBOTF XFT ZLIB; do + LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT; do case $opt in NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;; - CAIRO) eval val=\${USE_$opt} ;; + CAIRO|TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;; *) eval val=\${HAVE_$opt} ;; esac - test x"$val" = xno && continue + case x$val in + xno|xnone|x) continue ;; + esac + case $opt in + X_TOOLKIT) + case $val in + GTK*|LUCID|MOTIF) opt=$val ;; + *) continue ;; + esac + ;; + esac AS_VAR_APPEND([emacs_config_features], ["$optsep$opt"]) optsep=' ' done -- 2.39.5