diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2008-11-06 23:23:21 +0100 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2008-11-06 23:23:21 +0100 |
| commit | ed234afd2d7e7aacf0931fa4cfb074809ba37391 (patch) | |
| tree | c85a8c81f260aef8f57d82062fb325cbe1f6ed29 | |
| parent | Typo correction line 409 (diff) | |
| download | apache2-ed234afd2d7e7aacf0931fa4cfb074809ba37391.tar.xz apache2-ed234afd2d7e7aacf0931fa4cfb074809ba37391.zip | |
* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.
PR: 46018
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711993 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [ When backported to 2.2.x, remove entry from this file ] + *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is + not available. PR 46018 [Ruediger Pluem] + *) mod_expires: Do not sets negative max-age / Expires header in the past. PR 39774 [Jim Jagielski] diff --git a/acinclude.m4 b/acinclude.m4 index f87e8a48ac..19d5848857 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -447,10 +447,10 @@ if test "x$ap_ssltk_configured" = "x"; then pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`" APR_ADDTO(LDFLAGS, [$pkglookup]) else - ap_ssltk_libs="-lssl -lcrypto" + ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`" fi else - ap_ssltk_libs="-lssl -lcrypto" + ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`" fi fi APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs]) |