* src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks

to Michael Shields) (EJAB-439)

* src/configure.ac: Don't hardcode gcc and gcc options in
Makefiles (thanks to Etan Reisner) (EJAB-436)

SVN Revision: 1001

diff --git a/ChangeLog b/ChangeLog
index 38aca9c4e44766701a6348c372eacaa5b8fa590d..fbabbec6cc85a0f1f016d017cee57c444850a7e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2007-11-29  Badlop  <badlop@process-one.net>
 
-       * src/configure.ac: Don't hardcode gcc and options (EJAB-436)
+       * src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks
+       to Michael Shields) (EJAB-439)
+
+       * src/configure.ac: Don't hardcode gcc and gcc options in
+       Makefiles (thanks to Etan Reisner) (EJAB-436)
        * src/Makefile.in: 
        * src/ejabberd_zlib/Makefile.in: 
        * src/eldap/Makefile.in: 

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e0f398ab7adf30e044e27e6546e42a63cac03d0d..0115f214cdd6b61408ad8bc38bdbb17fa69a45fa 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -321,6 +321,10 @@ if test x"$tls" != x; then
                 SSL_CFLAGS="-DHAVE_SSL"
                 break
             fi
+       else
+           # Clear this from the autoconf cache, so in the next pass of
+           # this loop with different -L arguments, it will test again.
+           unset ac_cv_lib_ssl_SSL_new
         fi
     done
 if test x${have_openssl} != xyes; then