diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-02-15 17:21:25 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-02-18 09:25:40 +0900 |
| commit | b5b7b8c5c76838350f1857a40c428c9092f9da8e (patch) | |
| tree | 9fbd584230000bddac8218629d3094876c81d092 | |
| parent | 2bdc6614c866b0197f534e5cf3ec35d9f024facd (diff) | |
| download | libgcrypt-b5b7b8c5c76838350f1857a40c428c9092f9da8e.tar.gz | |
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 <gniibe@fsij.org>
| -rw-r--r-- | m4/gpg-error.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
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 | \ |