Commit 6da23aaa authored by Eli Zaretskii's avatar Eli Zaretskii

Don't use termcap.c on Posix platforms, only on MS-DOS.

 configure.in <AC_CHECK_HEADERS>: Remove termcap.h.
 configure: Regenerated.
 src/Makefilie.in (termcapobj): Move termcap.o from here...
 (MSDOS_OBJ): ...to here.
 (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is
 now identical to when LIBS_TERMCAP is defined.
 src/term.c: Remove (ifdef'ed away) inclusion of termcap.h.
 src/cm.c: Remove (ifdef'ed away) inclusion of termcap.h.
 src/config.in: Regenerated.
parent 92e0131a
2010-03-12 Eli Zaretskii <eliz@gnu.org>
* configure.in <AC_CHECK_HEADERS>: Remove termcap.h.
* configure: Regenerated.
2010-03-10 Chong Yidong <cyd@stupidchicken.com> 2010-03-10 Chong Yidong <cyd@stupidchicken.com>
* Branch for 23.2. * Branch for 23.2.
......
This diff is collapsed.
...@@ -1104,7 +1104,7 @@ fi ...@@ -1104,7 +1104,7 @@ fi
dnl checks for header files dnl checks for header files
AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
sys/utsname.h pwd.h utmp.h) sys/utsname.h pwd.h utmp.h)
......
2010-03-12 Eli Zaretskii <eliz@gnu.org>
* Makefilie.in (termcapobj): Move termcap.o from here...
(MSDOS_OBJ): ...to here.
(termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is
now identical to when LIBS_TERMCAP is defined.
* term.c: Remove (ifdef'ed away) inclusion of termcap.h.
* cm.c: Remove (ifdef'ed away) inclusion of termcap.h.
* config.in: Regenerated.
2010-03-10 Chong Yidong <cyd@stupidchicken.com> 2010-03-10 Chong Yidong <cyd@stupidchicken.com>
* Branch for 23.2. * Branch for 23.2.
......
...@@ -33,13 +33,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -33,13 +33,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* For now, don't try to include termcap.h. On some systems, /* For now, don't try to include termcap.h. On some systems,
configure finds a non-standard termcap.h that the main build configure finds a non-standard termcap.h that the main build
won't find. */ won't find. */
#if defined HAVE_TERMCAP_H && 0
#include <termcap.h>
#else
extern void tputs P_ ((const char *, int, int (*)(int))); extern void tputs P_ ((const char *, int, int (*)(int)));
extern char *tgoto P_ ((const char *, int, int)); extern char *tgoto P_ ((const char *, int, int));
#endif
#define BIG 9999 /* 9999 good on VAXen. For 16 bit machines #define BIG 9999 /* 9999 good on VAXen. For 16 bit machines
use about 2000.... */ use about 2000.... */
......
...@@ -319,10 +319,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -319,10 +319,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <kerberos/krb.h> header file. */ /* Define to 1 if you have the <kerberos/krb.h> header file. */
#undef HAVE_KERBEROS_KRB_H #undef HAVE_KERBEROS_KRB_H
/* Define to 1 if `e_text' is member of `krb5_error'. */ /* Define to 1 if `krb5_error' is a member of `e_text'. */
#undef HAVE_KRB5_ERROR_E_TEXT #undef HAVE_KRB5_ERROR_E_TEXT
/* Define to 1 if `text' is member of `krb5_error'. */ /* Define to 1 if `krb5_error' is a member of `text'. */
#undef HAVE_KRB5_ERROR_TEXT #undef HAVE_KRB5_ERROR_TEXT
/* Define to 1 if you have the <krb5.h> header file. */ /* Define to 1 if you have the <krb5.h> header file. */
...@@ -616,25 +616,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -616,25 +616,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `strsignal' function. */ /* Define to 1 if you have the `strsignal' function. */
#undef HAVE_STRSIGNAL #undef HAVE_STRSIGNAL
/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */ /* Define to 1 if `struct ifreq' is a member of `ifr_addr'. */
#undef HAVE_STRUCT_IFREQ_IFR_ADDR #undef HAVE_STRUCT_IFREQ_IFR_ADDR
/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */ /* Define to 1 if `struct ifreq' is a member of `ifr_broadaddr'. */
#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */ /* Define to 1 if `struct ifreq' is a member of `ifr_flags'. */
#undef HAVE_STRUCT_IFREQ_IFR_FLAGS #undef HAVE_STRUCT_IFREQ_IFR_FLAGS
/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */ /* Define to 1 if `struct ifreq' is a member of `ifr_hwaddr'. */
#undef HAVE_STRUCT_IFREQ_IFR_HWADDR #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */ /* Define to 1 if `struct ifreq' is a member of `ifr_netmask'. */
#undef HAVE_STRUCT_IFREQ_IFR_NETMASK #undef HAVE_STRUCT_IFREQ_IFR_NETMASK
/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ /* Define to 1 if `struct nlist' is a member of `n_un.n_name'. */
#undef HAVE_STRUCT_NLIST_N_UN_N_NAME #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
/* Define to 1 if `tm_zone' is member of `struct tm'. */ /* Define to 1 if `struct tm' is a member of `tm_zone'. */
#undef HAVE_STRUCT_TM_TM_ZONE #undef HAVE_STRUCT_TM_TM_ZONE
/* Define to 1 if `struct utimbuf' is declared by <utime.h>. */ /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
...@@ -697,9 +697,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -697,9 +697,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <sys/_mbstate_t.h> header file. */ /* Define to 1 if you have the <sys/_mbstate_t.h> header file. */
#undef HAVE_SYS__MBSTATE_T_H #undef HAVE_SYS__MBSTATE_T_H
/* Define to 1 if you have the <termcap.h> header file. */
#undef HAVE_TERMCAP_H
/* Define to 1 if you have the <termios.h> header file. */ /* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H #undef HAVE_TERMIOS_H
...@@ -858,6 +855,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -858,6 +855,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
...@@ -917,6 +917,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -917,6 +917,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using the Motif X toolkit. */ /* Define to 1 if using the Motif X toolkit. */
#undef USE_MOTIF #undef USE_MOTIF
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if we should use toolkit scroll bars. */ /* Define to 1 if we should use toolkit scroll bars. */
#undef USE_TOOLKIT_SCROLL_BARS #undef USE_TOOLKIT_SCROLL_BARS
...@@ -952,28 +974,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -952,28 +974,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you need to in order for `stat' and other things to work. */ /* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to rpl_ if the getopt replacement functions and variables should be /* Define to rpl_ if the getopt replacement functions and variables should be
used. */ used. */
#undef __GETOPT_PREFIX #undef __GETOPT_PREFIX
......
...@@ -66,15 +66,10 @@ static int been_here = -1; ...@@ -66,15 +66,10 @@ static int been_here = -1;
/* For now, don't try to include termcap.h. On some systems, /* For now, don't try to include termcap.h. On some systems,
configure finds a non-standard termcap.h that the main build configure finds a non-standard termcap.h that the main build
won't find. */ won't find. */
#if defined HAVE_TERMCAP_H && 0
#include <termcap.h>
#else
extern void tputs P_ ((const char *, int, int (*)(int))); extern void tputs P_ ((const char *, int, int (*)(int)));
extern int tgetent P_ ((char *, const char *)); extern int tgetent P_ ((char *, const char *));
extern int tgetflag P_ ((char *id)); extern int tgetflag P_ ((char *id));
extern int tgetnum P_ ((char *id)); extern int tgetnum P_ ((char *id));
#endif
#include "cm.h" #include "cm.h"
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment