Under mingw don't check for different OpenSSL when one is found.

diff --git a/ChangeLog b/ChangeLog
index b461e9398b5da7fc4c63e0b4c8a6ee1c97b9e7ee..bbb336a4dd831d8eb2b5225d347abea7c3456df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-26  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * configure.ac: Under mingw don't check for static OpenSSL
+       libraries if the shared version was already found.
+       Suggested by: Ray Satiro <raysatiro@yahoo.com>.
+
 2011-08-25  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * configure.ac: Check for `utime'.

diff --git a/configure.ac b/configure.ac
index c26c93ecc1e40d4840a2e0d88bff9035a5eec42a..9007a0eecc533a203668773ff3bc047306104500 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
       AC_CHECK_LIB(dl, shl_load)
     ])
 
+    ssl_found=no
     case $host_os in
       *mingw32* )
         dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error
@@ -253,9 +254,11 @@ AS_IF([test x"$with_ssl" = xopenssl], [
         AC_CHECK_LIB(eay32, EVP_MD_CTX_init)
         if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno
         then
-          AC_CHECK_LIB(ssl32, SSL_connect,,
-                    AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
-          AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+          AC_CHECK_LIB(ssl32, SSL_connect, [
+            ssl_found=yes
+            AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+          ],
+          AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
           
         else
           LIBS+=' -lgdi32'
@@ -265,7 +268,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
       ;;
     esac
 
-    dnl Now actually check for -lssl
+AS_IF([test x$ssl_found != xyes],
+[
+  dnl Now actually check for -lssl if it wasn't already found
     AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
   #include <openssl/ssl.h>
   #include <openssl/x509.h>
@@ -286,6 +291,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
     fi
 
     AC_LIBOBJ([openssl])
+
+])
+
 ], [
   # --with-ssl is not gnutls: check if it's no
   AS_IF([test x"$with_ssl" != xno], [
@@ -312,7 +320,6 @@ AS_IF([test x"$with_ssl" = xopenssl], [
   ]) # endif: --with-ssl == no?
 ]) # endif: --with-ssl == openssl?
 
-
 dnl Enable NTLM if requested and if SSL is available.
 if test x"$LIBSSL" != x
 then