allow --with-libgnutls-prefix and --with-libssl-prefix.

diff --git a/ChangeLog b/ChangeLog
index bdbc5dd4aeed7143c3de070b0d98a0963bf07418..2e5fdfacfbff6e0aa95d95099bdbaaf70978ad96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,19 @@
 2011-08-11  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+       * configure.ac: Allow --with-libgnutls-prefix and
+       --with-libssl-prefix
+       Suggested by: Karl Berry <karl@freefriends.org>
+
        * build-aux/bzr-version-gen (TAG): Consider only the last tag.
 
 2011-08-10  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * configure.ac: Print usage string for --with-ssl.
-       Reported by: Karl Berry<karl@freefriends.org>
+       Reported by: Karl Berry <karl@freefriends.org>
 
        * configure.ac: Check for `gnutls_priority_set_direct' when gnutls is
        used.
-       Reported by: Karl Berry<karl@freefriends.org>
+       Reported by: Karl Berry <karl@freefriends.org>
 
 2011-08-09  Giuseppe Scrivano  <gscrivano@southpole.se>
 

diff --git a/configure.ac b/configure.ac
index d47303a5c6ebecd3c4f6b69582d1d3220cedc848..45445fa3ad28935be2abe5098aea754f2ab5b1b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -260,27 +260,31 @@ AS_IF([test x"$with_ssl" = xopenssl], [
         else
           LIBS+=' -lgdi32'
           dnl fallback and test static libs
-          
-          AC_CHECK_LIB(crypto, EVP_MD_CTX_init,,,)
-          if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno
-          then
-            AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found]))
-            AC_MSG_NOTICE([Enabling support for SSL via OpenSSL])
-          else
-            AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
-          fi
-          
         fi
         dnl add zdll lib as dep for above tests?
       ;;
-      *)
-
-        AC_CHECK_LIB(crypto, EVP_MD_CTX_init)
-        AC_CHECK_LIB(ssl, ERR_func_error_string,,
-                  AC_MSG_ERROR([openssl development libraries not found]))
-        AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (static)])
-      ;;
     esac
+
+    dnl Now actually check for -lssl
+    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+  #include <openssl/ssl.h>
+  #include <openssl/x509.h>
+  #include <openssl/err.h>
+  #include <openssl/rand.h>
+  #include <openssl/des.h>
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+    ], [SSL_library_init ()])
+    if test x"$LIBSSL" != x
+    then
+      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+      AC_LIBOBJ([openssl])
+      LIBS="-lopenssl $LIBS"
+    elif test x"$with_ssl" != x
+    then
+      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
+    fi
+
     AC_LIBOBJ([openssl])
 ], [
   # --with-ssl is not gnutls: check if it's no
@@ -290,17 +294,21 @@ AS_IF([test x"$with_ssl" = xopenssl], [
     AC_CHECK_LIB(z, compress)
     AC_CHECK_LIB(gpg-error, gpg_err_init)
     AC_CHECK_LIB(gcrypt, gcry_control)
-    AC_CHECK_LIB(gnutls, main)
 
-    if test x"$ac_cv_lib_gnutls_main" != xno
-    then
-      AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-      AC_LIBOBJ([gnutls])
-    else
-      AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
-    fi
+  dnl Now actually check for -lssl
+  AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
+#include <gnutls/gnutls.h>
+  ], [gnutls_global_init()])
+  if test x"$LIBGNUTLS" != x
+  then
+    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+    AC_LIBOBJ([gnutls])
+    LIBS="-lgnutls $LIBS"
+  else
+    AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
+  fi
 
-    AC_CHECK_FUNCS(gnutls_priority_set_direct)
+  AC_CHECK_FUNCS(gnutls_priority_set_direct)
   ]) # endif: --with-ssl == no?
 ]) # endif: --with-ssl == openssl?
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d38d4b772b6b5d8d80dfb9345b98a0e81e0fdf3..7e877da3873186c88a05fd4b56f6cbf11a780c2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,7 +11,7 @@
        * gnutls.c (ssl_connect_wget)
        [HAVE_GNUTLS_PRIORITY_SET_DIRECT]:  Use gnutls_priority_set_direct.
        [! HAVE_GNUTLS_PRIORITY_SET_DIRECT]:  Use gnutls_protocol_set_priority.
-       Reported by: Karl Berry<karl@freefriends.org>
+       Reported by: Karl Berry <karl@freefriends.org>
 
 2011-08-06  Jochen Roderburg <Roderburg@Uni-Koeln.DE>