# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1079289836 0
# Node ID e71cd75458d7b7ec7bfdec2259f64061a11a132d
# Parent  4ab3a5beaea66c5e9468c9c8e6865d6726f30bc8
* Makefile.in (XMENU_OBJ): Do not include xmenu.o if
HAVE_CARBON is defined.

diff -r 4ab3a5beaea6 -r e71cd75458d7 src/ChangeLog
--- a/src/ChangeLog	Sun Mar 14 00:28:46 2004 +0000
+++ b/src/ChangeLog	Sun Mar 14 18:43:56 2004 +0000
@@ -1,3 +1,8 @@
+2004-03-14  Steven Tamm <steventamm@mac.com>
+
+	* Makefile.in (XMENU_OBJ): Do not include xmenu.o if
+	HAVE_CARBON is defined.
+
 2004-03-14  Kim F. Storm  <storm@cua.dk>
 
 	* dispextern.h (x_find_image_file): Add prototype.
diff -r 4ab3a5beaea6 -r e71cd75458d7 src/Makefile.in
--- a/src/Makefile.in	Sun Mar 14 00:28:46 2004 +0000
+++ b/src/Makefile.in	Sun Mar 14 18:43:56 2004 +0000
@@ -449,7 +449,7 @@
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
 #else /* not HAVE_X_WINDOWS */
-#ifdef HAVE_MENUS
+#if defined(HAVE_MENUS) && !defined(HAVE_CARBON)
 XMENU_OBJ = xmenu.o
 #endif
 #endif /* not HAVE_X_WINDOWS */