Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.313
diff -u -r1.313 Makefile.in
--- src/Makefile.in	7 Aug 2005 12:33:16 -0000	1.313
+++ src/Makefile.in	8 Sep 2005 09:48:31 -0000
@@ -304,15 +304,15 @@
 #define LIB_X11_LIB -lX11
 #endif
 
+#ifndef HAVE_CARBON
+XMENU_OBJ = xmenu.o
+#endif
+
 #ifdef HAVE_X_WINDOWS
 
 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
 
 #ifdef HAVE_MENUS
-
-#ifndef HAVE_CARBON
-XMENU_OBJ = xmenu.o
-#endif
 
 #ifdef USE_GTK
 GTK_OBJ= gtkutil.o
Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.374
diff -u -r1.374 emacs.c
--- src/emacs.c	27 Aug 2005 12:23:22 -0000	1.374
+++ src/emacs.c	8 Sep 2005 09:48:44 -0000
@@ -1624,12 +1624,10 @@
 #endif
 #endif /* HAVE_X_WINDOWS */
 
-#ifdef HAVE_MENUS
 #ifndef HAVE_NTGUI
 #ifndef MAC_OS
       /* Called before init_window_once for Mac OS Classic.  */
       syms_of_xmenu ();
-#endif
 #endif
 #endif