aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-07-28 05:07:06 +0000
committerNIIBE Yutaka <[email protected]>2023-07-28 05:07:06 +0000
commit0518ed32e254faaa1f5ae61593ab17e8485388a6 (patch)
treecbebee82636fff1085f5027c21504a7cb419c138 /m4
parentqt: Ensure that we check the correct paths (diff)
downloadgpgme-0518ed32e254faaa1f5ae61593ab17e8485388a6.tar.gz
gpgme-0518ed32e254faaa1f5ae61593ab17e8485388a6.zip
build: Update libassuan.m4 for libassuan version 3 in future.
* m4/libassuan.m4: Update from libassuan master. -- New libassuan 3 has backward compatible API. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'm4')
-rw-r--r--m4/libassuan.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index 79391bb4..a2eb5d97 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -9,7 +9,7 @@ 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: 2022-11-01
+# Last-changed: 2023-07-26
dnl
dnl Common code used for libassuan detection [internal]
@@ -89,6 +89,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 +105,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.])