Mercurial > emacs

diff src/Makefile.in @ 108612:60489ff8b450

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always define LIBXMENU in src/Makefile.in. * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS. * src/Makefile.in (LIBXMENU): Always define. * msdos/sed1v2.inp (LIBXMENU): Edit to empty. * msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 May 2010 15:33:24 -0700
parents a32b146e01b5
children f710179e77ab
line wrap: on
line diff
--- a/src/Makefile.in	Sat May 15 15:15:49 2010 -0700
+++ b/src/Makefile.in	Sat May 15 15:33:24 2010 -0700
@@ -177,6 +177,11 @@
 ## Else ${oldXMenudir}libXMenu11.a.
 OLDXMENU=@OLDXMENU@
 
+## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
+## Else if !HAVE_X11 || USE_GTK, empty.
+## Else $(OLDXMENU).
+LIBXMENU=@LIBXMENU@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
@@ -300,7 +305,6 @@
 	$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-LIBXMENU=@LIBXMENU@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 #endif /* HAVE_X_WINDOWS */