summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-05-15 20:56:46 -0400
committerGlenn Morris <rgm@gnu.org>2017-05-15 20:56:46 -0400
commit4ce6e94c99a31475c4c411f06cf9abc096b95bbf (patch)
tree777c105735c416275bdb4ba85fc494aa42111a6e /configure.ac
parente782761a7defd44e7fce661aee4ac37e27c30bf4 (diff)
downloademacs-4ce6e94c99a31475c4c411f06cf9abc096b95bbf.tar.gz
Add oldxmenu to system-configuration-features
* configure.ac (HAVE_OLDXMENU): New. (emacs_config_features): Add oldxmenu.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d6b8001858f..d085552ffea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5023,9 +5023,11 @@ else
fi
AC_SUBST(LIBX_OTHER)
+HAVE_OLDXMENU=no
if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then
LIBXMENU=
elif test "$USE_X_TOOLKIT" = none; then
+ HAVE_OLDXMENU=yes
LIBXMENU='$(oldXMenudir)/libXMenu11.a'
AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS oldXMenu"
else
@@ -5298,7 +5300,7 @@ 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 TOOLKIT_SCROLL_BARS X_TOOLKIT X11 NS MODULES \
+ LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 NS MODULES \
XWIDGETS LIBSYSTEMD CANNOT_DUMP; do
case $opt in