diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | luit.c | 8 | ||||
| -rw-r--r-- | sys.c | 35 |
3 files changed, 20 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 0b3bc27..a05c0f0 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,9 @@ AC_CANONICAL_HOST XORG_CWARNFLAGS +AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h]) +AC_CHECK_FUNCS([poll select grantpt]) + AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found])) AC_ARG_WITH(localealiasfile, @@ -34,8 +34,12 @@ THE SOFTWARE. #include <sys/ioctl.h> #include <signal.h> -#ifdef SVR4 -#include <stropts.h> +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_STROPTS_H +# include <stropts.h> #endif #include <X11/fonts/fontenc.h> @@ -34,14 +34,8 @@ THE SOFTWARE. #include <signal.h> #include <errno.h> -#ifdef SVR4 -#define HAVE_POLL -#endif - -#ifndef HAVE_POLL -#ifndef _MINIX -#define HAVE_SELECT -#endif +#ifdef HAVE_CONFIG_H +# include "config.h" #endif #ifdef HAVE_POLL @@ -49,27 +43,20 @@ THE SOFTWARE. #undef HAVE_SELECT #endif -#ifdef __QNX__ -#include <sys/select.h> -#endif - - -#if (defined(__GLIBC__) && \ - (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) || \ - defined(SVR4) || defined(__APPLE__) -#define HAVE_GRANTPT +#ifdef HAVE_SYS_SELECT_H +# include <sys/select.h> #endif -#ifdef __GLIBC__ -#include <pty.h> +#ifdef HAVE_PTY_H +# include <pty.h> #endif -#ifdef SVR4 -#include <stropts.h> +#ifdef HAVE_STROPTS_H +# include <stropts.h> #endif -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include <sys/param.h> +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> #endif #include "sys.h" @@ -433,7 +420,7 @@ openTty(char *line) } #endif -#ifdef SVR4 +#if defined(SVR4) || defined(__SVR4) rc = ioctl(tty, I_PUSH, "ptem"); if(rc < 0) goto bail; |