Reorder some openssl library checks in configure

Now libssl is checked before libcrypto. The idea behind this is that an error
message about missing libssl is easier to understand and fix than one saying
libcrypto is missing.
Hopefully people can now find the right dev package to install without
asking us.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1204 726aef4b-f618-498e-8847-2d620e286838

diff --git a/configure b/configure
index e517339ce85b4916a22ef9ad23bf9df19c35502a..7a5af8cfe14b8722e2968046292ae0c9e8295172 100755 (executable)
--- a/configure
+++ b/configure
@@ -3383,13 +3383,13 @@ if test -z "$NOSSL"; then
        fi
 
 
-{ echo "$as_me:$LINENO: checking for BIO_new in -lcrypto" >&5
-echo $ECHO_N "checking for BIO_new in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then
+{ echo "$as_me:$LINENO: checking for SSL_shutdown in -lssl" >&5
+echo $ECHO_N "checking for SSL_shutdown in -lssl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ssl_SSL_shutdown+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
+LIBS="-lssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3403,11 +3403,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char BIO_new ();
+char SSL_shutdown ();
 int
 main ()
 {
-return BIO_new ();
+return SSL_shutdown ();
   ;
   return 0;
 }
@@ -3430,41 +3430,41 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_crypto_BIO_new=yes
+  ac_cv_lib_ssl_SSL_shutdown=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_crypto_BIO_new=no
+       ac_cv_lib_ssl_SSL_shutdown=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_new" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_BIO_new" >&6; }
-if test $ac_cv_lib_crypto_BIO_new = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_shutdown" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_shutdown" >&6; }
+if test $ac_cv_lib_ssl_SSL_shutdown = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
+#define HAVE_LIBSSL 1
 _ACEOF
 
-  LIBS="-lcrypto $LIBS"
+  LIBS="-lssl $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: Could not find libcrypto. Try --disable-openssl" >&5
-echo "$as_me: error: Could not find libcrypto. Try --disable-openssl" >&2;}
+  { { echo "$as_me:$LINENO: error: Could not find libssl. Try --disable-openssl" >&5
+echo "$as_me: error: Could not find libssl. Try --disable-openssl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SSL_shutdown in -lssl" >&5
-echo $ECHO_N "checking for SSL_shutdown in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_SSL_shutdown+set}" = set; then
+{ echo "$as_me:$LINENO: checking for BIO_new in -lcrypto" >&5
+echo $ECHO_N "checking for BIO_new in -lcrypto... $ECHO_C" >&6; }
+if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3478,11 +3478,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_shutdown ();
+char BIO_new ();
 int
 main ()
 {
-return SSL_shutdown ();
+return BIO_new ();
   ;
   return 0;
 }
@@ -3505,30 +3505,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_ssl_SSL_shutdown=yes
+  ac_cv_lib_crypto_BIO_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_ssl_SSL_shutdown=no
+       ac_cv_lib_crypto_BIO_new=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_shutdown" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_shutdown" >&6; }
-if test $ac_cv_lib_ssl_SSL_shutdown = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_new" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_BIO_new" >&6; }
+if test $ac_cv_lib_crypto_BIO_new = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSSL 1
+#define HAVE_LIBCRYPTO 1
 _ACEOF
 
-  LIBS="-lssl $LIBS"
+  LIBS="-lcrypto $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: Could not find libssl. Try --disable-openssl" >&5
-echo "$as_me: error: Could not find libssl. Try --disable-openssl" >&2;}
+  { { echo "$as_me:$LINENO: error: Could not find libcrypto. Try --disable-openssl" >&5
+echo "$as_me: error: Could not find libcrypto. Try --disable-openssl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

diff --git a/configure.in b/configure.in
index 7dca9a430d38545d87de6e8afa76959c46c98f62..d3de95c9311957817c0914932e3fc1f0e7262e3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -113,8 +113,8 @@ if test -z "$NOSSL"; then
                appendInc -I${OPENSSL}/include
        fi
 
-       AC_CHECK_LIB( crypto, BIO_new,,AC_ERROR([Could not find libcrypto. Try --disable-openssl]), )
        AC_CHECK_LIB( ssl, SSL_shutdown,,AC_ERROR([Could not find libssl. Try --disable-openssl]), )
+       AC_CHECK_LIB( crypto, BIO_new,,AC_ERROR([Could not find libcrypto. Try --disable-openssl]), )
 
        if test -z "$NOSSL"; then
                appendCXX -DHAVE_LIBSSL