[Emacs-diffs] /srv/bzr/emacs/trunk r100317: * src/Makefile.in (LIBX_BASE): Always define.

[Glenn Morris]

------------------------------------------------------------
revno: 100317
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-15 17:30:14 -0700
message:
  * src/Makefile.in (LIBX_BASE): Always define.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-16 00:21:58 +0000
+++ b/src/ChangeLog     2010-05-16 00:30:14 +0000
@@ -1,5 +1,7 @@
 2010-05-16  Glenn Morris  <address@hidden>
 
+       * Makefile.in (LIBX_BASE): Always define.
+
        * Makefile.in (LIBX_OTHER): Move out of cpp section.
 
        * Makefile.in (LIBXT): Always define.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-16 00:21:58 +0000
+++ b/src/Makefile.in   2010-05-16 00:30:14 +0000
@@ -193,6 +193,12 @@
 ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
 address@hidden@
 
+## 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