diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-14 18:55:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-14 18:55:24 -0700 |
| commit | 1a82cca9ba872983996042deb01a658f6919bb01 (patch) | |
| tree | c56e90a5d20bfd9dd3944b6b001c0d0ce9eec84d /msdos | |
| parent | 02b4958008ef5ecd8c28fb0489e59648d17be81c (diff) | |
| download | emacs-1a82cca9ba872983996042deb01a658f6919bb01.tar.gz | |
Choose dependency of oldxmenu using configure.
* configure.in (OLDXMENU_TARGET): New output variable.
* src/Makefile.in (OLDXMENU_TARGET): New, set by configure.
(really-lwlib, really-oldXMenu): Always define.
($OLDXMENU): Depend on $OLDXMENU_TARGET.
* msdos/sed1v2.inp (OLDXMENU_TARGET): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 22617544814..46254219844 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,8 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (OLDXMENU_TARGET): Edit to empty. + * sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu. + * sed1v2.inp (LIBXT_OTHER): Exit to empty. 2010-05-14 Glenn Morris <rgm@gnu.org> diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index e43e79d7579..f4774a1017b 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -82,6 +82,7 @@ s/\.h\.in/.h-in/ /^LIBXSM *=/s/@LIBXSM@// /^LIBXTR6 *=/s/@LIBXTR6@// /^LIBXT_OTHER *=/s/@LIBXT_OTHER@// +/^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// /^XOBJ *=/s/@XOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index bcdb0fec0ed..d9d7a87c992 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -7,6 +7,7 @@ s/DOC/DOC-X/g /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! /^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! +/^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! /^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! |