[Emacs-diffs] /srv/bzr/emacs/trunk r100250: Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.

[Glenn Morris]

------------------------------------------------------------
revno: 100250
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-05-12 20:52:07 -0700
message:
  Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.
  
  * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
  
  * src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
  Let configure set these variables (to empty) in this case as well.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-13 03:18:04 +0000
+++ b/ChangeLog 2010-05-13 03:52:07 +0000
@@ -1,5 +1,7 @@
 2010-05-13  Glenn Morris  <address@hidden>
 
+       * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
+
        * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
 
 2010-05-12  Glenn Morris  <address@hidden>

=== modified file 'configure.in'
--- a/configure.in      2010-05-13 03:18:04 +0000
+++ b/configure.in      2010-05-13 03:52:07 +0000
@@ -3144,7 +3144,7 @@
   LIBX_OTHER=
 fi
 
-if test "$HAVE_GTK" = "yes"; then
+if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
   OLDXMENU=
   LIBXMENU=
 fi

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-13 03:18:04 +0000
+++ b/src/ChangeLog     2010-05-13 03:52:07 +0000
@@ -1,5 +1,8 @@
 2010-05-13  Glenn Morris  <address@hidden>
 
+       * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
+       Let configure set these variables (to empty) in this case as well.
+
        * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
        (LIBX_BASE): Use $LD_SWITCH_X_SITE.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-13 03:18:04 +0000
+++ b/src/Makefile.in   2010-05-13 03:52:07 +0000
@@ -289,20 +289,12 @@
        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-/* This test needs to say in cpp for the time being, since s/msdos.h
-   defines HAVE_MENUS, and does not use the configure script.  */
-#ifdef HAVE_MENUS
 address@hidden@
 address@hidden@
-#else /* not HAVE_MENUS */
-OLDXMENU=
-LIBXMENU=
-#endif /* not HAVE_MENUS */
-
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 address@hidden@
-#endif /* not HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS */
 
 
 /* A macro which other sections of Makefile can redefine to munge the