diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2016-01-18 20:21:16 +0100 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2016-01-18 20:21:16 +0100 |
| commit | e1fa09b0477809e5176d149c17d8b6e418689dde (patch) | |
| tree | 46e86e4661ab6e80209e511421e53b077e1af459 /acinclude.m4 | |
| parent | simplify and start on concept framework of OPTIONS (diff) | |
| download | apache2-e1fa09b0477809e5176d149c17d8b6e418689dde.tar.xz apache2-e1fa09b0477809e5176d149c17d8b6e418689dde.zip | |
* 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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725325 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2ff36f2ed8..f85ae60c2e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 ]) |