Mercurial > emacs
changeset 108524:732a4fb5612e
Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.
* configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
* src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
Let configure set these variables (to empty) in this case as well.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 12 May 2010 20:52:07 -0700 |
| parents | 81b3d413542e |
| children | 25f3a5a76921 |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 12 20:18:04 2010 -0700 +++ b/ChangeLog Wed May 12 20:52:07 2010 -0700 @@ -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>
--- a/configure.in Wed May 12 20:18:04 2010 -0700 +++ b/configure.in Wed May 12 20:52:07 2010 -0700 @@ -3144,7 +3144,7 @@ LIBX_OTHER= fi -if test "$HAVE_GTK" = "yes"; then +if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= fi
--- a/src/ChangeLog Wed May 12 20:18:04 2010 -0700 +++ b/src/ChangeLog Wed May 12 20:52:07 2010 -0700 @@ -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.
--- a/src/Makefile.in Wed May 12 20:18:04 2010 -0700 +++ b/src/Makefile.in Wed May 12 20:52:07 2010 -0700 @@ -289,20 +289,12 @@ $(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