diff src/s/hpux10-20.h @ 108310:17d73312ed65

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.

--- a/src/s/hpux10-20.h	Fri May 07 20:20:30 2010 -0400
+++ b/src/s/hpux10-20.h	Fri May 07 19:05:24 2010 -0700
@@ -77,9 +77,6 @@
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* Use the system provided termcap(3) library */
-#define TERMINFO
-
 /* In hpux, the symbol SIGIO is defined, but the feature
    doesn't work in the way Emacs needs it to.  */
 
@@ -140,16 +137,10 @@
 #define HAVE_XRMSETDATABASE
 #endif
 
-/* Make sure we get select from libc rather than from libcurses
-   because libcurses on HPUX 10.10 has a broken version of select.
-   We used to use -lc -lcurses, but this may be cleaner.  */
-#define LIBS_TERMCAP -ltermcap
-
 /* 2000-11-21: Temporarily disable Unix 98 large file support found by
    configure.  It fails on HPUX 11, at least, because it enables
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
-
 #undef _FILE_OFFSET_BITS
 
 /* Define NO_REMAP if memory segmentation makes it not work well