* 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 a6fba9b480b74e45aad5d235ea8d7d4bc35708e0..e80a2153cd3c4aae3b0e030abb4423bb1fbd604d 100644 (file)
--- 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)