* Makefile.in (XMENU_OBJ): Do not include xmenu.o if

HAVE_CARBON is defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 52709b8f3b05015053ac363ee82cb94553a13770..ed93c0fdb7cb5652b80ec0b8302e4b5fdfb91e7b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/Makefile.in b/src/Makefile.in
index b637f75af0b13ba5b59694bf3f0ca4853d70e717..678e4f89f44266a87d5e84c0b7b7728eff77d3fb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -449,7 +449,7 @@ LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM L
 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 */