Commit cead9927 authored by Jean-Frederic Clere's avatar Jean-Frederic Clere
Browse files

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
parent baa93c52

acinclude.m4

+8 −2
Changes for acinclude.m4: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

      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