From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 19 Jun 2008 20:38:34 +0000 (+0000)
Subject: * acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
X-Git-Tag: 2.2.10~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f4b26d9dc530ab598f3c6bd547e2c150d26bfc0;p=thirdparty%2Fapache%2Fhttpd.git

* acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
specified OpenSSL location to avoid picking up system pkg-config
configuration.

PR: 38277
Submitted by: jorton
Backports: 378473


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

diff --git a/acinclude.m4 b/acinclude.m4
index a6fba9b480b..e80a2153cd3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -364,6 +364,10 @@ if test "x$ap_ssltk_configured" = "x"; then
   if test "x$ap_ssltk_base" != "x"; then
     ap_ssltk_inc="-I$ap_ssltk_base/include"
     CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
+    # Ensure that the given path is used by pkg-config too, otherwise
+    # the system openssl.pc might be picked up instead.
+    PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+    export PKG_CONFIG_PATH
   fi
   if test "x$ap_ssltk_type" = "x"; then
     AC_MSG_CHECKING(for OpenSSL version)