>From b7205aa7d93ce8fedc6d362bd9994459f4c10426 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen
Date: Fri, 13 Sep 2013 15:51:20 +0200 Subject: [PATCH] fix bug #39844 --- ChangeLog | 7 +++ configure.ac | 146 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 87 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07340b5..a0b99df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-09-13 Tim Ruehsen + + * configure.ac: added a summary of build options + fixed some indentations + removed the unconditionally adding of libz with --with-ssl + removed -lgcrypt and -lgpg-error for gnutls + 2013-07-23 Tim Ruehsen * configure.ac: Remove AM_CONDITIONAL HAVE_NETTLE. diff --git a/configure.ac b/configure.ac index 5173d42..7085993 100644 --- a/configure.ac +++ b/configure.ac @@ -238,57 +238,54 @@ dnl Checks for libraries. dnl AS_IF([test x"$with_zlib" != xno], [ + with_zlib=yes AC_CHECK_LIB(z, compress) ]) AS_IF([test x"$with_ssl" = xopenssl], [ - dnl some versions of openssl use zlib compression - AC_CHECK_LIB(z, compress) - - dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library - dnl doesn't record its dependency on libdl, so we need to make sure - dnl -ldl ends up in LIBS on systems that have it. Most OSes use - dnl dlopen(), but HP-UX uses shl_load(). - AC_CHECK_LIB(dl, dlopen, [], [ - 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 + dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library + dnl doesn't record its dependency on libdl, so we need to make sure + dnl -ldl ends up in LIBS on systems that have it. Most OSes use + dnl dlopen(), but HP-UX uses shl_load(). + AC_CHECK_LIB(dl, dlopen, [], [ + 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 - 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, [ - ssl_found=yes - AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)]) - AC_LIBOBJ([openssl]) - LIBS="${LIBS} -lssl32" - AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).]) - ], - AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) + 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, [ + ssl_found=yes + AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)]) + AC_LIBOBJ([openssl]) + LIBS="${LIBS} -lssl32" + AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).]) + ], + AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) - else - LIBS+=' -lgdi32' - dnl fallback and test static libs - fi - dnl add zdll lib as dep for above tests? - ;; - esac - -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 z], [ - #include