1c1
< # $Id: configure.ac,v 1.113 2003/03/21 01:18:09 mouring Exp $
---
> # $Id: configure.ac,v 1.154.2.11 2003/09/23 09:24:21 djm Exp $
11a12
> AC_PROG_AWK
57d57
< AFS_LIBS="-lld"
60,72c60,62
< if (test "$LD" != "gcc" && test -z "$blibpath"); then
< AC_MSG_CHECKING([if linkage editor ($LD) accepts -blibpath])
< saved_LDFLAGS="$LDFLAGS"
< LDFLAGS="$LDFLAGS -blibpath:/usr/lib:/lib:/usr/local/lib"
< AC_TRY_LINK([],
< [],
< [
< AC_MSG_RESULT(yes)
< blibpath="/usr/lib:/lib:/usr/local/lib"
< ],
< [ AC_MSG_RESULT(no) ]
< )
< LDFLAGS="$saved_LDFLAGS"
---
> AC_MSG_CHECKING([how to specify blibpath for linker ($LD)])
> if (test -z "$blibpath"); then
> blibpath="/usr/lib:/lib:/usr/local/lib"
73a64,78
> saved_LDFLAGS="$LDFLAGS"
> for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
> if (test -z "$blibflags"); then
> LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
> AC_TRY_LINK([], [], [blibflags=$tryflags])
> fi
> done
> if (test -z "$blibflags"); then
> AC_MSG_RESULT(not found)
> AC_MSG_ERROR([*** must be able to specify blibpath on AIX - check config.log])
> else
> AC_MSG_RESULT($blibflags)
> fi
> LDFLAGS="$saved_LDFLAGS"
> dnl Check for authenticate. Might be in libs.a on older AIXes
79a85,98
> dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
> AC_CHECK_DECL(loginfailed,
> [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
> AC_TRY_COMPILE(
> [#include <usersec.h>],
> [(void)loginfailed("user","host","tty",0);],
> [AC_MSG_RESULT(yes)
> AC_DEFINE(AIX_LOGINFAILED_4ARG)],
> [AC_MSG_RESULT(no)]
> )],
> [],
> [#include <usersec.h>]
> )
> AC_CHECK_FUNCS(setauthdb)
81a101,103
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
85,86c107
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_CLOBBER_ARGV)
< AC_DEFINE(SETPROCTITLE_PS_PADDING, '\0')
---
> AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
94d114
< AC_DEFINE(IPV4_DEFAULT)
114a135,137
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
128c151,152
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
144c168,169
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
157c182,183
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
166a193
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
176a204,206
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
177a208
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
181a213
> check_for_openpty_ctty_bug=1
184,185c216,217
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_CLOBBER_ARGV)
< AC_DEFINE(SETPROCTITLE_PS_PADDING, '\0')
---
> AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
> AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
186a219,223
> case `uname -r` in
> 1.*|2.0.*)
> AC_DEFINE(BROKEN_CMSG_TYPE)
> ;;
> esac
198a236,240
> *-*-bsdi*)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> ;;
219c261,264
< AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
> # Pushing STREAMS modules will cause sshd to acquire a controlling tty.
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> external_path_file=/etc/default/login
245a291,294
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
253a303,304
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> external_path_file=/etc/default/login
261a313,315
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
266a321,323
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
282a340
> AC_DEFINE(WITH_ABBREV_NO_TTY)
298a357,360
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> AC_DEFINE(WITH_ABBREV_NO_TTY)
308a371,378
> *-*-unicosmp*)
> AC_DEFINE(WITH_ABBREV_NO_TTY)
> AC_DEFINE(USE_PIPES)
> AC_DEFINE(DISABLE_FD_PASSING)
> LDFLAGS="$LDFLAGS"
> LIBS="$LIBS -lgen -lacid"
> MANTYPE=cat
> ;;
340a411,415
> AC_DEFINE(BROKEN_GETADDRINFO)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> AC_DEFINE(LOCKED_PASSWD_SUBSTR, "Nologin")
385a461,472
> AC_MSG_CHECKING(compiler and flags for sanity)
> AC_TRY_RUN([
> #include <stdio.h>
> int main(){exit(0);}
> ],
> [ AC_MSG_RESULT(yes) ],
> [
> AC_MSG_RESULT(no)
> AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
> ]
> )
>
387,388c474,475
< AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
< getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \
---
> AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
> getopt.h glob.h ia.h lastlog.h limits.h login.h \
392,393c479,480
< strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
< sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
---
> strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
> sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
396c483
< util.h utime.h utmp.h utmpx.h)
---
> util.h utime.h utmp.h utmpx.h vis.h)
408a496,532
> dnl IRIX and Solaris 2.5.1 have dirname() in libgen
> AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
> AC_CHECK_LIB(gen, dirname,[
> AC_CACHE_CHECK([for broken dirname],
> ac_cv_have_broken_dirname, [
> save_LIBS="$LIBS"
> LIBS="$LIBS -lgen"
> AC_TRY_RUN(
> [
> #include <libgen.h>
> #include <string.h>
>
> int main(int argc, char **argv) {
> char *s, buf[32];
>
> strncpy(buf,"/etc", 32);
> s = dirname(buf);
> if (!s || strncmp(s, "/", 32) != 0) {
> exit(1);
> } else {
> exit(0);
> }
> }
> ],
> [ ac_cv_have_broken_dirname="no" ],
> [ ac_cv_have_broken_dirname="yes" ]
> )
> LIBS="$save_LIBS"
> ])
> if test "x$ac_cv_have_broken_dirname" = "xno" ; then
> LIBS="$LIBS -lgen"
> AC_DEFINE(HAVE_DIRNAME)
> AC_CHECK_HEADERS(libgen.h)
> fi
> ])
> ])
>
410a535
> AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
607,610c732,735
< arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename bcopy \
< bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
< gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \
< getpeereid _getpty getrlimit getrusage getttyent glob inet_aton \
---
> arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
> bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
> getaddrinfo getcwd getgrouplist getnameinfo getopt \
> getpeereid _getpty getrlimit getttyent glob inet_aton \
612,617c737,743
< mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openpty pstat \
< readpassphrase realpath recvmsg rresvport_af sendmsg setdtablesize \
< setegid setenv seteuid setgroups setlogin setpcred setproctitle \
< setresgid setreuid setrlimit setsid setvbuf sigaction sigvec \
< snprintf socketpair strerror strlcat strlcpy strmode strnvis \
< sysconf tcgetpgrp truncate utimes vhangup vsnprintf waitpid \
---
> mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
> pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
> setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
> setproctitle setregid setresgid setresuid setreuid setrlimit \
> setsid setvbuf sigaction sigvec snprintf socketpair strerror \
> strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
> truncate utimes vhangup vsnprintf waitpid \
620c746,752
< AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
---
> # IRIX has a const char return value for gai_strerror()
> AC_CHECK_FUNCS(gai_strerror,[
> AC_DEFINE(HAVE_GAI_STRERROR)
> AC_TRY_COMPILE([
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <netdb.h>
622,623c754,755
< dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
< AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
---
> const char *gai_strerror(int);],[
> char *str;
625,635c757,759
< dnl IRIX and Solaris 2.5.1 have dirname() in libgen
< AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
< AC_CHECK_LIB(gen, dirname,[
< AC_CACHE_CHECK([for broken dirname],
< ac_cv_have_broken_dirname, [
< save_LIBS="$LIBS"
< LIBS="$LIBS -lgen"
< AC_TRY_RUN(
< [
< #include <libgen.h>
< #include <string.h>
---
> str = gai_strerror(0);],[
> AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1,
> [Define if gai_strerror() returns const char *])])])
637,638c761
< int main(int argc, char **argv) {
< char *s, buf[32];
---
> AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
640,660c763,765
< strncpy(buf,"/etc", 32);
< s = dirname(buf);
< if (!s || strncmp(s, "/", 32) != 0) {
< exit(1);
< } else {
< exit(0);
< }
< }
< ],
< [ ac_cv_have_broken_dirname="no" ],
< [ ac_cv_have_broken_dirname="yes" ]
< )
< LIBS="$save_LIBS"
< ])
< if test "x$ac_cv_have_broken_dirname" = "xno" ; then
< LIBS="$LIBS -lgen"
< AC_DEFINE(HAVE_DIRNAME)
< AC_CHECK_HEADERS(libgen.h)
< fi
< ])
< ])
---
> dnl Make sure prototypes are defined for these before using them.
> AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
> AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
661a767,773
> dnl tcsendbreak might be a macro
> AC_CHECK_DECL(tcsendbreak,
> [AC_DEFINE(HAVE_TCSENDBREAK)],
> [AC_CHECK_FUNCS(tcsendbreak)],
> [#include <termios.h>]
> )
>
723a836,882
> dnl make sure that openpty does not reacquire controlling terminal
> if test ! -z "$check_for_openpty_ctty_bug"; then
> AC_MSG_CHECKING(if openpty correctly handles controlling tty)
> AC_TRY_RUN(
> [
> #include <stdio.h>
> #include <sys/fcntl.h>
> #include <sys/types.h>
> #include <sys/wait.h>
>
> int
> main()
> {
> pid_t pid;
> int fd, ptyfd, ttyfd, status;
>
> pid = fork();
> if (pid < 0) { /* failed */
> exit(1);
> } else if (pid > 0) { /* parent */
> waitpid(pid, &status, 0);
> if (WIFEXITED(status))
> exit(WEXITSTATUS(status));
> else
> exit(2);
> } else { /* child */
> close(0); close(1); close(2);
> setsid();
> openpty(&ptyfd, &ttyfd, NULL, NULL, NULL);
> fd = open("/dev/tty", O_RDWR | O_NOCTTY);
> if (fd >= 0)
> exit(3); /* Acquired ctty: broken */
> else
> exit(0); /* Did not acquire ctty: OK */
> }
> }
> ],
> [
> AC_MSG_RESULT(yes)
> ],
> [
> AC_MSG_RESULT(no)
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> ]
> )
> fi
>
738a898
> AC_CHECK_FUNCS(pam_putenv)
903c1063,1065
< AC_MSG_ERROR(Your OpenSSL headers do not match your library)
---
> AC_MSG_ERROR([Your OpenSSL headers do not match your library.
> Check config.log for details.
> Also see contrib/findssl.sh for help identifying header/library mismatches.])
909c1071
< if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then
---
> if test "x$check_for_libcrypt_later" = "x1"; then
1750d1911
<
1799a1961,1983
> # Check whether user wants DNS support
> DNS_MSG="no"
> AC_ARG_WITH(dns,
> [ --with-dns Support for fetching keys from DNS (experimental)],
> [
> if test "x$withval" != "xno" ; then
> DNS_MSG="yes"
> AC_DEFINE(DNS)
> AC_SEARCH_LIBS(getrrsetbyname, resolv,
> [AC_DEFINE(HAVE_GETRRSETBYNAME)],
> [
> # Needed by our getrrsetbyname()
> AC_SEARCH_LIBS(res_query, resolv)
> AC_SEARCH_LIBS(dn_expand, resolv)
> AC_CHECK_FUNCS(_getshort _getlong)
> AC_CHECK_MEMBER(HEADER.ad,
> [AC_DEFINE(HAVE_HEADER_AD)],,
> [#include <arpa/nameser.h>])
> ])
> fi
> ]
> )
>
1832c2016
< AC_CHECK_LIB(resolv, dn_expand, , )
---
> AC_SEARCH_LIBS(dn_expand, resolv)
1833a2018,2042
> AC_CHECK_LIB(gssapi,gss_init_sec_context,
> [ AC_DEFINE(GSSAPI)
> K5LIBS="-lgssapi $K5LIBS" ],
> [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
> [ AC_DEFINE(GSSAPI)
> K5LIBS="-lgssapi_krb5 $K5LIBS" ],
> AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
> $K5LIBS)
> ],
> $K5LIBS)
>
> AC_CHECK_HEADER(gssapi.h, ,
> [ unset ac_cv_header_gssapi_h
> CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
> AC_CHECK_HEADERS(gssapi.h, ,
> AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
> )
> ]
> )
>
> oldCPP="$CPPFLAGS"
> CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
> AC_CHECK_HEADER(gssapi_krb5.h, ,
> [ CPPFLAGS="$oldCPP" ])
>
1838,1857c2047
< # Check whether user wants Kerberos 4 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
---
> LIBS="$LIBS $K5LIBS"
1859,1919d2048
< 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 $K5LIBS"
<
2087a2217,2227
> # check for /etc/default/login and use it if present.
> AC_ARG_ENABLE(etc-default-login,
> [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],,
> [
> AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
>
> if test "x$external_path_file" = "x/etc/default/login"; then
> AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
> fi
> ])
>
2091c2231
< USES_LOGIN_CONF=yes
---
> external_path_file=/etc/login.conf
2092a2233
>
2098c2239
< if test "$USES_LOGIN_CONF" = "yes" ; then
---
> if test "x$external_path_file" = "x/etc/login.conf" ; then
2102a2244,2248
> if test ! -z "$external_path_file" ; then
> AC_MSG_WARN([
> --with-default-path=PATH will only be used if PATH is not defined in
> $external_path_file .])
> fi
2107,2108c2253,2254
< [ if test "$USES_LOGIN_CONF" = "yes" ; then
< AC_MSG_WARN([Make sure the path to scp is in /etc/login.conf])
---
> [ if test "x$external_path_file" = "x/etc/login.conf" ; then
> AC_MSG_WARN([Make sure the path to scp is in /etc/login.conf])
2110,2111c2256,2262
< AC_TRY_RUN(
< [
---
> if test ! -z "$external_path_file" ; then
> AC_MSG_WARN([
> If PATH is defined in $external_path_file, ensure the path to scp is included,
> otherwise scp will not work.])
> fi
> AC_TRY_RUN(
> [
2165c2316
< if test "$USES_LOGIN_CONF" != "yes" ; then
---
> if test "x$external_path_file" != "x/etc/login.conf" ; then
2182,2193d2332
< # Whether to force IPv4 by default (needed on broken glibc Linux)
< IPV4_HACK_MSG="no"
< 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)
< IPV4_HACK_MSG="yes"
< fi
< ]
< )
<
2257c2396,2400
< [ AC_DEFINE(DISABLE_LASTLOG) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_LASTLOG)
> fi
> ]
2261c2404,2408
< [ AC_DEFINE(DISABLE_UTMP) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_UTMP)
> fi
> ]
2265c2412,2416
< [ AC_DEFINE(DISABLE_UTMPX) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_UTMPX)
> fi
> ]
2269c2420,2424
< [ AC_DEFINE(DISABLE_WTMP) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_WTMP)
> fi
> ]
2273c2428,2432
< [ AC_DEFINE(DISABLE_WTMPX) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_WTMPX)
> fi
> ]
2277c2436,2440
< [ AC_DEFINE(DISABLE_LOGIN) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_LOGIN)
> fi
> ]
2281c2444,2448
< [ AC_DEFINE(DISABLE_PUTUTLINE) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_PUTUTLINE)
> fi
> ]
2285c2452,2456
< [ AC_DEFINE(DISABLE_PUTUTXLINE) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_PUTUTXLINE)
> fi
> ]
2476,2477c2647,2648
< LDFLAGS="$LDFLAGS -blibpath:$blibpath"
< AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
---
> LDFLAGS="$LDFLAGS $blibflags$blibpath"
> AC_MSG_WARN([Please check and edit blibpath in LDFLAGS in Makefile])
2515,2516c2686,2688
< if test "$USES_LOGIN_CONF" = "yes" ; then
< echo " At runtime, sshd will use the path defined in /etc/login.conf"
---
> if test "x$external_path_file" = "x/etc/login.conf" ; then
> echo " At runtime, sshd will use the path defined in $external_path_file"
> echo " Make sure the path to scp is present, otherwise scp will not work"
2518a2691,2694
> if test ! -z "$external_path_file"; then
> echo " (If PATH is set in $external_path_file it will be used instead. If"
> echo " used, ensure the path to scp is present, otherwise scp will not work.)"
> fi
2524,2525c2700,2701
< echo " PAM support: ${PAM_MSG}"
< echo " KerberosIV support: $KRB4_MSG"
---
> echo " DNS support: $DNS_MSG"
> echo " PAM support: $PAM_MSG"
2528d2703
< echo " AFS support: $AFS_MSG"
2533d2707
< echo " Use IPv4 by default hack: $IPV4_HACK_MSG"
< # $Id: configure.ac,v 1.113 2003/03/21 01:18:09 mouring Exp $
---
> # $Id: configure.ac,v 1.154.2.11 2003/09/23 09:24:21 djm Exp $
11a12
> AC_PROG_AWK
57d57
< AFS_LIBS="-lld"
60,72c60,62
< if (test "$LD" != "gcc" && test -z "$blibpath"); then
< AC_MSG_CHECKING([if linkage editor ($LD) accepts -blibpath])
< saved_LDFLAGS="$LDFLAGS"
< LDFLAGS="$LDFLAGS -blibpath:/usr/lib:/lib:/usr/local/lib"
< AC_TRY_LINK([],
< [],
< [
< AC_MSG_RESULT(yes)
< blibpath="/usr/lib:/lib:/usr/local/lib"
< ],
< [ AC_MSG_RESULT(no) ]
< )
< LDFLAGS="$saved_LDFLAGS"
---
> AC_MSG_CHECKING([how to specify blibpath for linker ($LD)])
> if (test -z "$blibpath"); then
> blibpath="/usr/lib:/lib:/usr/local/lib"
73a64,78
> saved_LDFLAGS="$LDFLAGS"
> for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
> if (test -z "$blibflags"); then
> LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
> AC_TRY_LINK([], [], [blibflags=$tryflags])
> fi
> done
> if (test -z "$blibflags"); then
> AC_MSG_RESULT(not found)
> AC_MSG_ERROR([*** must be able to specify blibpath on AIX - check config.log])
> else
> AC_MSG_RESULT($blibflags)
> fi
> LDFLAGS="$saved_LDFLAGS"
> dnl Check for authenticate. Might be in libs.a on older AIXes
79a85,98
> dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
> AC_CHECK_DECL(loginfailed,
> [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
> AC_TRY_COMPILE(
> [#include <usersec.h>],
> [(void)loginfailed("user","host","tty",0);],
> [AC_MSG_RESULT(yes)
> AC_DEFINE(AIX_LOGINFAILED_4ARG)],
> [AC_MSG_RESULT(no)]
> )],
> [],
> [#include <usersec.h>]
> )
> AC_CHECK_FUNCS(setauthdb)
81a101,103
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
85,86c107
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_CLOBBER_ARGV)
< AC_DEFINE(SETPROCTITLE_PS_PADDING, '\0')
---
> AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
94d114
< AC_DEFINE(IPV4_DEFAULT)
114a135,137
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
128c151,152
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
144c168,169
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
157c182,183
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_PSTAT)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> AC_DEFINE(SPT_TYPE,SPT_PSTAT)
166a193
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
176a204,206
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
177a208
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
181a213
> check_for_openpty_ctty_bug=1
184,185c216,217
< AC_DEFINE(SETPROCTITLE_STRATEGY,PS_USE_CLOBBER_ARGV)
< AC_DEFINE(SETPROCTITLE_PS_PADDING, '\0')
---
> AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
> AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
186a219,223
> case `uname -r` in
> 1.*|2.0.*)
> AC_DEFINE(BROKEN_CMSG_TYPE)
> ;;
> esac
198a236,240
> *-*-bsdi*)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> ;;
219c261,264
< AC_DEFINE(STREAMS_PUSH_ACQUIRES_CTTY)
---
> AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
> # Pushing STREAMS modules will cause sshd to acquire a controlling tty.
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> external_path_file=/etc/default/login
245a291,294
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
253a303,304
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> external_path_file=/etc/default/login
261a313,315
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
266a321,323
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
282a340
> AC_DEFINE(WITH_ABBREV_NO_TTY)
298a357,360
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> AC_DEFINE(WITH_ABBREV_NO_TTY)
308a371,378
> *-*-unicosmp*)
> AC_DEFINE(WITH_ABBREV_NO_TTY)
> AC_DEFINE(USE_PIPES)
> AC_DEFINE(DISABLE_FD_PASSING)
> LDFLAGS="$LDFLAGS"
> LIBS="$LIBS -lgen -lacid"
> MANTYPE=cat
> ;;
340a411,415
> AC_DEFINE(BROKEN_GETADDRINFO)
> AC_DEFINE(SETEUID_BREAKS_SETUID)
> AC_DEFINE(BROKEN_SETREUID)
> AC_DEFINE(BROKEN_SETREGID)
> AC_DEFINE(LOCKED_PASSWD_SUBSTR, "Nologin")
385a461,472
> AC_MSG_CHECKING(compiler and flags for sanity)
> AC_TRY_RUN([
> #include <stdio.h>
> int main(){exit(0);}
> ],
> [ AC_MSG_RESULT(yes) ],
> [
> AC_MSG_RESULT(no)
> AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
> ]
> )
>
387,388c474,475
< AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
< getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \
---
> AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
> getopt.h glob.h ia.h lastlog.h limits.h login.h \
392,393c479,480
< strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
< sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
---
> strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
> sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
396c483
< util.h utime.h utmp.h utmpx.h)
---
> util.h utime.h utmp.h utmpx.h vis.h)
408a496,532
> dnl IRIX and Solaris 2.5.1 have dirname() in libgen
> AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
> AC_CHECK_LIB(gen, dirname,[
> AC_CACHE_CHECK([for broken dirname],
> ac_cv_have_broken_dirname, [
> save_LIBS="$LIBS"
> LIBS="$LIBS -lgen"
> AC_TRY_RUN(
> [
> #include <libgen.h>
> #include <string.h>
>
> int main(int argc, char **argv) {
> char *s, buf[32];
>
> strncpy(buf,"/etc", 32);
> s = dirname(buf);
> if (!s || strncmp(s, "/", 32) != 0) {
> exit(1);
> } else {
> exit(0);
> }
> }
> ],
> [ ac_cv_have_broken_dirname="no" ],
> [ ac_cv_have_broken_dirname="yes" ]
> )
> LIBS="$save_LIBS"
> ])
> if test "x$ac_cv_have_broken_dirname" = "xno" ; then
> LIBS="$LIBS -lgen"
> AC_DEFINE(HAVE_DIRNAME)
> AC_CHECK_HEADERS(libgen.h)
> fi
> ])
> ])
>
410a535
> AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
607,610c732,735
< arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename bcopy \
< bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
< gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \
< getpeereid _getpty getrlimit getrusage getttyent glob inet_aton \
---
> arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
> bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
> getaddrinfo getcwd getgrouplist getnameinfo getopt \
> getpeereid _getpty getrlimit getttyent glob inet_aton \
612,617c737,743
< mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openpty pstat \
< readpassphrase realpath recvmsg rresvport_af sendmsg setdtablesize \
< setegid setenv seteuid setgroups setlogin setpcred setproctitle \
< setresgid setreuid setrlimit setsid setvbuf sigaction sigvec \
< snprintf socketpair strerror strlcat strlcpy strmode strnvis \
< sysconf tcgetpgrp truncate utimes vhangup vsnprintf waitpid \
---
> mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
> pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
> setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
> setproctitle setregid setresgid setresuid setreuid setrlimit \
> setsid setvbuf sigaction sigvec snprintf socketpair strerror \
> strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
> truncate utimes vhangup vsnprintf waitpid \
620c746,752
< AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
---
> # IRIX has a const char return value for gai_strerror()
> AC_CHECK_FUNCS(gai_strerror,[
> AC_DEFINE(HAVE_GAI_STRERROR)
> AC_TRY_COMPILE([
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <netdb.h>
622,623c754,755
< dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
< AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
---
> const char *gai_strerror(int);],[
> char *str;
625,635c757,759
< dnl IRIX and Solaris 2.5.1 have dirname() in libgen
< AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
< AC_CHECK_LIB(gen, dirname,[
< AC_CACHE_CHECK([for broken dirname],
< ac_cv_have_broken_dirname, [
< save_LIBS="$LIBS"
< LIBS="$LIBS -lgen"
< AC_TRY_RUN(
< [
< #include <libgen.h>
< #include <string.h>
---
> str = gai_strerror(0);],[
> AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1,
> [Define if gai_strerror() returns const char *])])])
637,638c761
< int main(int argc, char **argv) {
< char *s, buf[32];
---
> AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
640,660c763,765
< strncpy(buf,"/etc", 32);
< s = dirname(buf);
< if (!s || strncmp(s, "/", 32) != 0) {
< exit(1);
< } else {
< exit(0);
< }
< }
< ],
< [ ac_cv_have_broken_dirname="no" ],
< [ ac_cv_have_broken_dirname="yes" ]
< )
< LIBS="$save_LIBS"
< ])
< if test "x$ac_cv_have_broken_dirname" = "xno" ; then
< LIBS="$LIBS -lgen"
< AC_DEFINE(HAVE_DIRNAME)
< AC_CHECK_HEADERS(libgen.h)
< fi
< ])
< ])
---
> dnl Make sure prototypes are defined for these before using them.
> AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
> AC_CHECK_DECL(getrusage, [AC_CHECK_FUNCS(getrusage)])
661a767,773
> dnl tcsendbreak might be a macro
> AC_CHECK_DECL(tcsendbreak,
> [AC_DEFINE(HAVE_TCSENDBREAK)],
> [AC_CHECK_FUNCS(tcsendbreak)],
> [#include <termios.h>]
> )
>
723a836,882
> dnl make sure that openpty does not reacquire controlling terminal
> if test ! -z "$check_for_openpty_ctty_bug"; then
> AC_MSG_CHECKING(if openpty correctly handles controlling tty)
> AC_TRY_RUN(
> [
> #include <stdio.h>
> #include <sys/fcntl.h>
> #include <sys/types.h>
> #include <sys/wait.h>
>
> int
> main()
> {
> pid_t pid;
> int fd, ptyfd, ttyfd, status;
>
> pid = fork();
> if (pid < 0) { /* failed */
> exit(1);
> } else if (pid > 0) { /* parent */
> waitpid(pid, &status, 0);
> if (WIFEXITED(status))
> exit(WEXITSTATUS(status));
> else
> exit(2);
> } else { /* child */
> close(0); close(1); close(2);
> setsid();
> openpty(&ptyfd, &ttyfd, NULL, NULL, NULL);
> fd = open("/dev/tty", O_RDWR | O_NOCTTY);
> if (fd >= 0)
> exit(3); /* Acquired ctty: broken */
> else
> exit(0); /* Did not acquire ctty: OK */
> }
> }
> ],
> [
> AC_MSG_RESULT(yes)
> ],
> [
> AC_MSG_RESULT(no)
> AC_DEFINE(SSHD_ACQUIRES_CTTY)
> ]
> )
> fi
>
738a898
> AC_CHECK_FUNCS(pam_putenv)
903c1063,1065
< AC_MSG_ERROR(Your OpenSSL headers do not match your library)
---
> AC_MSG_ERROR([Your OpenSSL headers do not match your library.
> Check config.log for details.
> Also see contrib/findssl.sh for help identifying header/library mismatches.])
909c1071
< if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then
---
> if test "x$check_for_libcrypt_later" = "x1"; then
1750d1911
<
1799a1961,1983
> # Check whether user wants DNS support
> DNS_MSG="no"
> AC_ARG_WITH(dns,
> [ --with-dns Support for fetching keys from DNS (experimental)],
> [
> if test "x$withval" != "xno" ; then
> DNS_MSG="yes"
> AC_DEFINE(DNS)
> AC_SEARCH_LIBS(getrrsetbyname, resolv,
> [AC_DEFINE(HAVE_GETRRSETBYNAME)],
> [
> # Needed by our getrrsetbyname()
> AC_SEARCH_LIBS(res_query, resolv)
> AC_SEARCH_LIBS(dn_expand, resolv)
> AC_CHECK_FUNCS(_getshort _getlong)
> AC_CHECK_MEMBER(HEADER.ad,
> [AC_DEFINE(HAVE_HEADER_AD)],,
> [#include <arpa/nameser.h>])
> ])
> fi
> ]
> )
>
1832c2016
< AC_CHECK_LIB(resolv, dn_expand, , )
---
> AC_SEARCH_LIBS(dn_expand, resolv)
1833a2018,2042
> AC_CHECK_LIB(gssapi,gss_init_sec_context,
> [ AC_DEFINE(GSSAPI)
> K5LIBS="-lgssapi $K5LIBS" ],
> [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
> [ AC_DEFINE(GSSAPI)
> K5LIBS="-lgssapi_krb5 $K5LIBS" ],
> AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
> $K5LIBS)
> ],
> $K5LIBS)
>
> AC_CHECK_HEADER(gssapi.h, ,
> [ unset ac_cv_header_gssapi_h
> CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
> AC_CHECK_HEADERS(gssapi.h, ,
> AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
> )
> ]
> )
>
> oldCPP="$CPPFLAGS"
> CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
> AC_CHECK_HEADER(gssapi_krb5.h, ,
> [ CPPFLAGS="$oldCPP" ])
>
1838,1857c2047
< # Check whether user wants Kerberos 4 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
---
> LIBS="$LIBS $K5LIBS"
1859,1919d2048
< 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 $K5LIBS"
<
2087a2217,2227
> # check for /etc/default/login and use it if present.
> AC_ARG_ENABLE(etc-default-login,
> [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],,
> [
> AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
>
> if test "x$external_path_file" = "x/etc/default/login"; then
> AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
> fi
> ])
>
2091c2231
< USES_LOGIN_CONF=yes
---
> external_path_file=/etc/login.conf
2092a2233
>
2098c2239
< if test "$USES_LOGIN_CONF" = "yes" ; then
---
> if test "x$external_path_file" = "x/etc/login.conf" ; then
2102a2244,2248
> if test ! -z "$external_path_file" ; then
> AC_MSG_WARN([
> --with-default-path=PATH will only be used if PATH is not defined in
> $external_path_file .])
> fi
2107,2108c2253,2254
< [ if test "$USES_LOGIN_CONF" = "yes" ; then
< AC_MSG_WARN([Make sure the path to scp is in /etc/login.conf])
---
> [ if test "x$external_path_file" = "x/etc/login.conf" ; then
> AC_MSG_WARN([Make sure the path to scp is in /etc/login.conf])
2110,2111c2256,2262
< AC_TRY_RUN(
< [
---
> if test ! -z "$external_path_file" ; then
> AC_MSG_WARN([
> If PATH is defined in $external_path_file, ensure the path to scp is included,
> otherwise scp will not work.])
> fi
> AC_TRY_RUN(
> [
2165c2316
< if test "$USES_LOGIN_CONF" != "yes" ; then
---
> if test "x$external_path_file" != "x/etc/login.conf" ; then
2182,2193d2332
< # Whether to force IPv4 by default (needed on broken glibc Linux)
< IPV4_HACK_MSG="no"
< 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)
< IPV4_HACK_MSG="yes"
< fi
< ]
< )
<
2257c2396,2400
< [ AC_DEFINE(DISABLE_LASTLOG) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_LASTLOG)
> fi
> ]
2261c2404,2408
< [ AC_DEFINE(DISABLE_UTMP) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_UTMP)
> fi
> ]
2265c2412,2416
< [ AC_DEFINE(DISABLE_UTMPX) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_UTMPX)
> fi
> ]
2269c2420,2424
< [ AC_DEFINE(DISABLE_WTMP) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_WTMP)
> fi
> ]
2273c2428,2432
< [ AC_DEFINE(DISABLE_WTMPX) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_WTMPX)
> fi
> ]
2277c2436,2440
< [ AC_DEFINE(DISABLE_LOGIN) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_LOGIN)
> fi
> ]
2281c2444,2448
< [ AC_DEFINE(DISABLE_PUTUTLINE) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_PUTUTLINE)
> fi
> ]
2285c2452,2456
< [ AC_DEFINE(DISABLE_PUTUTXLINE) ]
---
> [
> if test "x$enableval" = "xno" ; then
> AC_DEFINE(DISABLE_PUTUTXLINE)
> fi
> ]
2476,2477c2647,2648
< LDFLAGS="$LDFLAGS -blibpath:$blibpath"
< AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
---
> LDFLAGS="$LDFLAGS $blibflags$blibpath"
> AC_MSG_WARN([Please check and edit blibpath in LDFLAGS in Makefile])
2515,2516c2686,2688
< if test "$USES_LOGIN_CONF" = "yes" ; then
< echo " At runtime, sshd will use the path defined in /etc/login.conf"
---
> if test "x$external_path_file" = "x/etc/login.conf" ; then
> echo " At runtime, sshd will use the path defined in $external_path_file"
> echo " Make sure the path to scp is present, otherwise scp will not work"
2518a2691,2694
> if test ! -z "$external_path_file"; then
> echo " (If PATH is set in $external_path_file it will be used instead. If"
> echo " used, ensure the path to scp is present, otherwise scp will not work.)"
> fi
2524,2525c2700,2701
< echo " PAM support: ${PAM_MSG}"
< echo " KerberosIV support: $KRB4_MSG"
---
> echo " DNS support: $DNS_MSG"
> echo " PAM support: $PAM_MSG"
2528d2703
< echo " AFS support: $AFS_MSG"
2533d2707
< echo " Use IPv4 by default hack: $IPV4_HACK_MSG"