aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-02-17 00:10:12 +0000
committerNIIBE Yutaka <[email protected]>2022-02-17 00:10:12 +0000
commit666d64d2bc6539d0ca03dea69abc5a8ccdf37be5 (patch)
tree6c5de7fc2803bd8de88d28c64d3f33215a4fdedb
parentbuild,tests: Fix detection of have_lock_optimization. (diff)
downloadlibgpg-error-666d64d2bc6539d0ca03dea69abc5a8ccdf37be5.tar.gz
libgpg-error-666d64d2bc6539d0ca03dea69abc5a8ccdf37be5.zip
gpg-error.m4: Fix use with older gpgrt-config (< 1.33).
* src/gpg-error.m4: When gpgrt-config doesn't work expected for gpg-error.pc, unset GPGRT_CONFIG. -- Found the issue in the libgcrypt build with libgpg-error 1.31. Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--src/gpg-error.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 56a5d07..4b5cd40 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -10,7 +10,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2021-03-31
+# Last-changed: 2022-02-15
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -139,6 +139,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
elif test "$GPG_ERROR_CONFIG" != "no"; then
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+ unset GPGRT_CONFIG
fi
if test "$GPG_ERROR_CONFIG" != "no"; then
req_major=`echo $min_gpg_error_version | \