From b2ee5f67eb6c1c79b36969f326dbebc63afbd3f6 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 23 Sep 2025 11:45:48 +0200
Subject: Update autogen.sh, gpg-error.m4, and libassuan.m4 from upstream.

--
See
GnuPG-bug-id: 7807
---
 autogen.sh      | 8 +++++---
 m4/gpg-error.m4 | 4 ++--
 m4/libassuan.m4 | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8695fcb5..71f89e20 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
 # configure it for the respective package.  It is maintained as part of
 # GnuPG and source copied by other packages.
 #
-# Version: 2025-03-10
+# Version: 2025-09-23
 
 configure_ac="configure.ac"
 
@@ -482,7 +482,8 @@ if [ -d .git ]; then
   if cp --version >/dev/null 2>/dev/null; then
     [ -z "${SILENT}" ] && CP="$CP -v"
   fi
-  if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+  if [ -f .git/hooks/pre-commit.sample ] \
+      && [ ! -f .git/hooks/pre-commit ]; then
     [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
@@ -504,7 +505,8 @@ EOF
         "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
     fi
   fi
-  if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+  if [ -f build-aux/git-hooks/commit-msg ] \
+     && [ ! -f .git/hooks/commit-msg ]; then
       [ -z "${SILENT}" ] && cat <<EOF
 *** Activating commit log message check hook. ***
 EOF
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 2d24071a..73725c42 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -155,11 +155,11 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
 [ AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
   AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
     GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
     AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
     gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
-  elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
+  elif test x"$GPG_ERROR_CONFIG" != x && test "$GPG_ERROR_CONFIG" != "no"; then
     gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
   else
     gpg_error_config_version="0.0"
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index 4d7da17e..b70da0bd 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -114,7 +114,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
   fi
 
   use_gpgrt_config=""
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
     if $GPGRT_CONFIG libassuan --exists; then
       LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
       AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
@@ -191,7 +191,7 @@ 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
+        elif test "$req_libassuan_api" -eq 2 && test "$tmp" -eq 3; then
           AC_MSG_RESULT(okay)
         else
           ok=no
-- 
cgit v1.2.3