From 9062aa89280313141eb171c2842f5c9e81b6a781 Mon Sep 17 00:00:00 2001 From: Steven Tamm Date: Sun, 14 Mar 2004 18:43:56 +0000 Subject: [PATCH] * Makefile.in (XMENU_OBJ): Do not include xmenu.o if HAVE_CARBON is defined. --- src/ChangeLog | 5 +++++ src/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 52709b8f3b0..ed93c0fdb7c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-03-14 Steven Tamm + + * Makefile.in (XMENU_OBJ): Do not include xmenu.o if + HAVE_CARBON is defined. + 2004-03-14 Kim F. Storm * dispextern.h (x_find_image_file): Add prototype. diff --git a/src/Makefile.in b/src/Makefile.in index b637f75af0b..678e4f89f44 100644 --- 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 */ -- 2.39.2