Backport:

  *) OpenSSL autoconf detection improvement
     trunk patch: http://svn.apache.org/r1834497
     2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
     +1: jorton, ylavic, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895924 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f001548c1e6da85a8793d88ec43c0c935ba47364..910a689445c65299366fff618746d56444a039c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.52
 
+  *) OpenSSL autoconf detection improvement: pick up openssl.pc in the
+     specified openssl path. [Joe Orton]
+
   *) mod_proxy_connect, mod_proxy: Do not change the status code after we
      already sent it to the client.
 

diff --git a/STATUS b/STATUS
index 295f184191c72443187159e52e14c146527b3ad1..643f8f0c7022e2cf8da49d2d19fe8d87c61328c7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -145,11 +145,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) OpenSSL autoconf detection improvement
-     trunk patch: http://svn.apache.org/r1834497
-     2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic, minfrin
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/acinclude.m4 b/acinclude.m4
index d1b31c616556af7faa21cc7b74e67f96c0166856..51cf130c9e7e64cccd607cc12a980e40838f19d9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -517,12 +517,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