diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-07-22 01:51:51 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-07-27 08:22:12 +0200 |
| commit | d73f77b8cb9b422f1ac4facee7890aa10ff2bc21 (patch) | |
| tree | a477dfdbcd54b9642ea5d9a6676c44c9c8c7b321 /configure.ac | |
| parent | Do not link scp, sftp and sftp-server w/ zlib. (diff) | |
| download | openssh-d73f77b8cb9b422f1ac4facee7890aa10ff2bc21.tar.xz openssh-d73f77b8cb9b422f1ac4facee7890aa10ff2bc21.zip | |
Group libcrypto and PRNGD checks together.
They're related more than the libcrypt or libiaf checks which are
currently between them. ok djm@
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 6fa9bdc6d..0044e4fed 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,26 +3224,6 @@ AC_CHECK_FUNCS([ \ arc4random_stir \ arc4random_uniform \ ]) - -saved_LIBS="$LIBS" -AC_CHECK_LIB([iaf], [ia_openinfo], [ - LIBS="$LIBS -liaf" - AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf" - AC_DEFINE([HAVE_LIBIAF], [1], - [Define if system has libiaf that supports set_id]) - ]) -]) -LIBS="$saved_LIBS" - -# Check for crypt() in libcrypt. If we have it, we only need it for sshd. -saved_LIBS="$LIBS" -AC_CHECK_LIB([crypt], [crypt], [ - LIBS="-lcrypt $LIBS" - SSHDLIBS="-lcrypt $SSHDLIBS" -]) -AC_CHECK_FUNCS([crypt]) -LIBS="$saved_LIBS" - ### Configure cryptographic random number support # Check whether OpenSSL seeds itself @@ -3361,6 +3341,26 @@ else AC_MSG_ERROR([OpenSSH has no source of random numbers. Please configure OpenSSL with an entropy source or re-run configure using one of the --with-prngd-port or --with-prngd-socket options]) fi + +saved_LIBS="$LIBS" +AC_CHECK_LIB([iaf], [ia_openinfo], [ + LIBS="$LIBS -liaf" + AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf" + AC_DEFINE([HAVE_LIBIAF], [1], + [Define if system has libiaf that supports set_id]) + ]) +]) +LIBS="$saved_LIBS" + +# Check for crypt() in libcrypt. If we have it, we only need it for sshd. +saved_LIBS="$LIBS" +AC_CHECK_LIB([crypt], [crypt], [ + LIBS="-lcrypt $LIBS" + SSHDLIBS="-lcrypt $SSHDLIBS" +]) +AC_CHECK_FUNCS([crypt]) +LIBS="$saved_LIBS" + # Check for PAM libs PAM_MSG="no" AC_ARG_WITH([pam], |