httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r378473 - /httpd/httpd/trunk/acinclude.m4
Date Fri, 17 Feb 2006 10:06:52 GMT
Author: jorton
Date: Fri Feb 17 02:06:50 2006
New Revision: 378473

URL: http://svn.apache.org/viewcvs?rev=378473&view=rev
Log:
* acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
specified OpenSSL location to avoid picking up system pkg-config
configuration.

PR: 38277

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/acinclude.m4?rev=378473&r1=378472&r2=378473&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Fri Feb 17 02:06:50 2006
@@ -368,6 +368,10 @@
   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)



Mime
View raw message