Always define LIBXMENU in src/Makefile.in.

* configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.

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

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

7 files changed, 19 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 10c2d45be32..2ebc0988a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
+        * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.
+
         * configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
 
 2010-05-15  Ken Raeburn  <raeburn@raeburn.org>
diff --git a/configure.in b/configure.in
index 27a7ad5541b..eb15b2204b3 100644
--- a/configure.in
+++ b/configure.in
@@ -3152,7 +3152,12 @@ if test "${HAVE_X11}" = "yes" ; then
   LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
 else
   OLDXMENU=
-  LIBXMENU="-lXMenu"
+  ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
+  if test "${HAVE_X_WINDOWS}" = "yes"; then
+    LIBXMENU="-lXMenu"
+  else
+    LIBXMENU=
+  fi
   LIBX_OTHER=
 fi
 
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 85c9f594311..0d2ccd4eb67 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
+        * sed1v2.inp (LIBXMENU): Edit to empty.
+        * sed1x.inp (LIBXMENU): Expect empty initial value.
+
         * sed1v2.inp (OLDXMENU): Edit to empty.
         * sed1x.inp (OLDXMENU): Expect empty initial value.
 
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 836df145fa5..78451093771 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -113,6 +113,7 @@ s/\.h\.in/.h-in/
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
 /^OLDXMENU *=/s/@OLDXMENU@//
+/^LIBXMENU *=/s/@LIBXMENU@//
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index ecb8828cc23..5e8542846e0 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -5,7 +5,7 @@ s!^	cd \${oldXMenudir}; \${MAKE}.*$!	${MAKE} -C ${oldXMenudir}.!
 s!^     @true *$!       @rem!
 s/DOC/DOC-X/g
 /^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
-/^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
+/^LIBXMENU *=/s!= *!= ${OLDXMENU}!
 /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
diff --git a/src/ChangeLog b/src/ChangeLog
index 42dbffccf5d..f64e82689e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2010-05-15  Glenn Morris  <rgm@gnu.org>
 
-        * Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
+        * Makefile.in (OLDXMENU, LIBXMENU, 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 752a1f6d4e9..477336a929d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -177,6 +177,11 @@ OLDXMENU_TARGET=@OLDXMENU_TARGET@
 ## Else ${oldXMenudir}libXMenu11.a.
 OLDXMENU=@OLDXMENU@
 
+## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
+## Else if !HAVE_X11 || USE_GTK, empty.
+## Else $(OLDXMENU).
+LIBXMENU=@LIBXMENU@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
@@ -300,7 +305,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-LIBXMENU=@LIBXMENU@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 #endif /* HAVE_X_WINDOWS */