diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/config.guess | 7 | ||||
| -rwxr-xr-x | source/configure | 4 | ||||
| -rw-r--r-- | source/configure.in | 4 | ||||
| -rw-r--r-- | source/include/config.h.in | 6 | ||||
| -rw-r--r-- | source/include/includes.h | 9 |
5 files changed, 24 insertions, 6 deletions
diff --git a/source/config.guess b/source/config.guess index 9b53cb62ee1..695867b068e 100755 --- a/source/config.guess +++ b/source/config.guess @@ -349,6 +349,9 @@ EOF *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; + *:QNX:*:4*) + echo i386-qnx-qnx4 + exit 0 ;; i*:CYGWIN*:*) echo i386-unknown-cygwin32 exit 0 ;; @@ -449,7 +452,9 @@ EOF test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0) uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3 && exit 0 ;; + && echo i486-ncr-sysv4.3 && exit 0 + uname -p 2>/dev/null | grep entium >/dev/null \ + && echo i586-ncr-sysv4.3 && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; diff --git a/source/configure b/source/configure index 641ce71a727..47042f26db4 100755 --- a/source/configure +++ b/source/configure @@ -1764,7 +1764,7 @@ else fi done -for ac_hdr in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h +for ac_hdr in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1804,7 +1804,7 @@ else fi done -for ac_hdr in sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h +for ac_hdr in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/source/configure.in b/source/configure.in index 347dcb26763..21b80d92456 100644 --- a/source/configure.in +++ b/source/configure.in @@ -102,8 +102,8 @@ AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h) AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h ) AC_CHECK_HEADERS(sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h sys/mman.h) AC_CHECK_HEADERS(sys/filio.h string.h strings.h stdlib.h sys/socket.h) -AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h) -AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h) +AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h) +AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h) # # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT. # This causes configure to fail to detect it. Check for shadow separately on HPUX. diff --git a/source/include/config.h.in b/source/include/config.h.in index c71ed429539..63db73cf51f 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -792,6 +792,9 @@ /* Define if you have the <sys/syscall.h> header file. */ #undef HAVE_SYS_SYSCALL_H +/* Define if you have the <sys/termio.h> header file. */ +#undef HAVE_SYS_TERMIO_H + /* Define if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H @@ -807,6 +810,9 @@ /* Define if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define if you have the <termio.h> header file. */ +#undef HAVE_TERMIO_H + /* Define if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H diff --git a/source/include/includes.h b/source/include/includes.h index ab85edec95e..a8c3f68203e 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -206,8 +206,15 @@ #include <netinet/tcp.h> #endif -#ifdef HAVE_TERMIOS_H +#if defined(HAVE_TERMIOS_H) +/* POSIX terminal handling. */ #include <termios.h> +#elif defined(HAVE_TERMIO_H) +/* Older SYSV terminal handling - don't use if we can avoid it. */ +#include <termio.h> +#elif defined(HAVE_SYS_TERMIO_H) +/* Older SYSV terminal handling - don't use if we can avoid it. */ +#include <sys/termio.h> #endif #if HAVE_DIRENT_H |