diff options
| author | Joe Orton <jorton@apache.org> | 2006-02-17 11:06:50 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2006-02-17 11:06:50 +0100 |
| commit | 6f768ff39bcafe5e42f404e34d3025630d8abfe6 (patch) | |
| tree | 3c0f91bde80ab40cddb7932cfa2478f68f18f102 | |
| parent | - tidy up some of the comments and make the file more readable (diff) | |
| download | apache2-6f768ff39bcafe5e42f404e34d3025630d8abfe6.tar.xz apache2-6f768ff39bcafe5e42f404e34d3025630d8abfe6.zip | |
* acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
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
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 98a9ff18af..f4a165a298 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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) |