diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:05 +0000 |
| commit | e7fd617327ed9d30f093a78a016511ab5c984ba4 (patch) | |
| tree | bb534b4fd912969c90022ad00726253be891ad8a /m4/libassuan.m4 | |
| parent | Releasing progress-linux version 2.2.40-3~progress7.99u1. (diff) | |
| download | gnupg2-e7fd617327ed9d30f093a78a016511ab5c984ba4.tar.xz gnupg2-e7fd617327ed9d30f093a78a016511ab5c984ba4.zip | |
Merging upstream version 2.2.43.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'm4/libassuan.m4')
| -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 df50484..ba619b7 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.]) |