Re: Options menu is broken on CVS

[Nick Roberts]

 > Please don't take out this change without understanding what it was
 > fixing in the first place.

I think this is the right fix.  Actually I think the problem was caused by
Kim's change:

2004-03-11  Kim F. Storm  <address@hidden>

        * Makefile.in:...
        (XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.

The preamble for xmenu.c says:

/* X Communication module for terminals which understand the X protocol.

but xmenu.c is more general than that and compiles without X.  Even its
name is misleading (as with xdisp.c which also compiles without X).

Nick


*** Makefile.in.~1.313~ 2005-09-08 09:56:13.000000000 +1200
--- Makefile.in 2005-09-08 09:51:50.000000000 +1200
*************** ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOO
*** 304,319 ****
  #define LIB_X11_LIB -lX11
  #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
  #endif
--- 304,319 ----
  #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
  
  #ifdef USE_GTK
  GTK_OBJ= gtkutil.o
  #endif


*** emacs.c.~1.374.~    2005-08-28 09:37:13.000000000 +1200
--- emacs.c     2005-09-08 09:51:30.000000000 +1200
*************** main (argc, argv
*** 1624,1637 ****
  #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
  
  #ifdef HAVE_NTGUI
        syms_of_w32term ();
--- 1624,1635 ----