[git] GCRYPT - branch, master, updated. libgcrypt-1.8.1-113-g4a4d4a2
by NIIBE Yutaka
cvs at cvs.gnupg.org
Mon Oct 29 04:51:49 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 "The GNU crypto library".
The branch, master has been updated
via 4a4d4a284ca996df874e2534f8529c1611289943 (commit)
from 6e669e09603e5a98b59dcf35f77f346db6c81eac (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 4a4d4a284ca996df874e2534f8529c1611289943
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Oct 29 12:51:19 2018 +0900
build: Update gpg-error.m4 and ksba.m4.
* m4/gpg-error.m4: Update to 2018-10-29.
* src/libgrypt.m4: Follow the change of gpgrt-config.
Bump the version date.
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/libgcrypt.m4 b/src/libgcrypt.m4
index 5c3f6e1..2646e96 100644
--- a/src/libgcrypt.m4
+++ b/src/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
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 38 ++++++++++++++++++++++----------------
src/libgcrypt.m4 | 20 ++++++++++----------
2 files changed, 32 insertions(+), 26 deletions(-)
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits
More information about the Gcrypt-devel
mailing list