- (djm) Define USE_PIPES to avoid socketpair problems on HPUX 10 and SunOS 4

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index f4f47cd453c938fa704a53876bf2202c7de8e0e9..f048b000d8dc4c764d3d3f22703cedbef73f8359 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,7 @@ case "$host" in
        fi
        CFLAGS="$CFLAGS -D_HPUX_SOURCE"
        AC_DEFINE(IPADDR_IN_DISPLAY)
+       AC_DEFINE(USE_PIPES)
        AC_MSG_CHECKING(for HPUX trusted system password database)
        if test -f /tcb/files/auth/system/default; then
                AC_MSG_RESULT(yes)
@@ -87,6 +88,7 @@ case "$host" in
        MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
+       AC_DEFINE(BROKEN_INET_NTOA)
        ;;
 *-*-irix6*)
        CFLAGS="$CFLAGS -I/usr/local/include"
@@ -97,6 +99,7 @@ case "$host" in
        AC_DEFINE(WITH_IRIX_AUDIT)
        no_libsocket=1
        no_libnsl=1
+       AC_DEFINE(BROKEN_INET_NTOA)
        ;;
 *-*-linux*)
        no_dev_ptmx=1
@@ -137,6 +140,20 @@ case "$host" in
 *-*-sunos4*)
        CFLAGS="$CFLAGS -DSUNOS4"
        AC_CHECK_FUNCS(getpwanam)
+       conf_utmp_location=/etc/utmp
+       conf_wtmp_location=/var/adm/wtmp
+       conf_lastlog_location=/var/adm/lastlog
+       AC_DEFINE(USE_PIPES)
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
+       ;;
+*-sni-sysv*)
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
+       MANTYPE='$(CATMAN)'
+       AC_DEFINE(IP_TOS_IS_BROKEN)
+       mansubdir=cat
+       LIBS="$LIBS -lgen -lnsl -lucb"
        ;;
 *-*-sysv*)
        CFLAGS="$CFLAGS -I/usr/local/include"
@@ -208,10 +225,10 @@ if test -z "$no_libnsl" ; then
 fi
 
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.h endian.h lastlog.h limits.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h usersec.h util.h utmp.h utmpx.h)
+AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h lastlog.h limits.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h)
 
 # Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strlcat strlcpy vsnprintf vhangup _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep vsnprintf vhangup _getpty __b64_ntop)
 dnl    checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
 dnl    checks for libutil functions
@@ -671,6 +688,22 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmp.h, HAVE_TIME_IN_UTMP)
 OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX)
 OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
 
+AC_CACHE_CHECK([for sun_len field in struct sockaddr_un],
+               ac_cv_have_sun_len_in_struct_sockaddr_un, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+               ],
+               [ struct sockaddr_un s; s.sun_len = 1; ],
+               [ ac_cv_have_sun_len_in_struct_sockaddr_un="yes" ],
+               [ ac_cv_have_sun_len_in_struct_sockaddr_un="no" ],
+       )
+])
+if test "x$ac_cv_have_sun_len_in_struct_sockaddr_un" = "xyes" ; then
+       AC_DEFINE(HAVE_SUN_LEN_IN_SOCKADDR_UN)
+fi
+
 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
                ac_cv_have_ss_family_in_struct_ss, [
        AC_TRY_COMPILE(
@@ -716,6 +749,30 @@ if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
 fi
 
 
+AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
+       AC_TRY_LINK([], 
+               [ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);], 
+               [ ac_cv_libc_defines_sys_errlist="yes" ],
+               [ ac_cv_libc_defines_sys_errlist="no" ]
+       )
+])
+if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
+       AC_DEFINE(HAVE_SYS_ERRLIST)
+fi
+
+
+AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
+       AC_TRY_LINK([], 
+               [ extern int sys_nerr; printf("%i", sys_nerr);], 
+               [ ac_cv_libc_defines_sys_nerr="yes" ],
+               [ ac_cv_libc_defines_sys_nerr="no" ]
+       )
+])
+if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
+       AC_DEFINE(HAVE_SYS_NERR)
+fi
+
+
 # Looking for programs, paths and files
 AC_ARG_WITH(rsh,
        [  --with-rsh=PATH         Specify path to remote shell program ],
@@ -1006,7 +1063,7 @@ DISPLAY_HACK_MSG="no"
 AC_ARG_WITH(ipaddr-display,
        [  --with-ipaddr-display   Use ip address instead of hostname in \$DISPLAY],
        [
-               if test "x$withval" = "xno" ; then      
+               if test "x$withval" != "xno" ; then     
                        AC_DEFINE(IPADDR_IN_DISPLAY)
                        DISPLAY_HACK_MSG="yes" 
                fi