From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 6 Nov 2008 22:23:21 +0000 (+0000)
Subject: * Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.
X-Git-Tag: 2.3.0~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed234afd2d7e7aacf0931fa4cfb074809ba37391;p=thirdparty%2Fapache%2Fhttpd.git

* 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
---

diff --git a/CHANGES b/CHANGES
index 26fdec5ca90..fc61268d897 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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 f87e8a48ac8..19d58488570 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])