Always define OLDXMENU in src/Makefile.in.

* src/Makefile.in (OLDXMENU): Always define.

* msdos/sed1v2.inp (OLDXMENU): Edit to empty.
* msdos/sed1x.inp (OLDXMENU): Expect empty initial value.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 75fc5532904..42dbffccf5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
-        * Makefile.in (LIBX_OTHER): Always define.
+        * Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
 
         * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
         (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
diff --git a/src/Makefile.in b/src/Makefile.in
index cfb057a4085..50411c1b118 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -294,8 +294,12 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 #endif
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
-#ifdef HAVE_X_WINDOWS
+/* If !HAVE_X11 || USE_GTK, empty.
+   Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
+   Else ${oldXMenudir}libXMenu11.a.  */
 OLDXMENU=@OLDXMENU@
+
+#ifdef HAVE_X_WINDOWS
 LIBXMENU=@LIBXMENU@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)