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.

1 files changed, 25 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02659063c75..32044fc167b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+2010-05-08  Glenn Morris  <rgm@gnu.org>
+
+        * 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.
+
+        * s/freebsd.h (osreldate.h): No longer include, since this file
+        does not use __FreeBSD_version any more.
+
+        * s/aix4-2.h (TERMINFO):
+        * s/cygwin.h (TERMINFO):
+        * s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/freebsd.h (TERMINFO, LIBS_TERMCAP):
+        * s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
+        * s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
+        * s/irix6-5.h (TERMINFO):
+        * s/netbsd.h (LIBS_TERMCAP):
+        * s/openbsd.h (TERMINFO, LIBS_TERMCAP):
+        * s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
+        * s/usg5-4.h (TERMINFO):
+        Move to configure.
+
 2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (unbind_to): Don't unbind a local binding into the global