X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/70e0115b85ffe0019f356795784f457d39858e68..b7a87eeab45a64bb687e4fc7e9757e2ce0442fa7:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index 6fb5d63c..c533d420 100644 --- a/configure.in +++ b/configure.in @@ -1,254 +1,414 @@ AC_INIT(ssh.c) AC_CONFIG_HEADER(config.h) +AC_PROG_CC AC_CANONICAL_HOST -dnl Checks for programs. -AC_PROG_CC +# Checks for programs. AC_PROG_CPP AC_PROG_RANLIB AC_PROG_INSTALL AC_CHECK_PROG(AR, ar, ar) -AC_PATH_PROG(xauth_path, xauth) - -dnl Use ip address instead of hostname in $DISPLAY -AC_ARG_WITH(rsh, - [ --with-rsh=PATH Specify path to remote shell program ], - [ - AC_DEFINE_UNQUOTED(RSH_PATH, "$withval") - ], - [ - AC_PATH_PROG(rsh_path, rsh) - ] -) +AC_PATH_PROG(PERL, perl) +AC_SUBST(PERL) -if test ! -z "$xauth_path" ; then - AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") -fi -if test ! -z "$rsh_path" ; then - AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path") +if test -z "$LD" ; then + LD=$CC fi - -dnl Checks for compiler characteristics -if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi - +AC_SUBST(LD) + +# C Compiler features AC_C_INLINE +if test "$GCC" = "yes"; then + CFLAGS="$CFLAGS -Wall" +fi -dnl Check for some target-specific stuff +# Check for some target-specific stuff case "$host" in +*-*-aix*) + AFS_LIBS="-lld" + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + if test "$LD" != "gcc" -a -z "$blibpath"; then + blibpath="/usr/lib:/lib:/usr/local/lib" + fi + AC_DEFINE(BROKEN_GETADDRINFO) + ;; *-*-hpux10*) if test -z "$GCC"; then CFLAGS="$CFLAGS -Aa" fi CFLAGS="$CFLAGS -D_HPUX_SOURCE" + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" AC_DEFINE(IPADDR_IN_DISPLAY) AC_DEFINE(USE_UTMPX) + AC_DEFINE(NEED_IN_SYSTM_H) AC_MSG_CHECKING(for HPUX trusted system password database) if test -f /tcb/files/auth/system/default; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW) LIBS="$LIBS -lsec" + AC_MSG_WARN([This configuration is untested]) else AC_MSG_RESULT(no) AC_DEFINE(DISABLE_SHADOW) fi + MANTYPE='$(CATMAN)' + mansubdir=cat + ;; +*-*-hpux11*) + if test -z "$GCC"; then + CFLAGS="$CFLAGS -Ae" + fi + CFLAGS="$CFLAGS -D_HPUX_SOURCE" + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + AC_DEFINE(IPADDR_IN_DISPLAY) + AC_DEFINE(USE_UTMPX) + AC_MSG_CHECKING(for HPUX trusted system password database) + if test -f /tcb/files/auth/system/default; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW) + LIBS="$LIBS -lsec" + AC_MSG_WARN([This configuration is untested]) + else + AC_MSG_RESULT(no) + AC_DEFINE(DISABLE_SHADOW) + fi + MANTYPE='$(CATMAN)' + mansubdir=cat + ;; +*-*-irix5*) + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + MANTYPE='$(CATMAN)' + no_libsocket=1 + no_libnsl=1 + ;; +*-*-irix6*) + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + MANTYPE='$(CATMAN)' + AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ]) + no_libsocket=1 + no_libnsl=1 + ;; +*-*-linux*) + no_dev_ptmx=1 + AC_DEFINE(DONT_TRY_OTHER_AF) + inet6_default_4in6=yes + ;; +*-*-netbsd*) + need_dash_r=1 ;; *-*-solaris*) + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib" + need_dash_r=1 AC_DEFINE(USE_UTMPX) ;; +*-*-sysv*) + CFLAGS="$CFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + AC_DEFINE(USE_UTMPX) + MANTYPE='$(CATMAN)' + mansubdir=cat + LIBS="$LIBS -lgen -lsocket" + ;; esac -dnl Check for OpenSSL/SSLeay directories. -AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) -for ssldir in /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do - if test -f "$ssldir/include/openssl/crypto.h"; then - AC_DEFINE(HAVE_OPENSSL) - GOT_SSL="yes" - break - fi - if test -f "$ssldir/include/ssl/crypto.h"; then - AC_DEFINE(HAVE_SSL) - GOT_SSL="yes" - break - fi -done -if test -z "$GOT_SSL" ; then - AC_MSG_ERROR([Could not find SSLeay / OpenSSL libraries, please install]) +# Checks for libraries. +AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) +AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") + +if test -z "$no_libsocket" ; then + AC_CHECK_LIB(nsl, yp_match, , ) fi -AC_SUBST(ssldir) -AC_DEFINE_UNQUOTED(ssldir, "$ssldir") -if test "$ssldir" != "/usr"; then - CFLAGS="$CFLAGS -I$ssldir/include" - LDFLAGS="$LDFLAGS -L$ssldir/lib" +if test -z "$no_libnsl" ; then + AC_CHECK_LIB(socket, main, , ) fi -LIBS="$LIBS -lssl -lcrypto" -AC_MSG_RESULT($ssldir) -dnl Check for RSAref library. -AC_MSG_CHECKING([for RSAref library]) -saved_LIBS="$LIBS" -LIBS="$saved_LIBS -lRSAglue -lrsaref" -AC_TRY_LINK([], [], -[AC_MSG_RESULT(yes); ], -[AC_MSG_RESULT(no)]; LIBS="$saved_LIBS") +# Checks for header files. +AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.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/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h) -dnl Checks for libraries. -AC_CHECK_LIB(crypto, CRYPTO_lock, ,AC_MSG_ERROR([*** libcrypto missing - please install first ***])) -AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***])) -AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil") -AC_CHECK_LIB(nsl, yp_match, , ) -AC_CHECK_LIB(socket, main, , ) +# Checks for library functions. +AC_CHECK_FUNCS(arc4random bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty) + +AC_CHECK_FUNC(login, + [AC_DEFINE(HAVE_LOGIN)], + [AC_CHECK_LIB(bsd, login, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_LOGIN)])] +) + +AC_CHECK_FUNC(daemon, + [AC_DEFINE(HAVE_DAEMON)], + [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])] +) + +AC_CHECK_FUNC(getpagesize, + [AC_DEFINE(HAVE_GETPAGESIZE)], + [AC_CHECK_LIB(ucb, getpagesize, [LIBS="$LIBS -lucb"; AC_DEFINE(HAVE_GETPAGESIZE)])] +) -dnl Use ip address instead of hostname in $DISPLAY AC_ARG_WITH(pam, [ --without-pam Disable PAM support ], [ - if test "x$withval" != "xno" ; then + if test "x$withval" = "xno" ; then no_pam=1 + AC_DEFINE(DISABLE_PAM) fi ] ) -if test -z "$no_pam" ; then +if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then AC_CHECK_LIB(dl, dlopen, , ) - AC_CHECK_LIB(pam, pam_authenticate, , ) + LIBS="$LIBS -lpam" + + AC_CHECK_FUNC(pam_getenvlist) + + # Check PAM strerror arguments (old PAM) + AC_MSG_CHECKING([whether pam_strerror takes only one argument]) + AC_TRY_COMPILE( + [ +#include +#include + ], + [(void)pam_strerror((pam_handle_t *)NULL, -1);], + [AC_MSG_RESULT(no)], + [ + AC_DEFINE(HAVE_OLD_PAM) + AC_MSG_RESULT(yes) + ] + ) fi -dnl Checks for header files. -AC_CHECK_HEADERS(endian.h lastlog.h login.h maillock.h netgroup.h paths.h poll.h pty.h shadow.h sys/bsdtty.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) +# The big search for OpenSSL +AC_ARG_WITH(ssl-dir, + [ --with-ssl-dir=PATH Specify path to OpenSSL installation ], + [ + if test "x$withval" != "$xno" ; then + tryssldir=$withval + fi + ] +) -dnl Checks for library functions. -AC_CHECK_FUNCS(arc4random getpagesize _getpty innetgr mkdtemp openpty setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf) +saved_LIBS="$LIBS" +saved_LDFLAGS="$LDFLAGS" +saved_CFLAGS="$CFLAGS" +if test "x$prefix" != "xNONE" ; then + tryssldir="$tryssldir $prefix" +fi +AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) +for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do + if test ! -z "$ssldir" ; then + LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" + CFLAGS="$saved_CFLAGS -I$ssldir/include" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" + fi + else + LDFLAGS="$saved_LDFLAGS" + fi -AC_CHECK_FUNC(login, - [AC_DEFINE(HAVE_LOGIN)], - [AC_CHECK_LIB(bsd, login, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_LOGIN)])] -) + for WANTS_RSAREF in "" 1 ; do + + if test -z "$WANTS_RSAREF" ; then + LIBS="$saved_LIBS -lcrypto" + else + LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref" + fi -AC_CHECK_FUNC(daemon, - [AC_DEFINE(HAVE_DAEMON)], - [AC_CHECK_LIB(bsd, daemon, [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])] -) + AC_TRY_RUN( + [ +#include +#include +#include +int main(void) +{ + RSA *key; char a[2048],b[2048];; + memset(a, 0, sizeof(a));memset(b, 0, sizeof(b)); + RAND_add(a, sizeof(a), sizeof(a)); + key=RSA_generate_key(32,3,NULL,NULL); + if (key==NULL) return(1); + return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING)); +} + ], + [ + AC_DEFINE(HAVE_OPENSSL) + found_crypto=1 + break; + ], [] + ) + done + + if test ! -z "$found_crypto" ; then + break; + fi +done + +if test -z "$found_crypto" ; then + AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install]) +fi +if test -z "$ssldir" ; then + ssldir="(system)" +else + CFLAGS="$saved_CFLAGS -I$ssldir/include" + LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:$ssldir:$ssldir/lib" + fi +fi +if test -z "$WANTS_RSAREF" ; then + LIBS="$saved_LIBS -lcrypto" +else + LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref" +fi +AC_MSG_RESULT($ssldir) -dnl Checks for data types +# Checks for data types +AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(short int, 2) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long int, 4) AC_CHECK_SIZEOF(long long int, 8) -dnl More checks for data types -AC_MSG_CHECKING([for quad_t]) +# More checks for data types +AC_MSG_CHECKING([for intXX_t types]) AC_TRY_COMPILE( [#include ], - [quad_t a; a = 1235;], + [int8_t a; int16_t b; int32_t c; a = b = c = 1;], [ - AC_DEFINE(HAVE_QUAD_T) + AC_DEFINE(HAVE_INTXX_T) AC_MSG_RESULT(yes) + have_intxx_t=1 ], [AC_MSG_RESULT(no)] ) -AC_MSG_CHECKING([for intXX_t types]) +AC_MSG_CHECKING([for u_intXX_t types]) AC_TRY_COMPILE( [#include ], - [int16_t a; int32_t b; a = 1235; b = 1235;], + [u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], [ - AC_DEFINE(HAVE_INTXX_T) + AC_DEFINE(HAVE_U_INTXX_T) AC_MSG_RESULT(yes) + have_u_intxx_t=1 ], [AC_MSG_RESULT(no)] ) -AC_MSG_CHECKING([for u_intXX_t types]) +if test -z "$have_u_intxx_t" -o -z "$have_intxx_t" -a \ + "x$ac_cv_header_sys_bitypes_h" = "xyes" +then + AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) + AC_TRY_COMPILE( + [#include ], + [ + int8_t a; int16_t b; int32_t c; + u_int8_t e; u_int16_t f; u_int32_t g; + a = b = c = e = f = g = 1; + ], + [ + AC_DEFINE(HAVE_U_INTXX_T) + AC_DEFINE(HAVE_INTXX_T) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] + ) +fi + +if test -z "$have_u_intxx_t" ; then + AC_MSG_CHECKING([for uintXX_t types]) + AC_TRY_COMPILE( + [#include ], + [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 + +AC_MSG_CHECKING([for socklen_t]) AC_TRY_COMPILE( - [#include ], - [u_int16_t c; u_int32_t d; c = 1235; d = 1235;], [ - AC_DEFINE(HAVE_U_INTXX_T) +#include +#include + ], + [socklen_t foo; foo = 1235;], + [ + AC_DEFINE(HAVE_SOCKLEN_T) AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no)] -) +) -AC_MSG_CHECKING([For uintXX_t types]) +AC_MSG_CHECKING([for size_t]) AC_TRY_COMPILE( - [#include ], - [uint16_t c; uint32_t d; c = 1235; d = 1235;], + [#include ], + [size_t foo; foo = 1235;], [ - AC_DEFINE(HAVE_UINTXX_T) + AC_DEFINE(HAVE_SIZE_T) AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no)] -) +) -dnl Check PAM strerror arguments -AC_MSG_CHECKING([whether pam_strerror takes only one argument]) +AC_MSG_CHECKING([for struct sockaddr_storage]) AC_TRY_COMPILE( [ - #include - #include - ], - [(void)pam_strerror((pam_handle_t *)NULL, -1);], - [AC_MSG_RESULT(no)], +#include +#include + ], + [struct sockaddr_storage s;], [ - AC_DEFINE(HAVE_OLD_PAM) + AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) AC_MSG_RESULT(yes) - ] -) + ], + [AC_MSG_RESULT(no)] +) -AC_MSG_CHECKING([whether to build GNOME ssh-askpass]) -dnl Check whether user wants GNOME ssh-askpass -AC_ARG_WITH(gnome-askpass, - [ --with-gnome-askpass Build the GNOME passphrase requester (default=no)], +AC_MSG_CHECKING([for struct sockaddr_in6]) +AC_TRY_COMPILE( + [#include ], + [struct sockaddr_in6 s; s.sin6_family = 0;], [ - if test x$withval = xno ; then - GNOME_ASKPASS=""; - else - GNOME_ASKPASS="gnome-ssh-askpass"; - fi - ]) -AC_SUBST(GNOME_ASKPASS) - -if test -z "$GNOME_ASKPASS" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) -fi + AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) -dnl Check for user-specified random device -AC_ARG_WITH(random, - [ --with-random=FILE read randomness from FILE (default=/dev/urandom)], +AC_MSG_CHECKING([for struct in6_addr]) +AC_TRY_COMPILE( + [#include ], + [struct in6_addr s; s.s6_addr[0] = 0;], [ - RANDOM_POOL="$withval"; - AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") + AC_DEFINE(HAVE_STRUCT_IN6_ADDR) + AC_MSG_RESULT(yes) ], - [ - dnl Check for random device - AC_CHECK_FILE("/dev/urandom", - [ - RANDOM_POOL="/dev/urandom"; - AC_SUBST(RANDOM_POOL) - AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") - ] - ) - ] + [AC_MSG_RESULT(no)] ) -dnl Check for EGD pool file -AC_ARG_WITH(egd-pool, - [ --with-egd-pool=FILE read randomness from EGD pool FILE (default none)], +AC_MSG_CHECKING([for struct addrinfo]) +AC_TRY_COMPILE( [ - RANDOM_POOL="$withval"; - AC_DEFINE(HAVE_EGD) - AC_SUBST(RANDOM_POOL) - AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") - ] +#include +#include +#include + ], + [struct addrinfo s; s.ai_flags = AI_PASSIVE;], + [ + AC_DEFINE(HAVE_STRUCT_ADDRINFO) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] ) -dnl Make sure we have random number support -if test -z "$RANDOM_POOL" -a -z "$EGD_POOL"; then - AC_MSG_ERROR([No random device found, and no EGD random pool specified]) -fi - +# Checks for structure members AC_MSG_CHECKING([whether utmp.h has ut_host field]) AC_EGREP_HEADER(ut_host, utmp.h, [AC_DEFINE(HAVE_HOST_IN_UTMP) AC_MSG_RESULT(yes); ], @@ -279,8 +439,113 @@ AC_EGREP_HEADER(ut_tv, utmp.h, [AC_DEFINE(HAVE_TV_IN_UTMP) AC_MSG_RESULT(yes); ], [AC_MSG_RESULT(no)] ) +AC_MSG_CHECKING([whether utmp.h has ut_id field]) +AC_EGREP_HEADER(ut_id, utmp.h, + [AC_DEFINE(HAVE_ID_IN_UTMP) AC_MSG_RESULT(yes); ], + [AC_MSG_RESULT(no)] +) +AC_MSG_CHECKING([whether utmp.h has ut_addr field]) +AC_EGREP_HEADER(ut_addr, utmp.h, + [AC_DEFINE(HAVE_ADDR_IN_UTMP) AC_MSG_RESULT(yes); ], + [AC_MSG_RESULT(no)] +) +AC_MSG_CHECKING([whether utmpx.h has ut_addr field]) +AC_EGREP_HEADER(ut_addr, utmpx.h, + [AC_DEFINE(HAVE_ADDR_IN_UTMPX) AC_MSG_RESULT(yes); ], + [AC_MSG_RESULT(no)] +) +AC_MSG_CHECKING([whether utmp.h has ut_addr_v6 field]) +AC_EGREP_HEADER(ut_addr_v6, utmp.h, + [AC_DEFINE(HAVE_ADDR_V6_IN_UTMP) AC_MSG_RESULT(yes); ], + [AC_MSG_RESULT(no)] +) +AC_MSG_CHECKING([whether utmpx.h has ut_addr_v6 field]) +AC_EGREP_HEADER(ut_addr_v6, utmpx.h, + [AC_DEFINE(HAVE_ADDR_V6_IN_UTMPX) AC_MSG_RESULT(yes); ], + [AC_MSG_RESULT(no)] +) + +AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field]) +AC_TRY_COMPILE( + [ +#include +#include + ], + [struct sockaddr_storage s; s.ss_family = 1;], + [ + AC_DEFINE(HAVE_SS_FAMILY_IN_SS) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) +AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field]) +AC_TRY_COMPILE( + [ +#include +#include + ], + [struct sockaddr_storage s; s.__ss_family = 1;], + [ + AC_DEFINE(HAVE___SS_FAMILY_IN_SS) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) + +AC_MSG_CHECKING([whether libc defines __progname]) +AC_TRY_LINK([], + [extern char *__progname; printf("%s", __progname);], + [ + AC_DEFINE(HAVE___PROGNAME) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ] +) + +# Looking for programs, paths and files +AC_ARG_WITH(rsh, + [ --with-rsh=PATH Specify path to remote shell program ], + [ + if test "x$withval" != "$no" ; then + AC_DEFINE_UNQUOTED(RSH_PATH, "$withval") + fi + ], + [ + AC_PATH_PROG(rsh_path, rsh) + ] +) + +AC_ARG_WITH(xauth, + [ --with-xauth=PATH Specify path to xauth program ], + [ + if test "x$withval" != "$xno" ; then + AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval") + fi + ], + [ + AC_PATH_PROG(xauth_path, xauth) + if test ! -z "$xauth_path" -a -x "/usr/openwin/bin/xauth" ; then + xauth_path="/usr/openwin/bin/xauth" + fi + ] +) + +if test ! -z "$xauth_path" ; then + AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") +fi +if test ! -z "$rsh_path" ; then + AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path") +fi -dnl Look for lastlog location +# Check for mail directory (last resort if we cannot get it from headers) +if test ! -z "$MAIL" ; then + maildir=`dirname $MAIL` + AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir") +fi + +# Look for lastlog location AC_ARG_WITH(lastlog, [ --with-lastlog=FILE Location of lastlog file], [ @@ -292,7 +557,7 @@ AC_ARG_WITH(lastlog, ], [ AC_MSG_CHECKING([location of lastlog file]) - for lastlog in /var/log/lastlog /var/adm/lastlog /etc/security/lastlog ; do + for lastlog in /var/log/lastlog /var/adm/lastlog /usr/adm/lastlog /etc/security/lastlog ; do if test -f $lastlog ; then gotlastlog="file" break @@ -303,16 +568,16 @@ AC_ARG_WITH(lastlog, fi done if test -z "$gotlastlog" ; then - AC_MSG_WARN([*** Cannot find lastlog ***]) + AC_MSG_RESULT(not found) nolastlog=1 else if test "x$gotlastlog" = "xdir" ; then + AC_MSG_RESULT(${lastlog}/) AC_DEFINE(LASTLOG_IS_DIR) - AC_MSG_WARN([*** Directory-based lastlogs are not yet supported ***]) - nolastlog=1 + else + AC_MSG_RESULT($lastlog) + AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$lastlog") fi - AC_MSG_RESULT($lastlog) - AC_DEFINE_UNQUOTED(LASTLOG_LOCATION, "$lastlog") fi ] ) @@ -322,66 +587,248 @@ if test ! -z "$nolastlog" ; then AC_DEFINE(DISABLE_LASTLOG) fi -AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)) -AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)) +if test -z "$no_dev_ptmx" ; then + AC_CHECK_FILE("/dev/ptmx", + [ + AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX) + have_dev_ptmx=1 + ] + ) +fi +AC_CHECK_FILE("/dev/ptc", + [ + AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC) + have_dev_ptc=1 + ] +) -AC_MSG_CHECKING([whether libc defines __progname]) -AC_TRY_LINK([], - [extern char *__progname; printf("%s", __progname);], +# Options from here on. Some of these are preset by platform above + +# Check for user-specified random device, otherwise check /dev/urandom +AC_ARG_WITH(random, + [ --with-random=FILE read randomness from FILE (default=/dev/urandom)], [ - AC_DEFINE(HAVE___PROGNAME) - AC_MSG_RESULT(yes) - ], + if test "x$withval" != "xno" ; then + RANDOM_POOL="$withval"; + AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") + fi + ], [ - AC_MSG_RESULT(no) + # Check for random device + AC_CHECK_FILE("/dev/urandom", + [ + RANDOM_POOL="/dev/urandom"; + AC_SUBST(RANDOM_POOL) + AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") + ] + ) ] ) -dnl Check whether user wants Kerberos support +# Check for EGD pool file +AC_ARG_WITH(egd-pool, + [ --with-egd-pool=FILE read randomness from EGD pool FILE (default none)], + [ + if test "x$withval" != "xno" ; then + EGD_SOCKET="$withval"; + AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") + fi + ] +) + +if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then + # Use these commands to collect entropy + AC_PATH_PROG(PROG_LS, ls) + AC_PATH_PROG(PROG_NETSTAT, netstat) + AC_PATH_PROG(PROG_ARP, arp) + AC_PATH_PROG(PROG_IFCONFIG, ifconfig) + AC_PATH_PROG(PROG_PS, ps) + AC_PATH_PROG(PROG_W, w) + AC_PATH_PROG(PROG_WHO, who) + AC_PATH_PROG(PROG_LAST, last) + AC_PATH_PROG(PROG_LASTLOG, lastlog) + AC_PATH_PROG(PROG_DF, df) + AC_PATH_PROG(PROG_VMSTAT, vmstat) + AC_PATH_PROG(PROG_UPTIME, uptime) + AC_PATH_PROG(PROG_IPCS, ipcs) + AC_PATH_PROG(PROG_TAIL, tail) + AC_PATH_PROG(PROG_LS, ls) + if test ! -z "$PROG_LS" ; then + AC_DEFINE_UNQUOTED(PROG_LS, "$PROG_LS") + fi + if test ! -z "$PROG_NETSTAT" ; then + AC_DEFINE_UNQUOTED(PROG_NETSTAT, "$PROG_NETSTAT") + fi + if test ! -z "$PROG_ARP" ; then + AC_DEFINE_UNQUOTED(PROG_ARP, "$PROG_ARP") + fi + if test ! -z "$PROG_IFCONFIG" ; then + AC_DEFINE_UNQUOTED(PROG_IFCONFIG, "$PROG_IFCONFIG") + fi + if test ! -z "$PROG_PS" ; then + AC_DEFINE_UNQUOTED(PROG_PS, "$PROG_PS") + fi + if test ! -z "$PROG_W" ; then + AC_DEFINE_UNQUOTED(PROG_W, "$PROG_W") + fi + if test ! -z "$PROG_WHO" ; then + AC_DEFINE_UNQUOTED(PROG_WHO, "$PROG_WHO") + fi + if test ! -z "$PROG_LAST" ; then + AC_DEFINE_UNQUOTED(PROG_LAST, "$PROG_LAST") + fi + if test ! -z "$PROG_LASTLOG" ; then + AC_DEFINE_UNQUOTED(PROG_LASTLOG, "$PROG_LASTLOG") + fi + if test ! -z "$PROG_DF" ; then + AC_DEFINE_UNQUOTED(PROG_DF, "$PROG_DF") + fi + if test ! -z "$PROG_VMSTAT" ; then + AC_DEFINE_UNQUOTED(PROG_VMSTAT, "$PROG_VMSTAT") + fi + if test ! -z "$PROG_UPTIME" ; then + AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") + fi + if test ! -z "$PROG_UPTIME" ; then + AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME") + fi + if test ! -z "$PROG_TAIL" ; then + AC_DEFINE_UNQUOTED(PROG_TAIL, "$PROG_TAIL") + fi +fi + +AC_ARG_WITH(catman, + [ --with-catman=man|cat Install preformatted manpages[no]], + [ + 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 + ] +) +AC_SUBST(MANTYPE) +AC_SUBST(mansubdir) + +# Check whether user wants Kerberos support AC_ARG_WITH(kerberos4, - [ --with-kerberos4 Enable Kerberos 4 support], + [ --with-kerberos4=PATH Enable Kerberos 4 support], [ - AC_DEFINE(KRB4) - LIBS="$LIBS -lkrb" - CFLAGS="$CFLAGS -I/usr/include/kerberosIV" + if test "x$withval" != "xno" ; then + + if test "x$withval" != "$xyes" ; then + CFLAGS="$CFLAGS -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 + CFLAGS="$CFLAGS -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 + AC_DEFINE(KRB4) + fi ] ) -dnl Check whether user wants AFS support +# Check whether user wants AFS support AC_ARG_WITH(afs, - [ --with-afs Enable AFS support], + [ --with-afs=PATH Enable AFS support], [ - AC_DEFINE(AFS) - LIBS="$LIBS -lkafs" + if test "x$withval" != "xno" ; then + + if test "x$withval" != "$xyes" ; then + CFLAGS="$CFLAGS -I${withval}/include" + LFLAGS="$LFLAGS -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) + fi ] ) +LIBS="$LIBS $KLIBS" -dnl Check whether user wants S/Key support +# Check whether user wants S/Key support AC_ARG_WITH(skey, [ --with-skey Enable S/Key support], [ - AC_DEFINE(SKEY) - LIBS="$LIBS -lskey" + if test "x$withval" != "xno" ; then + AC_DEFINE(SKEY) + LIBS="$LIBS -lskey" + fi ] ) -dnl Check whether user wants TCP wrappers support +# Check whether user wants TCP wrappers support AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers Enable tcpwrappers support], [ - AC_DEFINE(LIBWRAP) - LIBWRAP="-lwrap" + if test "x$withval" != "xno" ; then + saved_LIBS="$LIBS" + LIBS="$LIBS -lwrap" + AC_MSG_CHECKING(for libwrap) + AC_TRY_LINK( + [ +#include + int deny_severity = 0, allow_severity = 0; + ], + [hosts_access(0);], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(LIBWRAP) + ], + [ + AC_MSG_RESULT(no) + AC_MSG_WARN([*** libwrap missing - tcpwrapper support disabled ***]) + LIBS="$saved_LIBS" + ] + ) + fi ] ) -AC_SUBST(LIBWRAP) -dnl Check whether to enable MD5 passwords +# Check whether to enable MD5 passwords AC_ARG_WITH(md5-passwords, [ --with-md5-passwords Enable use of MD5 passwords], - [AC_DEFINE(HAVE_MD5_PASSWORDS)] + [ + if test "x$withval" != "xno" ; then + AC_DEFINE(HAVE_MD5_PASSWORDS) + fi + ] ) -dnl Check whether to enable utmpx support +# Check whether to enable utmpx support AC_ARG_WITH(utmpx, [ --with-utmpx Enable utmpx support], [ @@ -391,7 +838,7 @@ AC_ARG_WITH(utmpx, ] ) -dnl Whether to disable shadow password support +# Whether to disable shadow password support AC_ARG_WITH(shadow, [ --without-shadow Disable shadow password support], [ @@ -401,7 +848,7 @@ AC_ARG_WITH(shadow, ] ) -dnl Use ip address instead of hostname in $DISPLAY +# Use ip address instead of hostname in $DISPLAY AC_ARG_WITH(ipaddr-display, [ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY], [ @@ -411,19 +858,77 @@ AC_ARG_WITH(ipaddr-display, ] ) -AC_ARG_WITH(path, +# Whether to mess with the default path +AC_ARG_WITH(default-path, [ --with-default-path=PATH Specify default \$PATH environment for server], [ if test "x$withval" != "xno" ; then - AC_DEFINE_UNQUOTED(USER_PATH, $withval") + AC_DEFINE_UNQUOTED(USER_PATH, "$withval") fi ] ) -dnl Check for mail directory (last resort if we cannot get it from headers) -if test ! -z "$MAIL" ; then - maildir=`dirname $MAIL` - AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir") +# Whether to force IPv4 by default (needed on broken glibc Linux) +AC_ARG_WITH(ipv4-default, + [ --with-ipv4-default Use IPv4 by connections unless '-6' specified], + [ + if test "x$withval" != "xno" ; then + AC_DEFINE(IPV4_DEFAULT) + fi + ] +) + +AC_MSG_CHECKING([to convert IPv4 in IPv6-mapped addresses]) +AC_ARG_WITH(4in6, + [ --with-4in6 Check for and convert IPv4 in IPv6 mapped addresses], + [ + if test "x$withval" != "xno" ; then + AC_MSG_RESULT(yes) + AC_DEFINE(IPV4_IN_IPV6) + else + AC_MSG_RESULT(no) + fi + ],[ + if test "x$inet6_default_4in6" = "xyes"; then + AC_MSG_RESULT([yes (default)]) + AC_DEFINE(IPV4_IN_IPV6) + else + AC_MSG_RESULT([no (default)]) + fi + ] +) + +# Where to place sshd.pid +piddir=/var/run +AC_ARG_WITH(pid-dir, + [ --with-pid-dir=PATH Specify location of ssh.pid file], + [ + if test "x$withval" != "xno" ; then + piddir=$withval + fi + ] +) + +AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") +AC_SUBST(piddir) + + +# Change default command timeout for builtin PRNG +entropy_timeout=100 +AC_ARG_WITH(entropy-timeout, + [ --with-entropy-timeout Specify entropy gathering command timeout (msec)], + [ + if test "x$withval" != "xno" ; then + entropy_timeout=$withval + fi + ] +) +AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout) + + +if test ! -z "$blibpath" ; then + LDFLAGS="$LDFLAGS -blibpath:$blibpath" + AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) fi AC_OUTPUT(Makefile)