From 666d64d2bc6539d0ca03dea69abc5a8ccdf37be5 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 17 Feb 2022 09:10:12 +0900 Subject: 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 --- src/gpg-error.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 | \ -- cgit v1.2.3