From baed30f057d4de0b0f4f9d12f6c58a4623acac95 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 26 Aug 2011 12:35:12 +0200 Subject: [PATCH] Under mingw don't check for different OpenSSL when one is found. --- ChangeLog | 6 ++++++ configure.ac | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b461e939..bbb336a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-08-26 Giuseppe Scrivano + + * configure.ac: Under mingw don't check for static OpenSSL + libraries if the shared version was already found. + Suggested by: Ray Satiro . + 2011-08-25 Giuseppe Scrivano * configure.ac: Check for `utime'. diff --git a/configure.ac b/configure.ac index c26c93ec..9007a0ee 100644 --- 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 #include @@ -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 -- 2.39.2