]> granicus.if.org Git - apache/commitdiff
* acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
authorJoe Orton <jorton@apache.org>
Fri, 17 Feb 2006 10:06:50 +0000 (10:06 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 17 Feb 2006 10:06:50 +0000 (10:06 +0000)
specified OpenSSL location to avoid picking up system pkg-config
configuration.

PR: 38277

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378473 13f79535-47bb-0310-9956-ffa450edef68

acinclude.m4

index 98a9ff18afdd816c75d25a400fdd83a477ef677c..f4a165a298e4b629b3b265715a8acf62e0e0d41b 100644 (file)
@@ -368,6 +368,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)