[git] Assuan - branch, master, updated. libassuan-2.5.1-10-g9b16665
by NIIBE Yutaka
cvs at cvs.gnupg.org
Wed Oct 24 04:44: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 "IPC library used by GnuPG".
The branch, master has been updated
via 9b1666522f7b748cdbdd65cf7f91a76fdde6623b (commit)
via f69f4c893f29c1a359cc60f8a87a79d05d9a6c15 (commit)
via 9c74661d6f8028c616932b02eb5360a2e3587e81 (commit)
via 34fd79ae2af25a2ac9a60a811229ec9d28926f9d (commit)
from afeae6496f51d28958fd92b04cc933ee6ceb5b61 (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 9b1666522f7b748cdbdd65cf7f91a76fdde6623b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 11:41:51 2018 +0900
build: Compatibility to pkg-config.
* src/libassuan-config.in: Support --variable and --modversion.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/libassuan-config.in b/src/libassuan-config.in
index c551bcb..4851c2f 100644
--- a/src/libassuan-config.in
+++ b/src/libassuan-config.in
@@ -70,6 +70,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 f69f4c893f29c1a359cc60f8a87a79d05d9a6c15
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 11:17:58 2018 +0900
build: Make libassuan.m4 use gpg-error-config.
* src/libassuan.m4: Use gpg-error-config.
--
The option --with-libassuan-prefix let it use libassuan-config.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index fe45b06..ab1e855 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -16,19 +16,19 @@ dnl Returns ok set to yes or no.
dnl
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
[ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AM_PATH_GPG_ERROR])
AC_ARG_WITH(libassuan-prefix,
AC_HELP_STRING([--with-libassuan-prefix=PFX],
[prefix where LIBASSUAN is installed (optional)]),
libassuan_config_prefix="$withval", libassuan_config_prefix="")
if test x$libassuan_config_prefix != x ; then
- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
if test x${LIBASSUAN_CONFIG+set} != xset ; then
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
fi
+ else
+ LIBASSUAN_CONFIG="$GPG_ERROR_CONFIG libassuan"
fi
- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
-
tmp=ifelse([$1], ,1:0.9.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -41,7 +41,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
ok=no
if test "$LIBASSUAN_CONFIG" != "no" \
- && test -f "$LIBASSUAN_CONFIG" ; then
+ && test -f "${LIBASSUAN_CONFIG% *}" ; then
req_major=`echo $min_libassuan_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_libassuan_version | \
@@ -49,7 +49,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
req_micro=`echo $min_libassuan_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
+ libassuan_config_version=`CC=$CC $LIBASSUAN_CONFIG --modversion`
major=`echo $libassuan_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $libassuan_config_version | \
@@ -82,7 +82,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test "$req_libassuan_api" -gt 0 ; then
- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`CC=$CC $LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBASSUAN API version])
if test "$req_libassuan_api" -eq "$tmp" ; then
@@ -97,12 +97,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test x"$host" != x ; then
- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
+ libassuan_config_host=`CC=$CC $LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
if test x"$libassuan_config_host" != xnone ; then
if test x"$libassuan_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $LIBASSUAN_CONFIG was
+*** The config script "$LIBASSUAN_CONFIG" was
*** built for $libassuan_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libassuan-prefix
@@ -138,8 +138,8 @@ dnl
AC_DEFUN([AM_PATH_LIBASSUAN],
[ _AM_PATH_LIBASSUAN_COMMON($1)
if test $ok = yes; then
- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+ LIBASSUAN_CFLAGS=`CC=$CC $LIBASSUAN_CONFIG --cflags`
+ LIBASSUAN_LIBS=`CC=$CC $LIBASSUAN_CONFIG --libs`
ifelse([$2], , :, [$2])
else
LIBASSUAN_CFLAGS=""
commit 9c74661d6f8028c616932b02eb5360a2e3587e81
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 10:41:00 2018 +0900
build: Provide libassuan.pc, generated by configure.
* configure.ac (PACKAGE, VERSION): Remove.
Generate src/libassuan.pc.
* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New.
(assuan.h): Use PACKAGE_VERSION and VERSION_NUMBER vars.
* src/libassuan-config.in: Use @PACKAGE_VERSION at .
* src/libassuan.pc.in: New.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index dad379a..2dadcd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,9 +73,6 @@ AC_SUBST(LIBASSUAN_LT_CURRENT)
AC_SUBST(LIBASSUAN_LT_AGE)
AC_SUBST(LIBASSUAN_LT_REVISION)
-PACKAGE=$PACKAGE_NAME
-VERSION=$PACKAGE_VERSION
-
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
AM_MAINTAINER_MODE
@@ -88,17 +85,10 @@ AB_INIT
AC_GNU_SOURCE
-
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
-AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",[Bug report address])
VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \
mym4_minor mym4_micro)
AC_SUBST(VERSION_NUMBER)
-
# Don't default to build static libs.
LT_PREREQ([2.2.6])
LT_INIT([win32-dll disable-static])
@@ -456,6 +446,7 @@ AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
+AC_CONFIG_FILES([src/libassuan.pc])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index f353e29..089bc97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,12 @@
# SPDX-License-Identifier: LGPL-2.1+
## Process this file with automake to produce Makefile.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libassuan.pc
+
EXTRA_DIST = libassuan-config.in libassuan.m4 libassuan.vers \
- versioninfo.rc.in libassuan.def mkheader.c gpgcedev.def
+ versioninfo.rc.in libassuan.def mkheader.c gpgcedev.def \
+ libassuan.pc.in
AM_CPPFLAGS = -I..
bin_SCRIPTS = libassuan-config
@@ -149,6 +153,4 @@ mkheader: mkheader.c Makefile
assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
./mkheader $(host_os) $(srcdir)/assuan.h.in \
- @VERSION@ @VERSION_NUMBER@ >$@
-
-
+ $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
diff --git a/src/libassuan-config.in b/src/libassuan-config.in
index 04177f0..c551bcb 100644
--- a/src/libassuan-config.in
+++ b/src/libassuan-config.in
@@ -71,7 +71,7 @@ while test $# -gt 0; do
echo_exec_prefix=yes
;;
--version)
- echo "@VERSION@"
+ echo "@PACKAGE_VERSION@"
exit 0
;;
--api-version)
diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in
new file mode 100644
index 0000000..6b245fa
--- /dev/null
+++ b/src/libassuan.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+host=@LIBASSUAN_CONFIG_HOST@
+api_version=@LIBASSUAN_CONFIG_API_VERSION@
+
+Name: libassuan
+Description: IPC library for the GnuPG components
+Requires: gpg-error
+Version: @PACKAGE_VERSION@
+Cflags: @LIBASSUAN_CONFIG_CFLAGS@
+Libs: @LIBASSUAN_CONFIG_LIB@ @LIBASSUAN_CONFIG_EXTRA_LIBS@
+URL: https://www.gnupg.org/related_software/libassuan/index.html
commit 34fd79ae2af25a2ac9a60a811229ec9d28926f9d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Oct 24 09:44:15 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 feb963c..9f26fa4 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -1,5 +1,5 @@
# gpg-error.m4 - autoconf macro to detect libgpg-error.
-# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 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
@@ -8,10 +8,21 @@
# This file is distributed in the hope that it will be useful, but
# 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
+
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
+dnl
+dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
+dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
+dnl used for programs requireing real multi thread support.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH. If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -30,13 +41,26 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_ARG_WITH(gpg-error-prefix,,
[gpg_error_config_prefix="$withval"])
- if test x$gpg_error_config_prefix != x ; then
- if test x${GPG_ERROR_CONFIG+set} != xset ; then
- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
+ if test x"${GPG_ERROR_CONFIG}" = x ; then
+ if test x"${gpg_error_config_prefix}" != x ; then
+ GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/gpg-error-config" ; then
+ GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+ ;;
+ esac
fi
fi
- AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
+ AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,0.0,$1)
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
ok=no
@@ -46,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 | \
@@ -62,11 +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_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([[
@@ -74,17 +102,22 @@ 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
-*** to specify a matching config script.
+*** 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"
fi
fi
else
GPG_ERROR_CFLAGS=""
GPG_ERROR_LIBS=""
+ GPG_ERROR_MT_CFLAGS=""
+ GPG_ERROR_MT_LIBS=""
AC_MSG_RESULT(no)
ifelse([$3], , :, [$3])
fi
AC_SUBST(GPG_ERROR_CFLAGS)
AC_SUBST(GPG_ERROR_LIBS)
+ AC_SUBST(GPG_ERROR_MT_CFLAGS)
+ AC_SUBST(GPG_ERROR_MT_LIBS)
])
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 11 +---------
m4/gpg-error.m4 | 57 ++++++++++++++++++++++++++++++++++++++-----------
src/Makefile.am | 10 +++++----
src/libassuan-config.in | 12 ++++++++++-
src/libassuan.m4 | 20 ++++++++---------
src/libassuan.pc.in | 14 ++++++++++++
6 files changed, 87 insertions(+), 37 deletions(-)
create mode 100644 src/libassuan.pc.in
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list