# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1273960078 25200
# Node ID 3ec4560a97c933ecab6fff605b9c0f7c8b7ac3ce
# Parent  c487ac406ddeadcb061d11954c0402179a892b2d
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.

diff -r c487ac406dde -r 3ec4560a97c9 msdos/sed1v2.inp
--- a/msdos/sed1v2.inp	Sat May 15 14:34:03 2010 -0700
+++ b/msdos/sed1v2.inp	Sat May 15 14:47:58 2010 -0700
@@ -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/
diff -r c487ac406dde -r 3ec4560a97c9 msdos/sed1x.inp
--- a/msdos/sed1x.inp	Sat May 15 14:34:03 2010 -0700
+++ b/msdos/sed1x.inp	Sat May 15 14:47:58 2010 -0700
@@ -6,7 +6,7 @@
 s/DOC/DOC-X/g
 /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a!
 /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
-/^LIBX_OTHER *=/s!@LIBX_OTHER@!${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!
diff -r c487ac406dde -r 3ec4560a97c9 src/ChangeLog
--- a/src/ChangeLog	Sat May 15 14:34:03 2010 -0700
+++ b/src/ChangeLog	Sat May 15 14:47:58 2010 -0700
@@ -1,5 +1,7 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (LIBX_OTHER): Always define.
+
 	* Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
 	(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
 
diff -r c487ac406dde -r 3ec4560a97c9 src/Makefile.in
--- a/src/Makefile.in	Sat May 15 14:34:03 2010 -0700
+++ b/src/Makefile.in	Sat May 15 14:47:58 2010 -0700
@@ -299,9 +299,10 @@
 LIBXMENU=@LIBXMENU@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
-LIBX_OTHER=@LIBX_OTHER@
 #endif /* HAVE_X_WINDOWS */
 
+/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.  */
+LIBX_OTHER=@LIBX_OTHER@
 
 /* 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