aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-11-29 17:22:34 +0000
committerBadlop <badlop@process-one.net>2007-11-29 17:22:34 +0000
commitdbdcadb6b3b028136da59ad624acaed22cb6a623 (patch)
tree811d0a48c033808676ba162234e31e00f830f9a4
parent* src/configure.ac: Don't hardcode gcc and options (EJAB-436) (diff)
* 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
-rw-r--r--ChangeLog6
-rw-r--r--src/aclocal.m44
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 38aca9c4e..fbabbec6c 100644
--- 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 e0f398ab7..0115f214c 100644
--- 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