[git] KSBA - branch, master, updated. libksba-1.3.5-21-gdfc3ad5
by NIIBE Yutaka
cvs at cvs.gnupg.org
Wed Oct 24 05:44:56 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 "KSBA is a library to access X.509 certificates and CMS data.".
The branch, master has been updated
via dfc3ad5c6e97cc11de4faa19de59203ae8d5eb1a (commit)
via ce5247c0f3fcbe8a1e70c33ab4c83d807aecce63 (commit)
via d0016a76942eb58748182ad282c03d5cd7a0dc86 (commit)
via ec4e838ca91849b493f7ea77074e4415ed6a2d4a (commit)
from a1ce3c17ee0d44ba8c7c9553824ba55b7950e930 (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 dfc3ad5c6e97cc11de4faa19de59203ae8d5eb1a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 12:44:24 2018 +0900
build: Compatibility to pkg-config.
* src/ksba-config.in: Support --variable and --modversion.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/ksba-config.in b/src/ksba-config.in
index d43acd7..3c03c64 100644
--- a/src/ksba-config.in
+++ b/src/ksba-config.in
@@ -71,6 +71,16 @@ while test $# -gt 0; do
--exec-prefix)
echo_exec_prefix=yes
;;
+ --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 "@PACKAGE_VERSION@"
exit 0
commit ce5247c0f3fcbe8a1e70c33ab4c83d807aecce63
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 12:41:06 2018 +0900
build: Make ksba.m4 use gpg-error-config.
* src/ksba.m4: Use gpg-error-config.
--
The option --with-ksba-prefix let it use ksba-config.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/ksba.m4 b/src/ksba.m4
index 73b2e26..e7d2641 100644
--- a/src/ksba.m4
+++ b/src/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
commit d0016a76942eb58748182ad282c03d5cd7a0dc86
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 12:30:43 2018 +0900
build: Provide libassuan.pc, generated by configure.
* configure.ac (PACKAGE, VERSION): Remove.
Generate src/ksba.pc.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
* src/ksba-config.in: Use @PACKAGE_VERSION at .
* src/ksba.pc.in: New.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index 4f8928d..cc084a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,9 +61,6 @@ KSBA_CONFIG_API_VERSION=1
NEED_GPG_ERROR_VERSION=1.8
-PACKAGE=$PACKAGE_NAME
-VERSION=$PACKAGE_VERSION
-
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([src/ksba.h])
AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
@@ -84,10 +81,7 @@ AM_MAINTAINER_MODE
AC_SUBST(LIBKSBA_LT_CURRENT)
AC_SUBST(LIBKSBA_LT_AGE)
AC_SUBST(LIBKSBA_LT_REVISION)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
+
AH_TOP([
#ifndef _KSBA_CONFIG_H_INCLUDED
@@ -435,6 +429,7 @@ m4/Makefile
gl/Makefile
src/Makefile
src/ksba-config
+src/ksba.pc
src/versioninfo.rc
tests/Makefile
doc/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e8a5692..a5291ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,11 +18,14 @@
## Process this file with automake to produce Makefile.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ksba.pc
+
asn1_modules = tmttv2.asn cms.asn
buildtool_src = asn1-gentables.c gen-help.c gen-help.h
EXTRA_DIST = ksba-config.in $(asn1_modules) ksba.m4 libksba.vers libksba.def \
- asn1-parse.c asn1-tables.c $(buildtool_src)
+ asn1-parse.c asn1-tables.c $(buildtool_src) ksba.pc.in
BUILT_SOURCES = asn1-parse.c asn1-tables.c
bin_SCRIPTS = ksba-config
include_HEADERS = ksba.h
diff --git a/src/ksba-config.in b/src/ksba-config.in
index 55f4fcb..d43acd7 100644
--- a/src/ksba-config.in
+++ b/src/ksba-config.in
@@ -72,7 +72,7 @@ while test $# -gt 0; do
echo_exec_prefix=yes
;;
--version)
- echo "@VERSION@"
+ echo "@PACKAGE_VERSION@"
exit 0
;;
--api-version)
diff --git a/src/ksba.pc.in b/src/ksba.pc.in
new file mode 100644
index 0000000..28b32c5
--- /dev/null
+++ b/src/ksba.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+host=@KSBA_CONFIG_HOST@
+api_version=@KSBA_CONFIG_API_VERSION@
+
+Name: ksba
+Description: X.509 and CMS support library
+Requires: gpg-error
+Version: @PACKAGE_VERSION@
+Cflags: @KSBA_CONFIG_CFLAGS@
+Libs: @KSBA_CONFIG_LIB@
+URL: http://www.gnupg.org/related_software/libksba/
commit ec4e838ca91849b493f7ea77074e4415ed6a2d4a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 11:52:52 2018 +0900
build: Update gpg-error.m4 from libgpg-error.
* m4/gpg-error.m4: Update from libgpg-error 1.33.
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"
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 9 ++-------
m4/gpg-error.m4 | 16 +++++++++-------
src/Makefile.am | 5 ++++-
src/ksba-config.in | 12 +++++++++++-
src/ksba.m4 | 23 ++++++++++++-----------
src/ksba.pc.in | 14 ++++++++++++++
6 files changed, 52 insertions(+), 27 deletions(-)
create mode 100644 src/ksba.pc.in
hooks/post-receive
--
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list