summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2023-04-01 11:20:17 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2023-04-01 11:20:17 +0900
commitc61e831b6f0c3c4bc9047e583ad3261bd9babefc (patch)
treec3c0bcf539bc2a4674549de90f44b4c622df201a
parented36ba06f907c0d67f8a60930dc329d58a4cd77d (diff)
downloadlibgpg-error-c61e831b6f0c3c4bc9047e583ad3261bd9babefc.tar.gz
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 <gniibe@fsij.org>
-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 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