aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-05-15 20:56:46 -0400
committerGlenn Morris2017-05-15 20:56:46 -0400
commit4ce6e94c99a31475c4c411f06cf9abc096b95bbf (patch)
tree777c105735c416275bdb4ba85fc494aa42111a6e
parente782761a7defd44e7fce661aee4ac37e27c30bf4 (diff)
downloademacs-4ce6e94c99a31475c4c411f06cf9abc096b95bbf.tar.gz
emacs-4ce6e94c99a31475c4c411f06cf9abc096b95bbf.zip
Add oldxmenu to system-configuration-features
* configure.ac (HAVE_OLDXMENU): New. (emacs_config_features): Add oldxmenu.
-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
5023fi 5023fi
5024AC_SUBST(LIBX_OTHER) 5024AC_SUBST(LIBX_OTHER)
5025 5025
5026HAVE_OLDXMENU=no
5026if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then 5027if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then
5027 LIBXMENU= 5028 LIBXMENU=
5028elif test "$USE_X_TOOLKIT" = none; then 5029elif test "$USE_X_TOOLKIT" = none; then
5030 HAVE_OLDXMENU=yes
5029 LIBXMENU='$(oldXMenudir)/libXMenu11.a' 5031 LIBXMENU='$(oldXMenudir)/libXMenu11.a'
5030 AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS oldXMenu" 5032 AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS oldXMenu"
5031else 5033else
@@ -5298,7 +5300,7 @@ optsep=
5298emacs_config_features= 5300emacs_config_features=
5299for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \ 5301for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
5300 GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \ 5302 GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
5301 LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT X11 NS MODULES \ 5303 LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 NS MODULES \
5302 XWIDGETS LIBSYSTEMD CANNOT_DUMP; do 5304 XWIDGETS LIBSYSTEMD CANNOT_DUMP; do
5303 5305
5304 case $opt in 5306 case $opt in