[git] Assuan - branch, master, updated. libassuan-2.5.1-21-ge916b1e
by NIIBE Yutaka
cvs at cvs.gnupg.org
Mon Oct 29 04:42:45 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 "IPC library used by GnuPG".
The branch, master has been updated
via e916b1ece87dee254ea7899b01cd5d2c2ff58021 (commit)
from 882cbafa9444060524ff132d403a76d61f4273a6 (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 e916b1ece87dee254ea7899b01cd5d2c2ff58021
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Oct 29 12:14:47 2018 +0900
build: Update gpg-error.m4 and libassuan.m4.
* m4/gpg-error.m4: Update to 2018-10-26.
* src/libassuan.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/src/libassuan.m4 b/src/libassuan.m4
index 57adbfc..52058ea 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -28,7 +28,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
use_gpgrt_config=""
if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if CC=$CC $GPGRT_CONFIG libassuan >/dev/null 2>&1; then
+ if $GPGRT_CONFIG libassuan --exists; then
LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
use_gpgrt_config=yes
fi
@@ -57,9 +57,9 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test -z "$use_gpgrt_config"; then
- libassuan_config_version=`CC=$CC $LIBASSUAN_CONFIG --version`
+ libassuan_config_version=`$LIBASSUAN_CONFIG --version`
else
- libassuan_config_version=`CC=$CC $LIBASSUAN_CONFIG --modversion`
+ libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
fi
major=`echo $libassuan_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -94,9 +94,9 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test "$req_libassuan_api" -gt 0 ; then
if test -z "$use_gpgrt_config"; then
- tmp=`CC=$CC $LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+ tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
else
- tmp=`CC=$CC $LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBASSUAN API version])
@@ -113,9 +113,9 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test x"$host" != x ; then
if test -z "$use_gpgrt_config"; then
- libassuan_config_host=`CC=$CC $LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
+ libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
else
- libassuan_config_host=`CC=$CC $LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
+ libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
fi
if test x"$libassuan_config_host" != xnone ; then
if test x"$libassuan_config_host" != x"$host" ; then
@@ -157,8 +157,8 @@ dnl
AC_DEFUN([AM_PATH_LIBASSUAN],
[ _AM_PATH_LIBASSUAN_COMMON($1)
if test $ok = yes; then
- LIBASSUAN_CFLAGS=`CC=$CC $LIBASSUAN_CONFIG --cflags`
- LIBASSUAN_LIBS=`CC=$CC $LIBASSUAN_CONFIG --libs`
+ LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
+ LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
ifelse([$2], , :, [$2])
else
LIBASSUAN_CFLAGS=""
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 38 ++++++++++++++++++++++----------------
src/libassuan.m4 | 18 +++++++++---------
2 files changed, 31 insertions(+), 25 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list