diff src/Makefile.in @ 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/Makefile.in	Fri May 07 20:20:30 2010 -0400
+++ b/src/Makefile.in	Fri May 07 19:05:24 2010 -0700
@@ -105,6 +105,11 @@
 
 GTK_OBJ=@GTK_OBJ@
 
+## -ltermcap, or -lncurses, or -lcurses, or "".
+LIBS_TERMCAP=@LIBS_TERMCAP@
+## terminfo.o if TERMINFO, else tparam.o.
+TERMCAP_OBJ=@TERMCAP_OBJ@
+
 LIBXMU=@LIBXMU@
 
 LIBXSM=@LIBXSM@
@@ -368,21 +373,6 @@
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
 
-
-#ifdef TERMINFO
-/* Used to be -ltermcap here.  If your machine needs that,
-   define LIBS_TERMCAP in the m/MACHINE.h file.  */
-#ifndef LIBS_TERMCAP
-#define LIBS_TERMCAP -lcurses
-#endif /* LIBS_TERMCAP */
-termcapobj = terminfo.o
-#else /* ! defined (TERMINFO) */
-#ifndef LIBS_TERMCAP
-#define LIBS_TERMCAP
-#endif /* LIBS_TERMCAP */
-termcapobj = tparam.o
-#endif /* ! defined (TERMINFO) */
-
 gmallocobj =
 rallocobj =
 vmlimitobj =
@@ -404,7 +394,7 @@
 POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* List of object files that make-docfile should not be told about.  */
-otherobj= $(termcapobj) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
+otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
   $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 #ifdef HAVE_MOUSE
@@ -667,7 +657,7 @@
    with GCC, we might need gnulib again after them.  */
 
 LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-   $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \
+   $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM $(LIBS_TERMCAP) \
    $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR)