]> andersk Git - openssh.git/blobdiff - configure.in
- (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
[openssh.git] / configure.in
index 473f253857812a5eec37a3f60ad5bdf0c3c13272..2fc00432685c230a849753449ca18a8ba49e3658 100644 (file)
@@ -41,10 +41,9 @@ if test -z "$LD" ; then
 fi
 AC_SUBST(LD)
        
-# C Compiler features
 AC_C_INLINE
-if test "$GCC" = "yes"; then 
-       CFLAGS="$CFLAGS -Wall"
+if test "$GCC" = "yes" || test "$GCC" = "egcs"; then 
+       CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
 fi
 
 # Check for some target-specific stuff
@@ -75,27 +74,30 @@ case "$host" in
 *-*-dgux*)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        ;;
+*-*-darwin*)
+       AC_DEFINE(BROKEN_GETADDRINFO)
+       ;;
 *-*-hpux10*)
        if test -z "$GCC"; then
                CFLAGS="$CFLAGS -Ae"
        fi
-       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
-       LIBS="$LIBS -lsec"
+       LIBS="$LIBS -lxnet -lsec"
        ;;
 *-*-hpux11*)
-       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(PAM_SUN_CODEBASE)
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
-       LIBS="$LIBS -lsec"
+       LIBS="$LIBS -lxnet -lsec"
        ;;
 *-*-irix5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -196,13 +198,13 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-sysv4.2*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       enable_suid_ssh=no
+#      enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       enable_suid_ssh=no
+#      enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv*)
@@ -239,6 +241,13 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
        ;;
+*-*-unicos*)
+       no_libsocket=1
+       no_libnsl=1
+       AC_DEFINE(USE_PIPES)
+       LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib"
+       LIBS="$LIBS -lgen -lrsc"
+       ;;
 *-dec-osf*)
        AC_MSG_CHECKING(for Digital Unix SIA)
        no_osfsia=""
@@ -262,6 +271,14 @@ mips-sony-bsd|mips-sony-newsos4)
                fi
        fi
        ;;
+
+*-*-nto-qnx)
+       AC_DEFINE(USE_PIPES)
+       AC_DEFINE(NO_X11_UNIX_SOCKETS)
+       AC_DEFINE(MISSING_NFDBITS)
+       AC_DEFINE(MISSING_HOWMANY)
+       AC_DEFINE(MISSING_FD_MASK)
+       ;;
 esac
 
 # Allow user to specify flags
@@ -356,7 +373,7 @@ AC_CHECK_FUNC(utimes,
 AC_FUNC_STRFTIME
 
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h getopt.h glob.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
+AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h getopt.h glob.h lastlog.h libgen.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h stdint.h strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
 
 # Check for ALTDIRFUNC glob() extension
 AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support)
@@ -460,7 +477,7 @@ AC_ARG_WITH(tcp-wrappers,
 )
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getopt getnameinfo getrlimit getrusage getttyent glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
 dnl    Checks for time functions
 AC_CHECK_FUNCS(gettimeofday time)
 dnl    Checks for libutil functions
@@ -761,7 +778,22 @@ if test "x$ac_cv_have_intxx_t" = "xyes" ; then
        AC_DEFINE(HAVE_INTXX_T)
        have_intxx_t=1
 fi
-       
+
+if (test -z "$have_intxx_t" && \
+           test "x$ac_cv_header_stdint_h" = "xyes")
+then
+    AC_MSG_CHECKING([for intXX_t types in stdint.h])
+       AC_TRY_COMPILE(
+               [ #include <stdint.h> ], 
+               [ int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
+               [
+                       AC_DEFINE(HAVE_INTXX_T)
+                       AC_MSG_RESULT(yes)
+               ],
+               [ AC_MSG_RESULT(no) ]
+       )
+fi
+
 AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
        AC_TRY_COMPILE(
                [ #include <sys/types.h> ], 
@@ -775,6 +807,19 @@ if test "x$ac_cv_have_int64_t" = "xyes" ; then
        have_int64_t=1
 fi
        
+if test -z "$have_int64_t" ; then
+    AC_MSG_CHECKING([for int64_t type in sys/socket.h])
+       AC_TRY_COMPILE(
+               [ #include <sys/socket.h> ], 
+               [ int64_t a; a = 1],
+               [
+                       AC_DEFINE(HAVE_INT64_T)
+                       AC_MSG_RESULT(yes)
+               ],
+               [ AC_MSG_RESULT(no) ]
+       )
+fi
+
 AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
        AC_TRY_COMPILE(
                [ #include <sys/types.h> ], 
@@ -788,6 +833,19 @@ if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
        have_u_intxx_t=1
 fi
 
+if test -z "$have_u_intxx_t" ; then
+    AC_MSG_CHECKING([for u_intXX_t types in sys/socket.h])
+       AC_TRY_COMPILE(
+               [ #include <sys/socket.h> ], 
+               [ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
+               [
+                       AC_DEFINE(HAVE_U_INTXX_T)
+                       AC_MSG_RESULT(yes)
+               ],
+               [ AC_MSG_RESULT(no) ]
+       )
+fi
+
 AC_CACHE_CHECK([for u_int64_t types], ac_cv_have_u_int64_t, [
        AC_TRY_COMPILE(
                [ #include <sys/types.h> ], 
@@ -801,6 +859,35 @@ if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
        have_u_int64_t=1
 fi
 
+if test -z "$have_u_intxx_t" ; then
+       AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
+               AC_TRY_COMPILE(
+                       [
+#include <sys/types.h>
+                       ], 
+                       [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ], 
+                       [ ac_cv_have_uintxx_t="yes" ],
+                       [ ac_cv_have_uintxx_t="no" ]
+               )
+       ])
+       if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
+               AC_DEFINE(HAVE_UINTXX_T)
+       fi
+fi
+
+if test -z "$have_uintxx_t" ; then
+    AC_MSG_CHECKING([for uintXX_t types in stdint.h])
+       AC_TRY_COMPILE(
+               [ #include <stdint.h> ], 
+               [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], 
+               [
+                       AC_DEFINE(HAVE_UINTXX_T)
+                       AC_MSG_RESULT(yes)
+               ],
+               [ AC_MSG_RESULT(no) ]
+       )
+fi
+
 if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
            test "x$ac_cv_header_sys_bitypes_h" = "xyes")
 then
@@ -823,20 +910,19 @@ then
        ) 
 fi
 
-if test -z "$have_u_intxx_t" ; then
-       AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
-               AC_TRY_COMPILE(
-                       [
+
+AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [
+       AC_TRY_COMPILE(
+               [
 #include <sys/types.h>
-                       ], 
-                       [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ], 
-                       [ ac_cv_have_uintxx_t="yes" ],
-                       [ ac_cv_have_uintxx_t="no" ]
-               )
-       ])
-       if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
-               AC_DEFINE(HAVE_UINTXX_T)
-       fi
+               ],
+               [ u_char foo; foo = 125; ],
+               [ ac_cv_have_u_char="yes" ],
+               [ ac_cv_have_u_char="no" ]
+       )
+])
+if test "x$ac_cv_have_u_char" = "xyes" ; then
+       AC_DEFINE(HAVE_U_CHAR)
 fi
 
 AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [
@@ -1045,7 +1131,7 @@ main()
 #if (SIZEOF_LONG_INT == 8)
        long int num = 0x7fffffffffffffff;
 #else
-       long long num = 0x7fffffffffffffff;
+       long long num = 0x7fffffffffffffffll;
 #endif
        strcpy(expected_out, "9223372036854775807");
        snprintf(buf, mazsize, "%lld", num);
@@ -1144,6 +1230,35 @@ if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then
        AC_DEFINE(HAVE_PW_CLASS_IN_PASSWD)
 fi
 
+AC_CACHE_CHECK([for pw_expire field in struct passwd],
+               ac_cv_have_pw_expire_in_struct_passwd, [
+       AC_TRY_COMPILE(
+               [
+#include <pwd.h>
+               ],
+               [ struct passwd p; p.pw_expire = 0; ],
+               [ ac_cv_have_pw_expire_in_struct_passwd="yes" ],
+               [ ac_cv_have_pw_expire_in_struct_passwd="no" ]
+       )
+])
+if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then
+       AC_DEFINE(HAVE_PW_EXPIRE_IN_PASSWD)
+fi
+
+AC_CACHE_CHECK([for pw_change field in struct passwd],
+               ac_cv_have_pw_change_in_struct_passwd, [
+       AC_TRY_COMPILE(
+               [
+#include <pwd.h>
+               ],
+               [ struct passwd p; p.pw_change = 0; ],
+               [ ac_cv_have_pw_change_in_struct_passwd="yes" ],
+               [ ac_cv_have_pw_change_in_struct_passwd="no" ]
+       )
+])
+if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then
+       AC_DEFINE(HAVE_PW_CHANGE_IN_PASSWD)
+fi
 
 AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
        AC_TRY_LINK([], 
@@ -1156,6 +1271,20 @@ if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
        AC_DEFINE(HAVE___PROGNAME)
 fi
 
+AC_CACHE_CHECK([whether getopt has optreset support],
+               ac_cv_have_getopt_optreset, [
+       AC_TRY_LINK(
+               [
+#include <getopt.h>
+               ],
+               [ extern int optreset; optreset = 0; ],
+               [ ac_cv_have_getopt_optreset="yes" ],
+               [ ac_cv_have_getopt_optreset="no" ]
+       )
+])
+if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
+       AC_DEFINE(HAVE_GETOPT_OPTRESET)
+fi
 
 AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
        AC_TRY_LINK([], 
@@ -1399,7 +1528,9 @@ if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then
        OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
        OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp)
        OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
+       OSSH_PATH_ENTROPY_PROG(PROG_JSTAT, jstat)
        OSSH_PATH_ENTROPY_PROG(PROG_PS, ps)
+       OSSH_PATH_ENTROPY_PROG(PROG_SAR, sar)
        OSSH_PATH_ENTROPY_PROG(PROG_W, w)
        OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
        OSSH_PATH_ENTROPY_PROG(PROG_LAST, last)
@@ -1415,7 +1546,7 @@ fi
 AC_SUBST(INSTALL_SSH_PRNG_CMDS)
 
 
-AC_ARG_WITH(catman,
+AC_ARG_WITH(mantype,
        [  --with-mantype=man|cat|doc  Set man page type],
        [
                case "$withval" in
@@ -1626,11 +1757,11 @@ AC_ARG_ENABLE(suid-ssh,
        SSHMODE=0711
        ;;
   *)   AC_MSG_RESULT(yes)
-       SSHMODE=04711
+       SSHMODE=4711
        ;;
   esac ],
   AC_MSG_RESULT(yes)
-  SSHMODE=04711
+  SSHMODE=4711
 )
 AC_SUBST(SSHMODE)
 
@@ -1717,6 +1848,9 @@ AC_TRY_COMPILE([
 #endif
 #ifdef HAVE_PATHS_H
 #  include <paths.h>
+#endif
+#ifdef HAVE_LOGIN_H
+# include <login.h>
 #endif
        ],
        [ char *lastlog = LASTLOG_FILE; ],
This page took 0.043511 seconds and 4 git commands to generate.