procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2010-05-12 20:52:07 -07:00
parent 0116466b56
commit 472c5d6b44
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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>

2
configure.in
View file

@ -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

3
src/ChangeLog
View file

@ -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.

10
src/Makefile.in
View file

@ -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