[configure.ac] Make sure -lcrypto is before -lsocket for sco3. ok mouring@

diff --git a/ChangeLog b/ChangeLog
index bedc682ddf90be6eb4a8e05cdaac9ea5614b3ef5..5413eb3a17f9846e754f7e1da6897b120fcbc8cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]
    Portablity fixes. Data sftp transfers needs to be world readable. Some
    older shells hang on while loops when  doing sh -n some_script. OK dtucker@
+ - (tim) [configure.ac] Make sure -lcrypto is before -lsocket for sco3.
+   ok mouring@
 
 20040211
  - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check

diff --git a/configure.ac b/configure.ac
index 428322748670429f5a66ba83c253d47a14e8e33d..51d486dfdd3ded6f5435c40181ab57d352e98f24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1021,12 +1021,6 @@ if test "x$PAM_MSG" = "xyes" ; then
        )
 fi
 
-# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
-# because the system crypt() is more featureful.
-if test "x$check_for_libcrypt_before" = "x1"; then
-       AC_CHECK_LIB(crypt, crypt)
-fi
-
 # Search for OpenSSL
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LDFLAGS="$LDFLAGS"
@@ -1055,7 +1049,7 @@ AC_ARG_WITH(ssl-dir,
                fi
        ]
 )
-LIBS="$LIBS -lcrypto"
+LIBS="-lcrypto $LIBS"
 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
        [
                dnl Check default openssl install dir
@@ -1157,6 +1151,12 @@ Also see contrib/findssl.sh for help identifying header/library mismatches.])
        ]
 )
 
+# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
+# because the system crypt() is more featureful.
+if test "x$check_for_libcrypt_before" = "x1"; then
+       AC_CHECK_LIB(crypt, crypt)
+fi
+
 # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
 # version in OpenSSL.
 if test "x$check_for_libcrypt_later" = "x1"; then