[git] GnuPG - branch, master, updated. gnupg-2.2.7-269-gd58fe69

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  d58fe697acefd435ec01503dae574d6c99dfedae (commit)
      from  678e4706ee614a6b7e543e2a80072d75405dd4db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d58fe697acefd435ec01503dae574d6c99dfedae
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 11:37:37 2018 +0900

    build: Update libgcrypt.m4 and ntbtls.m4.
    
    * m4/libgcrypt.m4: Update from master.
    * m4/ntbtls.m4: Update from master.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 40ea01c..37dfbea 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: 2018-11-02
+# Last-changed: 2018-11-13
 
 
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -36,19 +36,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
   if test x"${LIBGCRYPT_CONFIG}" = x ; then
      if test x"${libgcrypt_config_prefix}" != x ; then
         LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
-             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-       esac
      fi
   fi
 
@@ -61,6 +48,20 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
     fi
   fi
   if test -z "$use_gpgrt_config"; then
+    if test x"${LIBGCRYPT_CONFIG}" = x ; then
+      case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+      esac
+    fi
     AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   fi
 
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 7bbd569..18b43d9 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -8,6 +8,8 @@ dnl
 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: 2018-11-13
 
 
 dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
@@ -30,19 +32,6 @@ AC_DEFUN([AM_PATH_NTBTLS],
   if test x"${NTBTLS_CONFIG}" = x ; then
      if test x"${ntbtls_config_prefix}" != x ; then
         NTBTLS_CONFIG="${ntbtls_config_prefix}/bin/ntbtls-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/ntbtls-config" ; then
-             NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-       esac
      fi
   fi
 
@@ -55,6 +44,20 @@ AC_DEFUN([AM_PATH_NTBTLS],
     fi
   fi
   if test -z "$use_gpgrt_config"; then
+    if test x"${NTBTLS_CONFIG}" = x ; then
+      case "${SYSROOT}" in
+        /*)
+          if test -x "${SYSROOT}/bin/ntbtls-config" ; then
+            NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
+          fi
+          ;;
+        '')
+          ;;
+         *)
+          AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+          ;;
+      esac
+    fi
     AC_PATH_PROG(NTBTLS_CONFIG, ntbtls-config, no)
   fi
 

-----------------------------------------------------------------------

Summary of changes:
 m4/libgcrypt.m4 | 29 +++++++++++++++--------------
 m4/ntbtls.m4    | 29 ++++++++++++++++-------------
 2 files changed, 31 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org