Commit 4823838f authored by Alan Coopersmith's avatar Alan Coopersmith

luit: Convert platform #ifdefs to configure tests for functions & headers

Also check for __SVR4 in remaining SVR4 check to match Solaris compiler
default definition.
Signed-off-by: default avatarAlan Coopersmith <alan.coopersmith@sun.com>
parent 638f4ac8
......@@ -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;
......
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