From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 Jul 2021 19:51:11 +0000 (+0200)
Subject: curl-openssl.m4: check lib64 for the pkg-config file
X-Git-Tag: curl-7_79_0~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e5e93d899eece446afbf2c40adbdbc86f0e9550;p=thirdparty%2Fcurl.git

curl-openssl.m4: check lib64 for the pkg-config file

OpenSSL recently started putting the libs in $prefix/lib64 on 'make
install', so we check that directory for pkg-config data if the 'lib'
check fails.

Closes #7503
---

diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index 835768e1bf..693114ecaf 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -330,8 +330,21 @@ if test "x$OPT_OPENSSL" != xno; then
     if test -f "$OPENSSL_PCDIR/openssl.pc"; then
       AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
       PKGTEST="yes"
-    elif test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then
-      AC_MSG_ERROR([$PREFIX_OPENSSL is a bad --with-openssl prefix!])
+    fi
+
+    if test "$PKGTEST" != "yes"; then
+      # try lib64 instead
+      OPENSSL_PCDIR="$OPT_OPENSSL/lib64/pkgconfig"
+      if test -f "$OPENSSL_PCDIR/openssl.pc"; then
+        AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
+        PKGTEST="yes"
+      fi
+    fi
+
+    if test "$PKGTEST" != "yes"; then
+      if test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then
+        AC_MSG_ERROR([$PREFIX_OPENSSL is a bad --with-openssl prefix!])
+      fi
     fi
 
     dnl in case pkg-config comes up empty, use what we got
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 61cc03c84e..1528e43190 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -242,7 +242,7 @@
         OPENSSL3: "yes"
         C: >-
           --with-openssl={{ ansible_user_dir }}/openssl3
-        LD_LIBRARY_PATH: "{{ ansible_user_dir }}/openssl3/lib:/usr/local/lib"
+        LD_LIBRARY_PATH: "{{ ansible_user_dir }}/openssl3/lib64:/usr/local/lib"
         TFLAGS: https ftps
 
 - job: