]> andersk Git - openssh.git/blobdiff - configure.in
- jakob@cvs.openbsd.org 2001/08/02 16:14:05
[openssh.git] / configure.in
index df712bb08ca6bb5d445cbf5d623ac4aaa185d1c2..e4c13413431ff444d24518f952d017726f3ff08b 100644 (file)
@@ -12,7 +12,7 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(PERL, perl)
+AC_PATH_PROGS(PERL, perl5 perl)
 AC_SUBST(PERL)
 AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)
@@ -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
@@ -58,20 +57,16 @@ case "$host" in
        fi
        AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
        AC_DEFINE(BROKEN_GETADDRINFO)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        dnl AIX handles lastlog as part of its login message
        AC_DEFINE(DISABLE_LASTLOG)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-*-cygwin*)
        LIBS="$LIBS -lregex /usr/lib/textmode.o"
        AC_DEFINE(HAVE_CYGWIN)
+       AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(IPV4_DEFAULT)
        AC_DEFINE(IP_TOS_IS_BROKEN)
-       AC_DEFINE(BROKEN_VHANGUP)
        AC_DEFINE(NO_X11_UNIX_SOCKETS)
        no_libsocket=1
        no_libnsl=1
@@ -79,37 +74,35 @@ 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"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
+       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"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
+       LIBS="$LIBS -lxnet -lsec"
        ;;
 *-*-irix5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
-       MANTYPE='$(CATMAN)'
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(BROKEN_INET_NTOA)
@@ -118,7 +111,6 @@ case "$host" in
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
-       MANTYPE='$(CATMAN)'
        AC_DEFINE(WITH_IRIX_ARRAY)
        AC_DEFINE(WITH_IRIX_PROJECT)
        AC_DEFINE(WITH_IRIX_AUDIT)
@@ -126,7 +118,6 @@ case "$host" in
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(BROKEN_INET_NTOA)
-       mansubdir=man
        ;;
 *-*-linux*)
        no_dev_ptmx=1
@@ -165,6 +156,8 @@ mips-sony-bsd|mips-sony-newsos4)
        LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
        need_dash_r=1
        AC_DEFINE(PAM_SUN_CODEBASE)
+       AC_DEFINE(LOGIN_NEEDS_UTMPX)
+       AC_DEFINE(LOGIN_NEEDS_TERM)
        # hardwire lastlog location (can't detect it on some versions)
        conf_lastlog_location="/var/adm/lastlog"
        AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x)
@@ -186,56 +179,43 @@ mips-sony-bsd|mips-sony-newsos4)
        conf_wtmp_location=/var/adm/wtmp
        conf_lastlog_location=/var/adm/lastlog
        AC_DEFINE(USE_PIPES)
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        ;;
 *-ncr-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        LIBS="$LIBS -lc89 -lnsl -lgen -lsocket"
+       AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        ;;
 *-sni-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
-       MANTYPE='$(CATMAN)'
        IPADDR_IN_DISPLAY=yes
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
-       mansubdir=cat
        LIBS="$LIBS -lgen -lnsl -lucb"
        ;;
 *-*-sysv4.2*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        enable_suid_ssh=no
        AC_DEFINE(USE_PIPES)
        ;;
 *-*-sysv*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        LIBS="$LIBS -lgen -lsocket"
        ;;
 *-*-sco3.2v4*)
        CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       MANTYPE='$(CATMAN)'
        LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
-       mansubdir=cat
        rsh_path="/usr/bin/rcmd"
        RANLIB=true
        no_dev_ptmx=1
@@ -246,13 +226,12 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        AC_DEFINE(BROKEN_SAVED_UIDS)
        AC_CHECK_FUNCS(getluid setluid)
+       MANTYPE=man
        ;;
 *-*-sco3.2v5*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        LIBS="$LIBS -lprot -lx -ltinfo -lm"
-       MANTYPE='$(CATMAN)'
-       mansubdir=cat
        no_dev_ptmx=1
        rsh_path="/usr/bin/rcmd"
        AC_DEFINE(USE_PIPES)
@@ -260,10 +239,28 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
        AC_CHECK_FUNCS(getluid setluid)
+       MANTYPE=man
        ;;
+*-*-unicos*)
+        no_libsocket=1
+        no_libnsl=1
+       AC_DEFINE(USE_PIPES)
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        LIBS="$LIBS -lgen -lrsc"
+        ;;
 *-dec-osf*)
-       if test ! -z "USE_SIA" ; then
-               AC_MSG_CHECKING(for Digital Unix Security Integration Architecture)
+       AC_MSG_CHECKING(for Digital Unix SIA)
+       no_osfsia=""
+       AC_ARG_WITH(osfsia,
+               [  --with-osfsia           Enable Digital Unix SIA],
+               [
+                       if test "x$withval" = "xno" ; then
+                               AC_MSG_RESULT(disabled)
+                               no_osfsia=1
+                       fi
+               ],
+       )
+       if test -z "$no_osfsia" ; then
                if test -f /etc/sia/matrix.conf; then
                        AC_MSG_RESULT(yes)
                        AC_DEFINE(HAVE_OSF_SIA)
@@ -368,7 +365,7 @@ AC_CHECK_FUNC(utimes,
 AC_FUNC_STRFTIME
 
 # Checks for header files.
-AC_CHECK_HEADERS(bstring.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 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)
@@ -404,74 +401,19 @@ AC_EGREP_CPP(FOUNDIT,
         ]
 )
 
-
-
-# Check whether user wants Kerberos support
-KRB4_MSG="no" 
-AC_ARG_WITH(kerberos4,
-       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
+AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
+AC_TRY_RUN(
        [
-               if test "x$withval" != "xno" ; then
-       
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                               if test ! -z "$need_dash_r" ; then
-                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
-                               fi
-                               if test ! -z "$blibpath" ; then
-                                       blibpath="$blibpath:${withval}/lib"
-                               fi
-                       else
-                               if test -d /usr/include/kerberosIV ; then
-                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
-                               fi
-                       fi
-
-                       AC_CHECK_HEADERS(krb.h)
-                       AC_CHECK_LIB(krb, main)
-                       if test "$ac_cv_header_krb_h" != yes; then
-                               AC_MSG_WARN([Cannot find krb.h, build may fail])
-                       fi
-                       if test "$ac_cv_lib_krb_main" != yes; then
-                               AC_MSG_WARN([Cannot find libkrb, build may fail])
-                       fi
-
-                       KLIBS="-lkrb -ldes"
-                       AC_CHECK_LIB(resolv, dn_expand, , )
-                       KRB4=yes
-                       KRB4_MSG="yes" 
-                       AC_DEFINE(KRB4)
-               fi
-       ]
-)
-
-# Check whether user wants AFS support
-AFS_MSG="no" 
-AC_ARG_WITH(afs,
-       [  --with-afs=PATH         Enable AFS support],
+#include <sys/types.h>
+#include <dirent.h>
+int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));}
+       ],
+       [AC_MSG_RESULT(yes)], 
        [
-               if test "x$withval" != "xno" ; then
-
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                       fi
-
-                       if test -z "$KRB4" ; then
-                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
-                       fi
-
-                       LIBS="$LIBS -lkafs"
-                       if test ! -z "$AFS_LIBS" ; then
-                               LIBS="$LIBS $AFS_LIBS"
-                       fi
-                       AC_DEFINE(AFS)
-                       AFS_MSG="yes" 
-               fi
+               AC_MSG_RESULT(no)
+               AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
        ]
 )
-LIBS="$LIBS $KLIBS"
 
 # Check whether user wants S/Key support
 SKEY_MSG="no" 
@@ -527,7 +469,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 glob inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid 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 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
@@ -650,22 +592,22 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
                        # Try to use $ssldir/lib if it exists, otherwise 
                        # $ssldir
                        if test -d "$ssldir/lib" ; then
-                               LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+                               LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
                                if test ! -z "$need_dash_r" ; then
-                                       LDFLAGS="$LDFLAGS -R$ssldir/lib"
+                                       LDFLAGS="-R$ssldir/lib $LDFLAGS"
                                fi
                        else
-                               LDFLAGS="$saved_LDFLAGS -L$ssldir"
+                               LDFLAGS="-L$ssldir $saved_LDFLAGS"
                                if test ! -z "$need_dash_r" ; then
-                                       LDFLAGS="$LDFLAGS -R$ssldir"
+                                       LDFLAGS="-R$ssldir $LDFLAGS"
                                fi
                        fi
                        # Try to use $ssldir/include if it exists, otherwise 
                        # $ssldir
                        if test -d "$ssldir/include" ; then
-                               CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+                               CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
                        else
-                               CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
+                               CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
                        fi
                fi
 
@@ -712,22 +654,22 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
                # Try to use $ssldir/lib if it exists, otherwise 
                # $ssldir
                if test -d "$ssldir/lib" ; then
-                       LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+                       LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
                        if test ! -z "$need_dash_r" ; then
-                               LDFLAGS="$LDFLAGS -R$ssldir/lib"
+                               LDFLAGS="-R$ssldir/lib $LDFLAGS"
                        fi
                else
-                       LDFLAGS="$saved_LDFLAGS -L$ssldir"
+                       LDFLAGS="-L$ssldir $saved_LDFLAGS"
                        if test ! -z "$need_dash_r" ; then
-                               LDFLAGS="$LDFLAGS -R$ssldir"
+                               LDFLAGS="-R$ssldir $LDFLAGS"
                        fi
                fi
                # Try to use $ssldir/include if it exists, otherwise 
                # $ssldir
                if test -d "$ssldir/include" ; then
-                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+                       CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
                else
-                       CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
+                       CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
                fi
        fi
 fi
@@ -763,6 +705,7 @@ int main(void)
                break;
        ], [])
 done
+LIBS="$saved_LIBS"
 
 if test ! -z "$no_rsa" ; then
        AC_MSG_RESULT(disabled)
@@ -778,7 +721,7 @@ else
                else
                        RSA_MSG="yes (using RSAref)"
                        AC_MSG_RESULT(using RSAref)
-                       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+                       LIBS="$LIBS -lcrypto -lRSAglue -lrsaref"
                fi
        fi
 fi
@@ -1111,7 +1054,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);
@@ -1210,6 +1153,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([], 
@@ -1222,6 +1194,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([], 
@@ -1247,6 +1233,89 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
 fi
 
 
+# Check whether user wants Kerberos support
+KRB4_MSG="no" 
+AC_ARG_WITH(kerberos4,
+       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
+       [
+               if test "x$withval" != "xno" ; then
+       
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
+                               fi
+                               if test ! -z "$blibpath" ; then
+                                       blibpath="$blibpath:${withval}/lib"
+                               fi
+                       else
+                               if test -d /usr/include/kerberosIV ; then
+                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
+                               fi
+                       fi
+
+                       AC_CHECK_HEADERS(krb.h)
+                       if test "$ac_cv_header_krb_h" != yes; then
+                               AC_MSG_WARN([Cannot find krb.h, build may fail])
+                       fi
+                       AC_CHECK_LIB(krb, main)
+                       if test "$ac_cv_lib_krb_main" != yes; then
+                               AC_CHECK_LIB(krb4, main)
+                               if test "$ac_cv_lib_krb4_main" != yes; then
+                                       AC_MSG_WARN([Cannot find libkrb nor libkrb4, build may fail])
+                               else
+                                       KLIBS="-lkrb4"
+                               fi
+                       else
+                               KLIBS="-lkrb"
+                       fi
+                       AC_CHECK_LIB(des, des_cbc_encrypt)
+                       if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then
+                               AC_CHECK_LIB(des425, des_cbc_encrypt)
+                               if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then
+                                       AC_MSG_WARN([Cannot find libdes nor libdes425, build may fail])
+                               else
+                                       KLIBS="-ldes425"
+                               fi
+                       else
+                               KLIBS="-ldes"
+                       fi
+                       AC_CHECK_LIB(resolv, dn_expand, , )
+                       KRB4=yes
+                       KRB4_MSG="yes" 
+                       AC_DEFINE(KRB4)
+               fi
+       ]
+)
+
+# Check whether user wants AFS support
+AFS_MSG="no" 
+AC_ARG_WITH(afs,
+       [  --with-afs=PATH         Enable AFS support],
+       [
+               if test "x$withval" != "xno" ; then
+
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                       fi
+
+                       if test -z "$KRB4" ; then
+                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
+                       fi
+
+                       LIBS="-lkafs $LIBS"
+                       if test ! -z "$AFS_LIBS" ; then
+                               LIBS="$LIBS $AFS_LIBS"
+                       fi
+                       AC_DEFINE(AFS)
+                       AFS_MSG="yes" 
+               fi
+       ]
+)
+LIBS="$LIBS $KLIBS"
+
 # Looking for programs, paths and files
 AC_ARG_WITH(rsh,
        [  --with-rsh=PATH         Specify path to remote shell program ],
@@ -1382,6 +1451,7 @@ 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_W, w)
        OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
@@ -1398,23 +1468,35 @@ fi
 AC_SUBST(INSTALL_SSH_PRNG_CMDS)
 
 
-AC_ARG_WITH(catman,
-       [  --with-catman=man|cat   Install preformatted manpages[no]],
+AC_ARG_WITH(mantype,
+       [  --with-mantype=man|cat|doc  Set man page type],
        [
-               MANTYPE='$(CATMAN)'
-               if test x"$withval" != x"yes" ; then
-                  mansubdir=$withval
-               else
-                  mansubdir=cat
-               fi
-       ], [
-               if test -z "$MANTYPE" ; then
-                       MANTYPE='$(TROFFMAN)'
-                       mansubdir=man
-               fi
+               case "$withval" in
+               man|cat|doc)
+                       MANTYPE=$withval
+                       ;;
+               *)
+                       AC_MSG_ERROR(invalid man type: $withval)
+                       ;;
+               esac
        ]
 )
+if test -z "$MANTYPE"; then
+       AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin:/usr/ucb)
+       if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
+               MANTYPE=doc
+       elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
+               MANTYPE=man
+       else
+               MANTYPE=cat
+       fi
+fi
 AC_SUBST(MANTYPE)
+if test "$MANTYPE" = "doc"; then
+       mansubdir=man;
+else
+       mansubdir=$MANTYPE;
+fi
 AC_SUBST(mansubdir)
 
 # Check whether to enable MD5 passwords
@@ -1597,11 +1679,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)
 
@@ -1870,11 +1952,6 @@ AC_OUTPUT(Makefile openbsd-compat/Makefile ssh_prng_cmds)
 
 # Print summary of options
 
-if test x$MANTYPE = x'$(CATMAN)' ; then
-       MAN_MSG=cat
-else 
-       MAN_MSG=man
-fi
 if test ! -z "$RANDOM_POOL" ; then
        RAND_MSG="Device ($RANDOM_POOL)"
 else
@@ -1899,7 +1976,7 @@ G=`eval echo ${piddir}` ; G=`eval echo ${G}`
 H=`eval echo ${user_path}` ; H=`eval echo ${H}`
 
 echo ""
-echo "OpenSSH configured has been configured with the following options."
+echo "OpenSSH has been configured with the following options:"
 echo "                 User binaries: $B"
 echo "               System binaries: $C"
 echo "           Configuration files: $D"
@@ -1908,7 +1985,7 @@ echo "                  Manual pages: $F"
 echo "                      PID file: $G"
 echo "        sshd default user PATH: $H"
 echo "      Random number collection: $RAND_MSG"
-echo "                Manpage format: $MAN_MSG"
+echo "                Manpage format: $MANTYPE"
 echo "                   PAM support: ${PAM_MSG}"
 echo "            KerberosIV support: $KRB4_MSG"
 echo "                   AFS support: $AFS_MSG"
This page took 0.273958 seconds and 4 git commands to generate.