Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1725325 - /httpd/httpd/trunk/acinclude.m4
Date: Mon, 18 Jan 2016 19:21:16 -0000
To: cvs@httpd.apache.org
From: rpluem@apache.org
Message-Id: <20160118192116.9A31F3A0046@svn01-us-west.apache.org>

Author: rpluem
Date: Mon Jan 18 19:21:16 2016
New Revision: 1725325

URL: http://svn.apache.org/viewvc?rev=1725325&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1725325&r1=1725324&r2=1725325&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Mon Jan 18 19:21:16 2016
@@ -507,6 +507,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])
@@ -609,9 +611,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
 ])