[Emacs-diffs] trunk r114589: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 114589
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-09 06:17:52 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/config.in              config.in-20091113204419-o5vbwnq5f7feedwu-185
  autogen/configure              configure-20091113204419-o5vbwnq5f7feedwu-1624

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2013-10-04 10:17:40 +0000
+++ b/autogen/config.in 2013-10-09 10:17:52 +0000
@@ -762,9 +762,8 @@
 /* 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. */

=== modified file 'autogen/configure'
--- a/autogen/configure 2013-10-08 10:17:43 +0000
+++ b/autogen/configure 2013-10-09 10:17:52 +0000
@@ -10687,11 +10687,8 @@
    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 @@
     ## 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=