[git] KSBA - branch, master, updated. libksba-1.3.5-28-gd3fdae7
by NIIBE Yutaka
cvs at cvs.gnupg.org
Fri Oct 26 03:48:31 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 d3fdae7a299a0514b90dbb7f45a0d08ee5d93078 (commit)
from 910c148825d50798689998ed760b658f2aeeee64 (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 d3fdae7a299a0514b90dbb7f45a0d08ee5d93078
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri Oct 26 10:46:39 2018 +0900
ksba.m4: Better backward compatibility.
* m4/gpg-error.m4: Update.
* src/ksba.m4: Don't assume ksba-config is newer.
Fix KSBA_CONFIG which used LIBKSBA_CONFIG wrongly.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index f89a4ee..70dc501 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-25
+# Last-changed: 2018-10-26
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -63,10 +63,13 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,1.33,$1)
ok=no
+
+ 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`
fi
else
@@ -94,6 +97,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
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
fi
fi
fi
@@ -101,18 +105,27 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
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_MT_CFLAGS=`CC=$CC $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_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_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`
+ else
+ GPG_ERROR_MT_CFLAGS=`CC=$CC $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_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
+ fi
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
- gpg_error_config_host=`CC=$CC $GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
+ if test -z "$use_gpgrt_config"; then
+ gpg_error_config_host=`CC=$CC $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`
+ fi
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $GPG_ERROR_CONFIG was
+*** 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-libgpg-error-prefix
diff --git a/src/ksba.m4 b/src/ksba.m4
index 1333979..c61ca55 100644
--- a/src/ksba.m4
+++ b/src/ksba.m4
@@ -45,12 +45,12 @@ AC_DEFUN([AM_PATH_KSBA],
use_gpgrt_config=""
if test x"$KSBA_CONFIG" != x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if CC=$CC $GPGRT_CONFIG libksba >/dev/null 2>&1; then
- LIBKSBA_CONFIG="$GPGRT_CONFIG libksba"
+ KSBA_CONFIG="$GPGRT_CONFIG libksba"
use_gpgrt_config=yes
fi
fi
if test -z "$use_gpgrt_config"; then
- AC_PATH_PROG(LIBKSBA_CONFIG, ksba-config, no)
+ AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
fi
tmp=ifelse([$1], ,1:1.0.0,$1)
@@ -71,7 +71,11 @@ 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=`CC=$CC $KSBA_CONFIG --modversion`
+ if test -z "$use_gpgrt_config"; then
+ ksba_config_version=`CC=$CC $KSBA_CONFIG --version`
+ else
+ ksba_config_version=`CC=$CC $KSBA_CONFIG --modversion`
+ fi
major=`echo $ksba_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $ksba_config_version | \
@@ -103,7 +107,11 @@ 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=`CC=$CC $KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ if test -z "$use_gpgrt_config"; then
+ tmp=`CC=$CC $KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+ else
+ tmp=`CC=$CC $KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ fi
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([KSBA API version])
if test "$req_ksba_api" -eq "$tmp" ; then
@@ -119,7 +127,11 @@ AC_DEFUN([AM_PATH_KSBA],
KSBA_CFLAGS=`CC=$CC $KSBA_CONFIG --cflags`
KSBA_LIBS=`CC=$CC $KSBA_CONFIG --libs`
ifelse([$2], , :, [$2])
- libksba_config_host=`CC=$CC $KSBA_CONFIG --variable=host 2>/dev/null || echo none`
+ if test -z "$use_gpgrt_config"; then
+ libksba_config_host=`CC=$CC $KSBA_CONFIG --host 2>/dev/null || echo none`
+ else
+ libksba_config_host=`CC=$CC $KSBA_CONFIG --variable=host 2>/dev/null || echo none`
+ fi
if test x"$libksba_config_host" != xnone ; then
if test x"$libksba_config_host" != x"$host" ; then
AC_MSG_WARN([[
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 27 ++++++++++++++++++++-------
src/ksba.m4 | 22 +++++++++++++++++-----
2 files changed, 37 insertions(+), 12 deletions(-)
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