From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 24 Nov 2008 11:06:52 +0000 (+0000)
Subject: Merge r711993 from trunk:
X-Git-Tag: 2.2.11~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5298caec13e4531c8922a2fcd435e8138f703796;p=thirdparty%2Fapache%2Fhttpd.git

Merge r711993 from trunk:

* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.

PR: 46018

Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere


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

diff --git a/CHANGES b/CHANGES
index 703a373392d..3546f797ef0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.11
 
+  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is
+     not available. PR 46018 [Ruediger Pluem]
+
   *) mod_proxy_ajp: Do not fail if response data is sent before all request
      data is read. PR 45911 [Ruediger Pluem]
 
diff --git a/STATUS b/STATUS
index acaf42712b9..4accf166b43 100644
--- a/STATUS
+++ b/STATUS
@@ -86,15 +86,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * Build: Correctly set SSL_LIBS during openssl detection if pkgconfig
-     is not available. This fixes a regression against 2.2.9.
-     PR 46018
-     Trunk version of patch:
-        http://svn.apache.org/viewvc?rev=711993&view=rev
-     Backport version for 2.2.x of patch:
-        Trunk version of patch works
-     +1: rpluem, jim, jfclere
-
     * mod_cache: Convert age of cached object to seconds before comparing it to
       age supplied by the request when checking whether to send a Warning
       header for a stale response. PR 39713.
diff --git a/acinclude.m4 b/acinclude.m4
index 1bb7c4af5e1..29b7bee1890 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -439,10 +439,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])