Mercurial > emacs
diff src/Makefile.in @ 108616:2ac105f2b2ac
* src/Makefile.in (LIBX_BASE): Always define.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 15 May 2010 17:30:14 -0700 |
parents | c82cd792792d |
children | 3191c35765a2 |
line wrap: on
line diff
--- a/src/Makefile.in Sat May 15 17:21:58 2010 -0700 +++ b/src/Makefile.in Sat May 15 17:30:14 2010 -0700 @@ -193,6 +193,12 @@ ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. LIBX_OTHER=@LIBX_OTHER@ +## LIBXMENU is nil if !HAVE_X_WINDOWS. +## LD_SWITCH_X_SITE should not be used if not using X, but nothing +## sets it at present, and if something ever does, it should be +## configure, which should set it to nil in non-X builds. +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -310,9 +316,6 @@ #endif $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< -#ifdef HAVE_X_WINDOWS -LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) -#endif /* HAVE_X_WINDOWS */ /* A macro which other sections of Makefile can redefine to munge the flags before they are passed to LD. This is helpful if you have