[git] NTBTLS - branch, master, updated. ntbtls-0.1.2-15-g6b4fb70
by NIIBE Yutaka
cvs at cvs.gnupg.org
Mon Oct 29 04:53:34 CET 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 6b4fb70b94c70ca071ae2ea20c6d25dffff06664 (commit)
from 3bd7643ceb11630d4e483ff60016d794c73faea9 (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 6b4fb70b94c70ca071ae2ea20c6d25dffff06664
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Oct 29 12:52:36 2018 +0900
build: Update *.m4 files.
* m4/gpg-error.m4: Update to 2018-10-29.
* m4/ksba.m4: Ditto.
* m4/libgcrypt.m4: Ditto.
* src/ntbtls.m4: Follow the change of gpgrt-config.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 70dc501..0964a26 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-26
+# Last-changed: 2018-10-29
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -67,13 +67,16 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
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`
+ if test "$GPGRT_CONFIG" != "no"; then
+ GPGRT_CONFIG="$GPGRT_CONFIG --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir"
+ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ use_gpgrt_config=yes
+ gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
+ fi
fi
else
- gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version`
+ gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
fi
if test "$GPG_ERROR_CONFIG" != "no"; then
req_major=`echo $min_gpg_error_version | \
@@ -96,30 +99,33 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
if test -z "$GPGRT_CONFIG"; then
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
+ if test "$GPGRT_CONFIG" != "no"; then
+ GPGRT_CONFIG="$GPGRT_CONFIG --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir"
+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ use_gpgrt_config=yes
+ fi
fi
fi
fi
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
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_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
+ GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --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`
+ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
+ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --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_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_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])
if test -z "$use_gpgrt_config"; then
- gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
+ gpg_error_config_host=`$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`
+ gpg_error_config_host=`$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
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 22f8cf9..ee4b962 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -44,7 +44,7 @@ AC_DEFUN([AM_PATH_KSBA],
use_gpgrt_config=""
if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if CC=$CC $GPGRT_CONFIG ksba >/dev/null 2>&1; then
+ if $GPGRT_CONFIG ksba --exists; then
KSBA_CONFIG="$GPGRT_CONFIG ksba"
use_gpgrt_config=yes
fi
@@ -72,9 +72,9 @@ AC_DEFUN([AM_PATH_KSBA],
req_micro=`echo $min_ksba_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test -z "$use_gpgrt_config"; then
- ksba_config_version=`CC=$CC $KSBA_CONFIG --version`
+ ksba_config_version=`$KSBA_CONFIG --version`
else
- ksba_config_version=`CC=$CC $KSBA_CONFIG --modversion`
+ ksba_config_version=`$KSBA_CONFIG --modversion`
fi
major=`echo $ksba_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -108,9 +108,9 @@ AC_DEFUN([AM_PATH_KSBA],
# API is compatible.
if test "$req_ksba_api" -gt 0 ; then
if test -z "$use_gpgrt_config"; then
- tmp=`CC=$CC $KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
else
- tmp=`CC=$CC $KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ tmp=`$KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([KSBA API version])
@@ -124,13 +124,13 @@ AC_DEFUN([AM_PATH_KSBA],
fi
fi
if test $ok = yes; then
- KSBA_CFLAGS=`CC=$CC $KSBA_CONFIG --cflags`
- KSBA_LIBS=`CC=$CC $KSBA_CONFIG --libs`
+ KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
+ KSBA_LIBS=`$KSBA_CONFIG --libs`
ifelse([$2], , :, [$2])
if test -z "$use_gpgrt_config"; then
- libksba_config_host=`CC=$CC $KSBA_CONFIG --host 2>/dev/null || echo none`
+ libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
else
- libksba_config_host=`CC=$CC $KSBA_CONFIG --variable=host 2>/dev/null || echo none`
+ libksba_config_host=`$KSBA_CONFIG --variable=host 2>/dev/null || echo none`
fi
if test x"$libksba_config_host" != xnone ; then
if test x"$libksba_config_host" != x"$host" ; then
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 5c3f6e1..2646e96 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-10-26
+# Last-changed: 2018-10-29
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -54,7 +54,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
use_gpgrt_config=""
if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if CC=$CC $GPGRT_CONFIG libgcrypt >/dev/null 2>&1; then
+ if $GPGRT_CONFIG libgcrypt --exists; then
LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
use_gpgrt_config=yes
fi
@@ -82,9 +82,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
req_micro=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test -z "$use_gpgrt_config"; then
- libgcrypt_config_version=`CC=$CC $LIBGCRYPT_CONFIG --version`
+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
else
- libgcrypt_config_version=`CC=$CC $LIBGCRYPT_CONFIG --modversion`
+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
fi
major=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -118,9 +118,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
# API is compatible
if test "$req_libgcrypt_api" -gt 0 ; then
if test -z "$use_gpgrt_config"; then
- tmp=`CC=$CC $LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
else
- tmp=`CC=$CC $LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBGCRYPT API version])
@@ -134,13 +134,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
fi
if test $ok = yes; then
- LIBGCRYPT_CFLAGS=`CC=$CC $LIBGCRYPT_CONFIG --cflags`
- LIBGCRYPT_LIBS=`CC=$CC $LIBGCRYPT_CONFIG --libs`
+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
if test -z "$use_gpgrt_config"; then
- libgcrypt_config_host=`CC=$CC $LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
else
- libgcrypt_config_host=`CC=$CC $LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
fi
if test x"$libgcrypt_config_host" != xnone ; then
if test x"$libgcrypt_config_host" != x"$host" ; then
diff --git a/src/ntbtls.m4 b/src/ntbtls.m4
index 665ae00..c4e07dc 100644
--- a/src/ntbtls.m4
+++ b/src/ntbtls.m4
@@ -48,7 +48,7 @@ AC_DEFUN([AM_PATH_NTBTLS],
use_gpgrt_config=""
if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if CC=$CC $GPGRT_CONFIG ntbtls >/dev/null 2>&1; then
+ if $GPGRT_CONFIG ntbtls --exists; then
NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
use_gpgrt_config=yes
fi
@@ -76,9 +76,9 @@ AC_DEFUN([AM_PATH_NTBTLS],
req_micro=`echo $min_ntbtls_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test -z "$use_gpgrt_config"; then
- ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --version`
+ ntbtls_config_version=`$NTBTLS_CONFIG --version`
else
- ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --modversion`
+ ntbtls_config_version=`$NTBTLS_CONFIG --modversion`
fi
major=`echo $ntbtls_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -112,9 +112,9 @@ AC_DEFUN([AM_PATH_NTBTLS],
# API is compatible
if test "$req_ntbtls_api" -gt 0 ; then
if test -z "$use_gpgrt_config"; then
- tmp=`CC=$CC $NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
else
- tmp=`CC=$CC $NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ tmp=`$NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([NTBTLS API version])
@@ -128,13 +128,13 @@ AC_DEFUN([AM_PATH_NTBTLS],
fi
fi
if test $ok = yes; then
- NTBTLS_CFLAGS=`CC=$CC $NTBTLS_CONFIG --cflags`
- NTBTLS_LIBS=`CC=$CC $NTBTLS_CONFIG --libs`
+ NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
+ NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
ifelse([$2], , :, [$2])
if test -z "$use_gpgrt_config"; then
- ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --host 2>/dev/null || echo none`
+ ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
else
- ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
+ ntbtls_config_host=`$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
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 38 ++++++++++++++++++++++----------------
m4/ksba.m4 | 18 +++++++++---------
m4/libgcrypt.m4 | 20 ++++++++++----------
src/ntbtls.m4 | 18 +++++++++---------
4 files changed, 50 insertions(+), 44 deletions(-)
hooks/post-receive
--
Not Too Bad TLS
http://git.gnupg.org
More information about the Gnupg-commits
mailing list