diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-15 15:33:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-15 15:33:24 -0700 |
| commit | 4235ca472b0ff11d3cf2d80066f6c2375ac36037 (patch) | |
| tree | fd3d4be3b202ff6b73c5bb8d29ce0f3140c72016 /msdos | |
| parent | c0b0aed52007b3d735012376504e2db3691e0bc7 (diff) | |
| download | emacs-4235ca472b0ff11d3cf2d80066f6c2375ac36037.tar.gz | |
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.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 85c9f594311..0d2ccd4eb67 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 836df145fa5..78451093771 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -113,6 +113,7 @@ s/\.h\.in/.h-in/ /^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)/ diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index ecb8828cc23..5e8542846e0 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -5,7 +5,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! 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! |