From 2c1aaed621918d3808e904a34ddcfcb79eb89d96 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 2 Nov 2022 10:21:27 +0900
Subject: [PATCH] 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>
---
 m4/ksba.m4      | 4 ++--
 m4/libassuan.m4 | 4 ++--
 m4/libgcrypt.m4 | 4 ++--
 m4/npth.m4      | 4 ++--
 m4/ntbtls.m4    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 6b55bb899..452c24588 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -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])
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index df504841d..79391bb4d 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: 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])
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 19d514fd5..cd4249e87 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -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])
diff --git a/m4/npth.m4 b/m4/npth.m4
index 06cdaeefb..619ed896b 100644
--- a/m4/npth.m4
+++ b/m4/npth.m4
@@ -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])
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 55de48317..fff425600 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.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
-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])