From c61e831b6f0c3c4bc9047e583ad3261bd9babefc Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Sat, 1 Apr 2023 11:20:17 +0900 Subject: m4: Fix behavior with older gpg-error-config and gpgrt-config. * src/gpg-error.m4 (_AM_PATH_GPGRT_CONFIG): Set the variable gpg_error_config_version on error with gpgrt-config. -- When detecting older gpgrt-config (<= 1.35), make sure to set the variable. 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 c5bde75..7fa52b1 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: 2023-03-23 +# Last-changed: 2023-04-01 dnl dnl Find gpg-error-config, for backward compatibility @@ -131,6 +131,7 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` else + gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi elif test "$GPG_ERROR_CONFIG" != "no"; then -- cgit v1.2.1