diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-07 19:05:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-07 19:05:24 -0700 |
| commit | 40c178792eb1464abede4fd86d3bb394f49e3131 (patch) | |
| tree | 886356df27d092af16683c8592ca23d2963fd39d /src/s/darwin.h | |
| parent | ba5bf5f0f9d661602397cd690d796940b17173ba (diff) | |
| download | emacs-40c178792eb1464abede4fd86d3bb394f49e3131.tar.gz | |
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 'src/s/darwin.h')
| -rw-r--r-- | src/s/darwin.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 0b7c99a4fcf..a3dfe06e83d 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -179,16 +179,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef HAVE_POSIX_MEMALIGN #endif -/* The ncurses library has been moved out of the System framework in - Mac OS X 10.2. So if ./configure detects it, set the command-line - option to use it. */ -#ifdef HAVE_LIBNCURSES -#define LIBS_TERMCAP -lncurses -/* This prevents crashes when running Emacs in Terminal.app under - 10.2. */ -#define TERMINFO -#endif - /* Link this program just by running cc. */ #define ORDINARY_LINK |