From fcb19dbfd49338e5c282e2853d71d66a0594d3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
Date: Mon, 15 Aug 2022 10:49:49 +0200
Subject: build: Omit -L<libdir> for standard paths on some 64-bit systems

* configure.ac (GPG_ERROR_CONFIG_LIBS): Handle the case $libdir =
'${exec_prefix}/lib64'.
--

This ensures that on systems using /usr/lib64 the Libs entry of
gpg-error.pc doesn't get prefixed with -L/usr/lib64 which helps prevent
library search path problems when linking something that depends on
libgpg-error.

GnuPG-bug-id: 6136
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index af57678..8de8cf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,7 +508,7 @@ GNUPG_CHECK_READLINE
 estream_INIT
 
 #
-# Substitution used for gpg-error-config
+# Substitution used for gpg-error-config and gpg-error.pc
 #
 GPG_ERROR_CONFIG_LIBS="$config_libs"
 if test "x$LIBTHREAD" != x; then
@@ -548,7 +548,7 @@ case "$includedir" in
 esac
 case "$libdir" in
   /usr/lib|/usr/lib64|/lib|/lib64) ;;
-  '${exec_prefix}/lib')
+  '${exec_prefix}/lib'|'${exec_prefix}/lib64')
     if test "$exec_prefix" = "NONE"; then
       if test "$prefix" != / -a "$prefix" != /usr; then
         GPG_ERROR_CONFIG_LIBS="-L\${libdir} $GPG_ERROR_CONFIG_LIBS"
-- 
cgit v1.2.1