[git] NTBTLS - branch, master, updated. ntbtls-0.1.2-12-gcf45bc9
by NIIBE Yutaka
cvs at cvs.gnupg.org
Fri Oct 26 03:52:07 CEST 2018
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 cf45bc9db3d63283169026bf6e8300712991fc01 (commit)
from 64bc82e24961cde6bae6615154bc3b2d6ce1a274 (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 cf45bc9db3d63283169026bf6e8300712991fc01
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri Oct 26 10:51:20 2018 +0900
ntbtls.m4: Better backward compatibility support.
* m4/gpg-error.m4: Update.
* src/ntbtls.m4: Don't assume ntbtls-config is newer.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index f89a4ee..70dc501 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.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-10-25
+# Last-changed: 2018-10-26
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -63,10 +63,13 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,1.33,$1)
ok=no
+
+ use_gpgrt_config=""
if test "$GPG_ERROR_CONFIG" = "no"; then
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
if CC=$CC $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ use_gpgrt_config=yes
gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --modversion`
fi
else
@@ -94,6 +97,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ use_gpgrt_config=yes
fi
fi
fi
@@ -101,18 +105,27 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
if test $ok = yes; then
GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --cflags`
GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG --libs`
- GPG_ERROR_MT_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
- GPG_ERROR_MT_LIBS=`CC=$CC $GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
+ if test -z "$use_gpgrt_config"; then
+ GPG_ERROR_MT_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
+ GPG_ERROR_MT_LIBS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+ else
+ GPG_ERROR_MT_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
+ GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
+ GPG_ERROR_MT_LIBS=`CC=$CC $GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
+ GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
+ fi
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
- gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
+ if test -z "$use_gpgrt_config"; then
+ gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
+ else
+ gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
+ fi
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $GPG_ERROR_CONFIG was
+*** The config script "$GPG_ERROR_CONFIG" was
*** built for $gpg_error_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgpg-error-prefix
diff --git a/src/ntbtls.m4 b/src/ntbtls.m4
index 67d314a..665ae00 100644
--- a/src/ntbtls.m4
+++ b/src/ntbtls.m4
@@ -75,7 +75,11 @@ AC_DEFUN([AM_PATH_NTBTLS],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_ntbtls_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --modversion`
+ if test -z "$use_gpgrt_config"; then
+ ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --version`
+ else
+ ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --modversion`
+ fi
major=`echo $ntbtls_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $ntbtls_config_version | \
@@ -107,7 +111,11 @@ AC_DEFUN([AM_PATH_NTBTLS],
# If we have a recent ntbtls, we should also check that the
# API is compatible
if test "$req_ntbtls_api" -gt 0 ; then
- tmp=`CC=$CC $NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ if test -z "$use_gpgrt_config"; then
+ tmp=`CC=$CC $NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+ else
+ tmp=`CC=$CC $NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([NTBTLS API version])
if test "$req_ntbtls_api" -eq "$tmp" ; then
@@ -123,7 +131,11 @@ AC_DEFUN([AM_PATH_NTBTLS],
NTBTLS_CFLAGS=`CC=$CC $NTBTLS_CONFIG --cflags`
NTBTLS_LIBS=`CC=$CC $NTBTLS_CONFIG --libs`
ifelse([$2], , :, [$2])
- ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
+ if test -z "$use_gpgrt_config"; then
+ ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --host 2>/dev/null || echo none`
+ else
+ ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
+ fi
if test x"$ntbtls_config_host" != xnone ; then
if test x"$ntbtls_config_host" != x"$host" ; then
AC_MSG_WARN([[
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 27 ++++++++++++++++++++-------
src/ntbtls.m4 | 18 +++++++++++++++---
2 files changed, 35 insertions(+), 10 deletions(-)
hooks/post-receive
--
Not Too Bad TLS
http://git.gnupg.org
More information about the Gnupg-commits
mailing list