From: Roland McGrath <roland@gnu.org>
Date: Fri, 12 Jan 1996 19:52:53 +0000 (+0000)
Subject: ($(OLDXMENU) rules): Fix conditionals so no rules are defined when !HAVE_MENUS.
X-Git-Tag: emacs-19.34~1702
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c6c2f6973f43587d1462e55477e8b90eb85a5ae;p=emacs.git

($(OLDXMENU) rules): Fix conditionals so no rules are defined when !HAVE_MENUS.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 94817d280f4..9f2381c79f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -803,8 +803,8 @@ shortnames:
 #define LWLIB_OPTIONS
 #endif
 
-#ifdef HAVE_X_WINDOWS
-#ifdef HAVE_X11
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
 
@@ -828,7 +828,6 @@ really-lwlib:
 	@true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
 #else /* not USE_X_TOOLKIT */
-#ifdef HAVE_MENUS
 $(OLDXMENU): really-oldXMenu
 
 /* Encode the values of these two macros in Make variables,
@@ -850,10 +849,8 @@ really-oldXMenu:
     "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
 	@true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
-#endif /* HAVE_MENUS */
 #endif /* not USE_X_TOOLKIT */
-#endif /* HAVE_X11 */
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS */
 
 paths.h: paths.in
 	@echo "The file paths.h needs to be set up from paths.in."