diff --git a/ChangeLog b/ChangeLog
index ebd2bb2ac6c..aa27b7772b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-13  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
+
 	* configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
 
 2010-05-12  Glenn Morris  <rgm@gnu.org>
diff --git a/configure.in b/configure.in
index 4d7e2d6ab3f..8fe864e7925 100644
--- a/configure.in
+++ b/configure.in
@@ -3144,7 +3144,7 @@ else
   LIBX_OTHER=
 fi
 
-if test "$HAVE_GTK" = "yes"; then
+if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
   OLDXMENU=
   LIBXMENU=
 fi
diff --git a/src/ChangeLog b/src/ChangeLog
index 0afd7265922..a95c5b06f09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-13  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
+	Let configure set these variables (to empty) in this case as well.
+
 	* Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
 	(LIBX_BASE): Use $LD_SWITCH_X_SITE.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1df4d562551..bbc598c3391 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -289,20 +289,12 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 	$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-/* This test needs to say in cpp for the time being, since s/msdos.h
-   defines HAVE_MENUS, and does not use the configure script.  */
-#ifdef HAVE_MENUS
 OLDXMENU=@OLDXMENU@
 LIBXMENU=@LIBXMENU@
-#else /* not HAVE_MENUS */
-OLDXMENU=
-LIBXMENU=
-#endif /* not HAVE_MENUS */
-
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 LIBX_OTHER=@LIBX_OTHER@
-#endif /* not HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS */
 
 
 /* A macro which other sections of Makefile can redefine to munge the