From 95273451b46b6b014da891128e969c68fc77ffd8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Oct 2013 06:17:52 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/config.in | 5 ++--- autogen/configure | 13 ++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/autogen/config.in b/autogen/config.in index bcdfed288d4..930a7b4e3db 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -762,9 +762,8 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `memrchr' function. */ #undef HAVE_MEMRCHR -/* Define to 1 if you have mouse menus. (This is automatic if you use X, but - the option to specify it remains.) It is also defined with other window - systems that support xmenu.c. */ +/* Define to 1 if you have mouse menus. (This is supported in all + configurations, but the option to specify it remains.) */ #undef HAVE_MENUS /* Define to 1 if you have the `mkostemp' function. */ diff --git a/autogen/configure b/autogen/configure index 078cf39939e..9c699c7254b 100755 --- a/autogen/configure +++ b/autogen/configure @@ -10687,11 +10687,8 @@ to configure." "$LINENO" 5 fi fi -### If we're using X11, we should use the X menu package. -HAVE_MENUS=no -case ${HAVE_X11} in - yes ) HAVE_MENUS=yes ;; -esac +### We always support menus. +HAVE_MENUS=yes # Does the opsystem file prohibit the use of the GNU malloc? # Assume not, until told otherwise. @@ -14318,15 +14315,9 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h ## Extra CFLAGS applied to src/*.m files. GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" fi - # We also have mouse menus. - HAVE_MENUS=yes OTHER_FILES=ns-app fi -if test "${HAVE_W32}" = "yes"; then - HAVE_MENUS=yes -fi - ### Use session management (-lSM -lICE) if available HAVE_X_SM=no LIBXSM= -- 2.11.4.GIT