Add libz to crypto libs if available (closes #2303).

diff --git a/ChangeLog b/ChangeLog
index fa17e5947cf6bbd0dcaf98f081b23f9149da4080..6b62fea739bce5aceffd0dd75c54e53f43042239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-04 12:06 -0700  Ivan Vilata i Balaguer  <ivan@selidor.net>  (d9a6b3f8a492)
+
+       * po/ca.po: Updated Catalan translation
+
+2007-08-31 10:12 -0700  Gary  <Gary Johnson>  (791bfed8ba62)
+
+       * editmsg.c: Decrement the mtime of the tempfile during
+       edit-message to make mutt notice changes taking less than one
+       second.
+
 2007-08-28 11:33 -0700  Brendan Cully  <brendan@kublai.com>  (3f8829e739e9)
 
        * init.h: Insert .pp after .de to fix man page generation (closes

diff --git a/configure.ac b/configure.ac
index f973af84c3f3c29b1d7245b9246bbee968c94333..34d11e281646011268ce8a6891fb4a5467c5c789 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -647,15 +647,20 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for
             fi
             saved_LIBS="$LIBS"
 
-            AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library]))
-            AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto)
-
+            crypto_libs=""
+            AC_CHECK_LIB(z, deflate, [crypto_libs=-lz])
+            AC_CHECK_LIB(crypto, X509_new,
+              [crypto_libs="-lcrypto $crypto_libs"],, [$crypto_libs])
+            AC_CHECK_LIB(ssl, SSL_new,,
+              AC_MSG_ERROR([Unable to find SSL library]), [$crypto_libs])
+
+            LIBS="$LIBS $crypto_libs"
             AC_CHECK_FUNCS(RAND_status RAND_egd)
 
             AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
             AC_DEFINE(USE_SSL_OPENSSL,1,[ Define if you want support for SSL via OpenSSL. ])
             LIBS="$saved_LIBS"
-            MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
+            MUTTLIBS="$MUTTLIBS -lssl $crypto_libs"
             MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o"
             need_ssl=yes
           fi