From b5b7b8c5c76838350f1857a40c428c9092f9da8e Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 15 Feb 2022 17:21:25 +0900 Subject: build: Fix m4/gpg-error.m4. * m4/gpg-error.m4: Unset GPGRT_CONFIG when it doesn't work well. -- Cherry-picked the master commit of: bff9f1b024647e18b2c87dcd769c0e449f7752e6 With older version of libgpg-error (< 1.33), the gpgrt-config script doesn't support .pc files. Signed-off-by: NIIBE Yutaka --- m4/gpg-error.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index 56a5d075..4b5cd40b 100644 --- a/m4/gpg-error.m4 +++ b/m4/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.1