[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4ce6e94 1/2: Add oldxmenu to system-configuration-f
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] master 4ce6e94 1/2: Add oldxmenu to system-configuration-features |
|
Date: |
Mon, 15 May 2017 21:01:46 -0400 (EDT) |
branch: master
commit 4ce6e94c99a31475c4c411f06cf9abc096b95bbf
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Add oldxmenu to system-configuration-features
* configure.ac (HAVE_OLDXMENU): New.
(emacs_config_features): Add oldxmenu.
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index d6b8001..d085552 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