# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1273969814 25200
# Node ID 2ac105f2b2ac786a73c62c804c63db7816012b4a
# Parent  c82cd792792dbd2a78e200bdcfb05fe976954f49
* src/Makefile.in (LIBX_BASE): Always define.

diff -r c82cd792792d -r 2ac105f2b2ac src/ChangeLog
--- a/src/ChangeLog	Sat May 15 17:21:58 2010 -0700
+++ b/src/ChangeLog	Sat May 15 17:30:14 2010 -0700
@@ -1,5 +1,7 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (LIBX_BASE): Always define.
+
 	* Makefile.in (LIBX_OTHER): Move out of cpp section.
 
 	* Makefile.in (LIBXT): Always define.
diff -r c82cd792792d -r 2ac105f2b2ac src/Makefile.in
--- 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