Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Cc: address@hidden
> From: address@hidden (Randal L. Schwartz)
> Date: 16 Sep 2005 09:28:00 -0700
> 
> >>>>> "Eli" == Eli Zaretskii <address@hidden> writes:
> 
> Eli> One more question: is HAVE_CARBON defined (probably in src/config.h)
> Eli> in that build?
> 
> Yes, it is.  From src/config.h:
> 
>     /* Define to 1 if you are using the Carbon API on Mac OS X. */
>     #define HAVE_CARBON 1

Thanks.  Please see if the patch below causes bootstrap to work again
for you.

> And keep in mind that I could also want to build the non-carbon X11
> version on OSX as well.  I haven't tried that recently.  Maybe I
> should.

Yes, please do try that.  I'd like to know whether the non-Carbon
build works as on OSX with this patch.

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.314
diff -u -r1.314 Makefile.in
--- src/Makefile.in     15 Sep 2005 13:13:54 -0000      1.314
+++ src/Makefile.in     16 Sep 2005 20:45:06 -0000
@@ -304,6 +304,11 @@
 #define LIB_X11_LIB -lX11
 #endif
 
+/* xmenu.c should not be compiled on OSX.  */
+#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
@@ -570,7 +575,7 @@
 
 /* lastfile must follow all files
    whose initialized data areas should be dumped as pure by dump-emacs.  */
-obj=    dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
+obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
        charset.o coding.o category.o ccl.o \
        cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\
        emacs.o keyboard.o macros.o keymap.o sysdep.o \