diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2023-08-02 04:39:40 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-08-02 04:39:40 +0200 |
| commit | fa29c86582487880364b710fd9679c8e77c8dce6 (patch) | |
| tree | 15d96f1f0bd203a8ff409a82b0feee888f109f24 | |
| parent | gpg: Add support for Subkey-Expire-Date. (diff) | |
| download | gnupg2-fa29c86582487880364b710fd9679c8e77c8dce6.tar.xz gnupg2-fa29c86582487880364b710fd9679c8e77c8dce6.zip | |
build: Update libassuan.m4 to allow build with libassuan 3.
* m4/libassuan.m4: Update from libassuan master.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | m4/libassuan.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 index 79391bb4d..a2eb5d973 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.]) |