Mercurial > emacs
changeset 108612:60489ff8b450
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 15 May 2010 15:33:24 -0700 |
| parents | a32b146e01b5 |
| children | 2aff4d15de35 |
| files | ChangeLog configure.in msdos/ChangeLog msdos/sed1v2.inp msdos/sed1x.inp src/ChangeLog src/Makefile.in |
| diffstat | 7 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 15 15:15:49 2010 -0700 +++ b/ChangeLog Sat May 15 15:33:24 2010 -0700 @@ -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>
--- a/configure.in Sat May 15 15:15:49 2010 -0700 +++ b/configure.in Sat May 15 15:33:24 2010 -0700 @@ -3152,7 +3152,12 @@ 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
--- a/msdos/ChangeLog Sat May 15 15:15:49 2010 -0700 +++ b/msdos/ChangeLog Sat May 15 15:33:24 2010 -0700 @@ -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.
--- a/msdos/sed1v2.inp Sat May 15 15:15:49 2010 -0700 +++ b/msdos/sed1v2.inp Sat May 15 15:33:24 2010 -0700 @@ -113,6 +113,7 @@ /^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)/
--- a/msdos/sed1x.inp Sat May 15 15:15:49 2010 -0700 +++ b/msdos/sed1x.inp Sat May 15 15:33:24 2010 -0700 @@ -5,7 +5,7 @@ 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!
--- a/src/ChangeLog Sat May 15 15:15:49 2010 -0700 +++ b/src/ChangeLog Sat May 15 15:33:24 2010 -0700 @@ -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.
--- a/src/Makefile.in Sat May 15 15:15:49 2010 -0700 +++ b/src/Makefile.in Sat May 15 15:33:24 2010 -0700 @@ -177,6 +177,11 @@ ## 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 @@ $(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 */