diff options
| author | Glenn Morris | 2010-05-07 19:05:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-07 19:05:24 -0700 |
| commit | 40c178792eb1464abede4fd86d3bb394f49e3131 (patch) | |
| tree | 886356df27d092af16683c8592ca23d2963fd39d /msdos | |
| parent | ba5bf5f0f9d661602397cd690d796940b17173ba (diff) | |
| download | emacs-40c178792eb1464abede4fd86d3bb394f49e3131.tar.gz emacs-40c178792eb1464abede4fd86d3bb394f49e3131.zip | |
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 5760c7bc582..0a21dbe01f7 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * sed1v2.inp (LIBS_TERMCAP): Edit to empty. | ||
| 4 | (TERMCAP_OBJ): Edit to tparam.o. | ||
| 5 | |||
| 1 | 2010-05-07 Eli Zaretskii <eliz@gnu.org> | 6 | 2010-05-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | Fix breakage due to autoconfiscation of Makefile.in files. | 8 | Fix breakage due to autoconfiscation of Makefile.in files. |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index f9c2398c99b..a3ad070c416 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -62,6 +62,8 @@ s/@LIB_MATH@/-lm/ | |||
| 62 | /^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@// | 62 | /^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@// |
| 63 | /^GCONF_LIBS *=/s/@GCONF_LIBS@// | 63 | /^GCONF_LIBS *=/s/@GCONF_LIBS@// |
| 64 | /^GTK_OBJ *=/s/@GTK_OBJ@// | 64 | /^GTK_OBJ *=/s/@GTK_OBJ@// |
| 65 | /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// | ||
| 66 | /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/tparam.o/ | ||
| 65 | /^LIBXMU *=/s/@LIBXMU@// | 67 | /^LIBXMU *=/s/@LIBXMU@// |
| 66 | /^LIBXSM *=/s/@LIBXSM@// | 68 | /^LIBXSM *=/s/@LIBXSM@// |
| 67 | /^LIBXTR6 *=/s/@LIBXTR6@// | 69 | /^LIBXTR6 *=/s/@LIBXTR6@// |