Group libcrypto and PRNGD checks together.

They're related more than the libcrypt or libiaf checks which are
currently between them.  ok djm@

diff --git a/configure.ac b/configure.ac
index 6fa9bdc6d608bf9238ff806af314d089980bc28b..0044e4fedcc84cbdcd7740ebcb4f3f0874332b81 100644 (file)
--- 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],