diff options
| author | Glenn Morris | 2017-05-15 20:56:46 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-05-15 20:56:46 -0400 |
| commit | 4ce6e94c99a31475c4c411f06cf9abc096b95bbf (patch) | |
| tree | 777c105735c416275bdb4ba85fc494aa42111a6e | |
| parent | e782761a7defd44e7fce661aee4ac37e27c30bf4 (diff) | |
| download | emacs-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.ac | 4 |
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 | |||
| 5023 | fi | 5023 | fi |
| 5024 | AC_SUBST(LIBX_OTHER) | 5024 | AC_SUBST(LIBX_OTHER) |
| 5025 | 5025 | ||
| 5026 | HAVE_OLDXMENU=no | ||
| 5026 | if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then | 5027 | if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then |
| 5027 | LIBXMENU= | 5028 | LIBXMENU= |
| 5028 | elif test "$USE_X_TOOLKIT" = none; then | 5029 | elif 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" |
| 5031 | else | 5033 | else |
| @@ -5298,7 +5300,7 @@ optsep= | |||
| 5298 | emacs_config_features= | 5300 | emacs_config_features= |
| 5299 | for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \ | 5301 | for 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 |