mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
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>
This commit is contained in:
parent
96b69c1866
commit
fa29c86582
@ -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 WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||||
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
dnl SPDX-License-Identifier: FSFULLR
|
dnl SPDX-License-Identifier: FSFULLR
|
||||||
# Last-changed: 2022-11-01
|
# Last-changed: 2023-07-26
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Common code used for libassuan detection [internal]
|
dnl Common code used for libassuan detection [internal]
|
||||||
@ -89,6 +89,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
|||||||
|
|
||||||
if test $ok = yes; then
|
if test $ok = yes; then
|
||||||
AC_MSG_RESULT([yes ($libassuan_config_version)])
|
AC_MSG_RESULT([yes ($libassuan_config_version)])
|
||||||
|
AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan)
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
@ -104,6 +105,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
|||||||
AC_MSG_CHECKING([LIBASSUAN API version])
|
AC_MSG_CHECKING([LIBASSUAN API version])
|
||||||
if test "$req_libassuan_api" -eq "$tmp" ; then
|
if test "$req_libassuan_api" -eq "$tmp" ; then
|
||||||
AC_MSG_RESULT(okay)
|
AC_MSG_RESULT(okay)
|
||||||
|
elif test "$req_libassuan_api" -eq 2 -a "$tmp" -eq 3; then
|
||||||
|
AC_MSG_RESULT(okay)
|
||||||
else
|
else
|
||||||
ok=no
|
ok=no
|
||||||
AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])
|
AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user