From 4d7361d9237274e8a3f2fe0116d6f90f39b072da Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 2 Aug 2023 11:39:40 +0900 Subject: [PATCH] build: Update libassuan.m4 to allow build with libassuan 3. * m4/libassuan.m4: Update from libassuan master. -- Signed-off-by: NIIBE Yutaka (cherry picked from commit fa29c86582487880364b710fd9679c8e77c8dce6) --- m4/libassuan.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 index df504841d..ba619b76a 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -9,7 +9,8 @@ dnl This file is distributed in the hope that it will be useful, but dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl SPDX-License-Identifier: FSFULLR -# Last-changed: 2020-11-17 +# Last-changed: 2023-07-26 + dnl dnl Common code used for libassuan detection [internal] @@ -89,6 +90,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then AC_MSG_RESULT([yes ($libassuan_config_version)]) + AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) else AC_MSG_RESULT(no) fi @@ -104,6 +106,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then AC_MSG_RESULT(okay) + elif test "$req_libassuan_api" -eq 2 -a "$tmp" -eq 3; then + AC_MSG_RESULT(okay) else ok=no AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])