Merge r1725325 from trunk:

* Since r1724820 two modules, mod_http2 and mod_ssl, call APACHE_CHECK_OPENSSL,
  with mod_http2 doing it first. Because the result of APACHE_CHECK_OPENSSL
  is cached this causes MOD_LDFLAGS and MOD_CFLAGS to remain unset for mod_ssl
  which in turn causes it not to be linked against Openssl which means that
  mod_ssl cannot be loaded if the Openssl libs haven't been loaded by other means
  already.
  Fix this by caching the values for MOD_LDFLAGS and MOD_CFLAGS created during
  the first run and set them in the cached case.

Submitted by: rpluem
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1729872 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 0f0a1e6ec992e850234126f4360cbf5ddbab289d..b5f46038d6ac78981b1331ca58294be054361dd4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,14 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) When more than one module calls APACHE_CHECK_OPENSSL, MOD_LDFLAGS and MOD_CFLAGS 
-     remain unset for second or later caller. Fix this by caching the values for 
-     MOD_LDFLAGS and MOD_CFLAGS created during the first run and set them in the 
-     cached case. Change by rpluem
-     trunk patch:  http://svn.apache.org/r1725325
-     2.4.x patch:  trunk works
-     +1: icing, jim, ylavic
-
   *) mod_ssl: Fix missing TLS Upgrade/Connection headers on OPTIONS * requests
      (Note that this is simply a necessary band-aid, and still won't allow h2c
      to peacefully coexist with tls/n.n upgrades, because Upgrade phase needs

diff --git a/acinclude.m4 b/acinclude.m4
index 7ee0ad20a3beb8176bce3f5e05c7c835542334d1..e1537585a7d045b279c5e66aa02387cc1238d32c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -488,6 +488,8 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
     ap_openssl_found=""
     ap_openssl_base=""
     ap_openssl_libs=""
+    ap_openssl_mod_cflags=""
+    ap_openssl_mod_ldflags=""
 
     dnl Determine the OpenSSL base directory, if any
     AC_MSG_CHECKING([for user-provided OpenSSL base directory])
@@ -590,9 +592,15 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
     LDFLAGS="$saved_LDFLAGS"
+
+    dnl cache MOD_LDFLAGS, MOD_CFLAGS
+    ap_openssl_mod_cflags=$MOD_CFLAGS
+    ap_openssl_mod_ldflags=$MOD_LDFLAGS
   ])
   if test "x$ac_cv_openssl" = "xyes"; then
     AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available])
+    APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_mod_ldflags])
+    APR_ADDTO(MOD_CFLAGS, [$ap_openssl_mod_cflags])
   fi
 ])