From 69a429bca0102cd35b3529d49b008db630e36458 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 14 Sep 2008 14:07:14 +0000
Subject: [PATCH] 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
---
 configure    | 150 +++++++++++++++++++++++++--------------------------
 configure.in |   2 +-
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/configure b/configure
index e517339c..7a5af8cf 100755
--- a/configure
+++ b/configure
@@ -3383,81 +3383,6 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char BIO_new ();
-int
-main ()
-{
-return BIO_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_crypto_BIO_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	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_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_LIBCRYPTO 1
-_ACEOF
-
-  LIBS="-lcrypto $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;}
-   { (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
@@ -3533,6 +3458,81 @@ echo "$as_me: error: Could not find libssl. Try --disable-openssl" >&2;}
 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 $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BIO_new ();
+int
+main ()
+{
+return BIO_new ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_crypto_BIO_new=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	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_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_LIBCRYPTO 1
+_ACEOF
+
+  LIBS="-lcrypto $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;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 	if test -z "$NOSSL"; then
 		appendCXX -DHAVE_LIBSSL
 	fi
diff --git a/configure.in b/configure.in
index 7dca9a43..d3de95c9 100644
--- 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