[git] NTBTLS - branch, master, updated. ntbtls-0.1.2-7-gea6edaf
by NIIBE Yutaka
cvs at cvs.gnupg.org
Wed Oct 24 09:22:33 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 ea6edafcf8393fd7ae6eb0cef5c3b41d943c3e2b (commit)
via 06e6d62dcaf6ecd08e16cc692a4bb4bc6acc9307 (commit)
via 548b70b9db46f028d43a1ae41118b73d170bb57e (commit)
via f4e5435e1d4cf0c9517d9056e293cc13bc2b5000 (commit)
from 9d54948d6ca3e3e3e3040dab0c5fded0757472e9 (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 ea6edafcf8393fd7ae6eb0cef5c3b41d943c3e2b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 16:17:17 2018 +0900
build: Compatibility to pkg-config.
* src/ntbtls-config.in: Support --variable and --modversion.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/ntbtls-config.in b/src/ntbtls-config.in
index c29586c..f6eef3e 100644
--- a/src/ntbtls-config.in
+++ b/src/ntbtls-config.in
@@ -91,7 +91,16 @@ while test $# -gt 0; do
--exec-prefix)
echo_exec_prefix=yes
;;
- --version)
+ --variable=*)
+ case "${1#*=}" in
+ prefix) echo "$prefix" ;;
+ exec_prefix) echo "$exec_prefix" ;;
+ host) echo "$my_host" ;;
+ api_version) echo "$api_version" ;;
+ esac
+ exit 0
+ ;;
+ --modversion|--version)
echo_version=yes
;;
--api-version)
commit 06e6d62dcaf6ecd08e16cc692a4bb4bc6acc9307
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 16:13:21 2018 +0900
build: Make ntbtls.m4 use gpg-error-config.
* src/ntbtls.m4: Use gpg-error-config.
--
With the option --with-ntbtls-prefix, it still uses ntbtls-config
script.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/ntbtls.m4 b/src/ntbtls.m4
index 85c8ee9..4a551b6 100644
--- a/src/ntbtls.m4
+++ b/src/ntbtls.m4
@@ -38,15 +38,16 @@ AC_DEFUN([AM_PATH_NTBTLS],
fi
;;
'')
+ NTBTLS_CONFIG="$GPG_ERROR_CONFIG ntbtls"
;;
*)
+ NTBTLS_CONFIG="$GPG_ERROR_CONFIG ntbtls"
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
;;
esac
fi
fi
- AC_PATH_PROG(NTBTLS_CONFIG, ntbtls-config, no)
tmp=ifelse([$1], ,1:1.0.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_ntbtls_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -65,7 +66,7 @@ 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=`$NTBTLS_CONFIG --version`
+ ntbtls_config_version=`CC=$CC $NTBTLS_CONFIG --version`
major=`echo $ntbtls_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $ntbtls_config_version | \
@@ -97,7 +98,7 @@ 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=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`CC=$CC $NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([NTBTLS API version])
if test "$req_ntbtls_api" -eq "$tmp" ; then
@@ -110,15 +111,15 @@ AC_DEFUN([AM_PATH_NTBTLS],
fi
fi
if test $ok = yes; then
- NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
- NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
+ NTBTLS_CFLAGS=`CC=$CC $NTBTLS_CONFIG --cflags`
+ NTBTLS_LIBS=`CC=$CC $NTBTLS_CONFIG --libs`
ifelse([$2], , :, [$2])
- ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+ ntbtls_config_host=`CC=$CC $NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
if test x"$ntbtls_config_host" != xnone ; then
if test x"$ntbtls_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $NTBTLS_CONFIG was
+*** The config script "$NTBTLS_CONFIG" was
*** built for $ntbtls_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-ntbtls-prefix
commit 548b70b9db46f028d43a1ae41118b73d170bb57e
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 16:06:38 2018 +0900
build: Provide ntbtls.pc, generated by configure.
* configure.ac (PACKAGE, VERSION): Remove.
Generate src/ntbtls.pc.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
(EXTRA_DIST): Add ntbtls.pc.in.
* src/ntbtls-config.in: Use @PACKAGE_VERSION at .
* src/ntbtls.pc.in: New.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index d149c62..af15467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,9 +72,6 @@ NEED_KSBA_VERSION=1.2.0
# End of config section
-PACKAGE=$PACKAGE_NAME
-VERSION=$PACKAGE_VERSION
-
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([src/ntbtls.h.in])
AC_CONFIG_HEADER([config.h])
@@ -91,20 +88,12 @@ use_zip=yes
AC_SUBST(LIBNTBTLS_LT_CURRENT)
AC_SUBST(LIBNTBTLS_LT_AGE)
AC_SUBST(LIBNTBTLS_LT_REVISION)
-AC_SUBST(PACKAGE)
-AC_SUBST(PACKAGE_GT)
-AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
-AC_DEFINE_UNQUOTED(PACKAGE_GT, "$PACKAGE_GT",
- [Name of this package for gettext])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
+
VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \
mym4_minor mym4_micro)
AC_SUBST(VERSION_NUMBER)
-AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
- [Bug report address])
AC_DEFINE_UNQUOTED(NEED_LIBGCRYPT_VERSION, "$NEED_LIBGCRYPT_VERSION",
[Required version of Libgcrypt])
AC_DEFINE_UNQUOTED(NEED_KSBA_VERSION, "$NEED_KSBA_VERSION",
@@ -682,6 +671,7 @@ m4/Makefile
src/Makefile
src/ntbtls.h
src/ntbtls-config
+src/ntbtls.pc
src/versioninfo.rc
])
AC_CONFIG_COMMANDS([ntbtls-conf],[[
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e8b63d..73262ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,8 +18,11 @@
## Process this file with automake to produce Makefile.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ntbtls.pc
+
EXTRA_DIST = ntbtls.h.in ntbtls.m4 libntbtls.vers libntbtls.def \
- versioninfo.rc.in
+ versioninfo.rc.in ntbtls.pc.in
bin_SCRIPTS = ntbtls-config
include_HEADERS = ntbtls.h
lib_LTLIBRARIES = libntbtls.la
diff --git a/src/ntbtls-config.in b/src/ntbtls-config.in
index a9510a4..c29586c 100644
--- a/src/ntbtls-config.in
+++ b/src/ntbtls-config.in
@@ -14,7 +14,7 @@
# General.
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-version="@VERSION@"
+version="@PACKAGE_VERSION@"
includedir="@includedir@"
libdir="@libdir@"
gpg_error_libs="@GPG_ERROR_LIBS@"
diff --git a/src/ntbtls.pc.in b/src/ntbtls.pc.in
new file mode 100644
index 0000000..89ab645
--- /dev/null
+++ b/src/ntbtls.pc.in
@@ -0,0 +1,14 @@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+includedir="@includedir@"
+libdir="@libdir@"
+host="@NTBTLS_CONFIG_HOST@"
+api_version="@NTBTLS_CONFIG_API_VERSION@"
+
+Name: ntbtls
+Description: The Not Too Bad TLS Library
+Requires: gpg-error
+Version: @PACKAGE_VERSION@
+Cflags: @NTBTLS_CONFIG_CFLAGS@
+Libs: @NTBTLS_CONFIG_LIBS@
+URL: https://www.gnupg.org/software/ntbtls/index.html
commit f4e5435e1d4cf0c9517d9056e293cc13bc2b5000
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 15:40:57 2018 +0900
build: Update m4 scripts.
* m4/gpg-error.m4: Update from libgpg-error.
* m4/ksba.m4: Update from libksba.
* m4/libgcrypt.m4: Update from libgcrypt.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 1661204..9f26fa4 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -70,7 +70,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+ gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --version`
major=`echo $gpg_error_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $gpg_error_config_version | \
@@ -86,13 +86,15 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
if test $ok = yes; then
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+ GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+ GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+ GPG_ERROR_MT_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --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 $gpg_error_config_args --variable=mtlibs 2>/dev/null`
+ GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+ gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG $gpg_error_config_args --variable=host 2>/dev/null || echo none`
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
@@ -100,7 +102,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
*** 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-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
*** to specify a matching config script or use \$SYSROOT.
***]])
gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 73b2e26..e7d2641 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -22,18 +22,19 @@ dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_KSBA],
[AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AM_PATH_GPG_ERROR])
AC_ARG_WITH(ksba-prefix,
AC_HELP_STRING([--with-ksba-prefix=PFX],
[prefix where KSBA is installed (optional)]),
ksba_config_prefix="$withval", ksba_config_prefix="")
if test x$ksba_config_prefix != x ; then
- ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix"
- if test x${KSBA_CONFIG+set} != xset ; then
- KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
- fi
+ if test x${KSBA_CONFIG+set} != xset ; then
+ KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
+ fi
+ else
+ KSBA_CONFIG="$GPG_ERROR_CONFIG ksba"
fi
- AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
tmp=ifelse([$1], ,1:1.0.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -52,7 +53,7 @@ AC_DEFUN([AM_PATH_KSBA],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_ksba_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version`
+ ksba_config_version=`CC=$CC $KSBA_CONFIG --modversion`
major=`echo $ksba_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $ksba_config_version | \
@@ -84,7 +85,7 @@ AC_DEFUN([AM_PATH_KSBA],
# Even if we have a recent libksba, we should check that the
# API is compatible.
if test "$req_ksba_api" -gt 0 ; then
- tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`CC=$CC $KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([KSBA API version])
if test "$req_ksba_api" -eq "$tmp" ; then
@@ -97,15 +98,15 @@ AC_DEFUN([AM_PATH_KSBA],
fi
fi
if test $ok = yes; then
- KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
- KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
+ KSBA_CFLAGS=`CC=$CC $KSBA_CONFIG --cflags`
+ KSBA_LIBS=`CC=$CC $KSBA_CONFIG --libs`
ifelse([$2], , :, [$2])
- libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
+ libksba_config_host=`CC=$CC $KSBA_CONFIG --variable=host 2>/dev/null || echo none`
if test x"$libksba_config_host" != xnone ; then
if test x"$libksba_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $LIBKSBA_CONFIG was
+*** The config script "$KSBA_CONFIG" was
*** built for $libksba_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libksba-prefix
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index c67cfec..df6469d 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,5 +1,5 @@
# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -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: 2014-10-02
+# Last-changed: 2018-10-24
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -29,6 +29,7 @@ dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AM_PATH_GPG_ERROR])
AC_ARG_WITH(libgcrypt-prefix,
AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
@@ -44,15 +45,16 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
;;
'')
+ LIBGCRYPT_CONFIG="$GPG_ERROR_CONFIG libgcrypt"
;;
*)
+ LIBGCRYPT_CONFIG="$GPG_ERROR_CONFIG libgcrypt"
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
;;
esac
fi
fi
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -71,7 +73,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+ libgcrypt_config_version=`CC=$CC $LIBGCRYPT_CONFIG --modversion`
major=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $libgcrypt_config_version | \
@@ -103,7 +105,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
# If we have a recent libgcrypt, we should also check that the
# API is compatible
if test "$req_libgcrypt_api" -gt 0 ; then
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`CC=$CC $LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBGCRYPT API version])
if test "$req_libgcrypt_api" -eq "$tmp" ; then
@@ -116,15 +118,15 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
fi
if test $ok = yes; then
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+ LIBGCRYPT_CFLAGS=`CC=$CC $LIBGCRYPT_CONFIG --cflags`
+ LIBGCRYPT_LIBS=`CC=$CC $LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ libgcrypt_config_host=`CC=$CC $LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
if test x"$libgcrypt_config_host" != xnone ; then
if test x"$libgcrypt_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $LIBGCRYPT_CONFIG was
+*** The config script "$LIBGCRYPT_CONFIG" was
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 14 ++------------
m4/gpg-error.m4 | 16 +++++++++-------
m4/ksba.m4 | 23 ++++++++++++-----------
m4/libgcrypt.m4 | 20 +++++++++++---------
src/Makefile.am | 5 ++++-
src/ntbtls-config.in | 13 +++++++++++--
src/ntbtls.m4 | 15 ++++++++-------
src/ntbtls.pc.in | 14 ++++++++++++++
8 files changed, 71 insertions(+), 49 deletions(-)
create mode 100644 src/ntbtls.pc.in
hooks/post-receive
--
Not Too Bad TLS
http://git.gnupg.org
More information about the Gnupg-commits
mailing list