[Emacs-diffs] /srv/bzr/emacs/trunk r100309: Always define LIBX_OTHER in src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 100309
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-15 14:47:58 -0700
message:
  Always define LIBX_OTHER in src/Makefile.in.
  
  * src/Makefile.in (LIBX_OTHER): Always define.
  
  * msdos/sed1v2.inp (LIBX_OTHER): Edit to empty.
  * msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
modified:
  msdos/sed1v2.inp
  msdos/sed1x.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-15 21:31:19 +0000
+++ b/msdos/sed1v2.inp  2010-05-15 21:47:58 +0000
@@ -112,6 +112,7 @@
 /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@//
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
+/^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
 /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/

=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp   2010-05-15 21:31:19 +0000
+++ b/msdos/sed1x.inp   2010-05-15 21:47:58 +0000
@@ -6,7 +6,7 @@
 s/DOC/DOC-X/g
 /^OLDXMENU *=/address@hidden@!${oldXMenudir}libXMenu11.a!
 /^LIBXMENU *=/address@hidden@!${OLDXMENU}!
-/^LIBX_OTHER *=/address@hidden@!${LIBXT} ${LIBX_EXTRA}!
+/^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
 /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o!

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-15 21:31:19 +0000
+++ b/src/ChangeLog     2010-05-15 21:47:58 +0000
@@ -1,5 +1,7 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
+       * Makefile.in (LIBX_OTHER): Always define.
+
        * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
        (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-15 21:31:19 +0000
+++ b/src/Makefile.in   2010-05-15 21:47:58 +0000
@@ -299,9 +299,10 @@
 address@hidden@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
+#endif /* HAVE_X_WINDOWS */
+
+/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.  */
 address@hidden@
-#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