diff options
| author | NIIBE Yutaka <[email protected]> | 2023-08-02 02:39:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-08-31 08:33:18 +0000 |
| commit | 4d7361d9237274e8a3f2fe0116d6f90f39b072da (patch) | |
| tree | 4f85e65f087d5ec7eee071c4efc9b140a9604c26 | |
| parent | build: Remove m4 macro defs which are not anymore used. (diff) | |
| download | gnupg-4d7361d9237274e8a3f2fe0116d6f90f39b072da.tar.gz gnupg-4d7361d9237274e8a3f2fe0116d6f90f39b072da.zip | |
build: Update libassuan.m4 to allow build with libassuan 3.
* m4/libassuan.m4: Update from libassuan master.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit fa29c86582487880364b710fd9679c8e77c8dce6)
| -rw-r--r-- | m4/libassuan.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
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.]) |