[git] NTBTLS - branch, master, updated. ntbtls-0.1.2-20-g838f833

[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 "Not Too Bad TLS".

The branch, master has been updated
       via  838f83398d728031ea9cab1e7fed5950f4faefa5 (commit)
       via  1fbb2f544c145f271ea929b05b3d5d0399eaa16a (commit)
       via  005e61e7c20352e070f53edbe82b8a2338576b43 (commit)
      from  ac406d38e49d4bbe2c6b41680abf7c717ce9b393 (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 838f83398d728031ea9cab1e7fed5950f4faefa5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 11:01:51 2018 +0900

    build: Update m4/libgcrypt.m4.
    
    * m4/libgcrypt.m4: Update libgcrypt 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
 

commit 1fbb2f544c145f271ea929b05b3d5d0399eaa16a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 10:50:53 2018 +0900

    ntbtls.m4: Prefer gpgrt-config to SYSROOT support.
    
    * src/ntbtls.m4: Move SYSROOT support after checking GPGRT_CONFIG.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/ntbtls.m4 b/src/ntbtls.m4
index 7bbd569..18b43d9 100644
--- a/src/ntbtls.m4
+++ b/src/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
 

commit 005e61e7c20352e070f53edbe82b8a2338576b43
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 10:49:03 2018 +0900

    build: Update autogen.rc.
    
    * autogen.rc: Remove obsolete --with-gpg-error-prefix,
    --with-ksba-prefix, and --with-libgcrypt-prefix options.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/autogen.rc b/autogen.rc
index a159fb8..f1d1504 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -11,9 +11,6 @@ esac
 case "$myhost" in
   w32)
     configure_opts="
-      --with-gpg-error-prefix=@SYSROOT@
-      --with-ksba-prefix=@SYSROOT@
-      --with-libgcrypt-prefix=@SYSROOT@
       --with-zlib=@SYSROOT@
       "
     ;;

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

Summary of changes:
 autogen.rc      |  3 ---
 m4/libgcrypt.m4 | 29 +++++++++++++++--------------
 src/ntbtls.m4   | 29 ++++++++++++++++-------------
 3 files changed, 31 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Not Too Bad TLS
http://git.gnupg.org