mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-21 10:09:57 +01:00
build: Update m4 files.
* m4/ksba.m4: Update from libksba master. * m4/libassuan.m4: Update from libassuan master. * m4/libgcrypt.m4: Update from libgcrypt master. * m4/npth.m4: Update from npth master. * m4/ntbtls.m4: Update from npth master. -- GnuPG-bug-id: 5034 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
4583f4fe2e
commit
2c1aaed621
@ -9,7 +9,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Last-changed: 2020-11-18
|
||||
# Last-changed: 2022-11-01
|
||||
|
||||
dnl AM_PATH_KSBA([MINIMUM-VERSION,
|
||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
@ -44,7 +44,7 @@ AC_DEFUN([AM_PATH_KSBA],
|
||||
fi
|
||||
|
||||
use_gpgrt_config=""
|
||||
if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if $GPGRT_CONFIG ksba --exists; then
|
||||
KSBA_CONFIG="$GPGRT_CONFIG ksba"
|
||||
AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
|
||||
|
@ -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: 2020-11-17
|
||||
# Last-changed: 2022-11-01
|
||||
|
||||
dnl
|
||||
dnl Common code used for libassuan detection [internal]
|
||||
@ -28,7 +28,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
fi
|
||||
|
||||
use_gpgrt_config=""
|
||||
if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if $GPGRT_CONFIG libassuan --exists; then
|
||||
LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
|
||||
AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
|
||||
|
@ -9,7 +9,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# Last-changed: 2020-09-27
|
||||
# Last-changed: 2022-11-01
|
||||
|
||||
|
||||
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
|
||||
@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
fi
|
||||
|
||||
use_gpgrt_config=""
|
||||
if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if $GPGRT_CONFIG libgcrypt --exists; then
|
||||
LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
|
||||
AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
|
||||
|
@ -9,7 +9,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
# Last-changed: 2020-11-17
|
||||
# Last-changed: 2022-11-01
|
||||
|
||||
AC_DEFUN([_AM_PATH_NPTH_CONFIG],
|
||||
[ AC_ARG_WITH(npth-prefix,
|
||||
@ -21,7 +21,7 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
|
||||
fi
|
||||
|
||||
use_gpgrt_config=""
|
||||
if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if $GPGRT_CONFIG npth --exists; then
|
||||
NPTH_CONFIG="$GPGRT_CONFIG npth"
|
||||
AC_MSG_NOTICE([Use gpgrt-config as npth-config])
|
||||
|
@ -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
|
||||
dnl Last-changed: 2020-11-18
|
||||
dnl Last-changed: 2022-11-01
|
||||
|
||||
|
||||
dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
|
||||
@ -36,7 +36,7 @@ AC_DEFUN([AM_PATH_NTBTLS],
|
||||
fi
|
||||
|
||||
use_gpgrt_config=""
|
||||
if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
if $GPGRT_CONFIG ntbtls --exists; then
|
||||
NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
|
||||
AC_MSG_NOTICE([Use gpgrt-config as ntbtls-config])
|
||||
|
Loading…
x
Reference in New Issue
Block a user