You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/06/19 22:38:34 UTC

svn commit: r669681 - /httpd/httpd/branches/2.2.x/acinclude.m4

Author: wrowe
Date: Thu Jun 19 13:38:34 2008
New Revision: 669681

URL: http://svn.apache.org/viewvc?rev=669681&view=rev
Log:
avoid cache value warnings in modern autoconf as well as missed cache values

backported from trunk

Modified:
    httpd/httpd/branches/2.2.x/acinclude.m4

Modified: httpd/httpd/branches/2.2.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/acinclude.m4?rev=669681&r1=669680&r2=669681&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.2.x/acinclude.m4 Thu Jun 19 13:38:34 2008
@@ -364,6 +364,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)