diff options
| author | Jean-Frederic Clere <jfclere@apache.org> | 2018-06-27 12:15:32 +0000 |
|---|---|---|
| committer | Jean-Frederic Clere <jfclere@apache.org> | 2018-06-27 12:15:32 +0000 |
| commit | 20fb0366f6f9f0af5de511381efb9fac9bd85346 (patch) | |
| tree | 534935b6edb7a8d7a09ab9d7430269c185cf2beb | |
| parent | e0ce3428d4cbe7f0f3d9529a6332d420bb6238c8 (diff) | |
| download | httpd-20fb0366f6f9f0af5de511381efb9fac9bd85346.tar.gz | |
Allow openssl.pc to be in lib64 (like other components).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834497 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 380bce82bd..06d34b5084 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -542,12 +542,18 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ dnl Before doing anything else, load in pkg-config variables if test -n "$PKGCONFIG"; then saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - if test "x$ap_openssl_base" != "x" -a \ - -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then - dnl Ensure that the given path is used by pkg-config too, otherwise - dnl the system openssl.pc might be picked up instead. - PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" - export PKG_CONFIG_PATH + if test "x$ap_openssl_base" != "x"; then + if test -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system openssl.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + elif test -f "${ap_openssl_base}/lib64/pkgconfig/openssl.pc"; then + dnl Ensure that the given path is used by pkg-config too, otherwise + dnl the system openssl.pc might be picked up instead. + PKG_CONFIG_PATH="${ap_openssl_base}/lib64/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + fi fi AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(--enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-ssl.]), [ if test "$enableval" = "yes"; then |