mirror of
git://git.gnupg.org/gnupg.git
synced 2024-10-31 20:08:43 +01:00
d66fb3aa53
* acinclude.m4 (GNUPG_CHECK_ENDIAN): Use AC_COMPILE_IFELSE instead of AC_TRY_COMPILE. Use AC_RUN_IFELSE instead of AC_TRY_RUN. (GNUPG_BUILD_PROGRAM): Use AS_HELP_STRING instead of AC_HELP_STRING. * configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE. Use AS_HELP_STRING instead of AC_HELP_STRING. (AC_ISC_POSIX): Replace by AC_SEARCH_LIBS. (AC_TYPE_SIGNAL): Remove. * m4/isc-posix.m4: Remove. * m4/codeset.m4: Update from gnulib. * m4/gettext.m4: Update from gnulib. * m4/lcmessage.m4: Update from gnulib. * m4/socklen.m4: Update from gnulib. * m4/ldap.m4: Use AS_HELP_STRING instead of AC_HELP_STRING. Use AC_LINK_IFELSE instead of AC_TRY_LINK. Use AC_RUN_IFELSE instead of AC_TRY_RUN. * m4/gpg-error.m4: Update from libgpg-error. * m4/readline.m4: Update from libgpg-error. * m4/npth.m4: Update from npth. * m4/libassuan.m4: Update from libassuan. * m4/libgcrypt.m4: Update from libgcrypt. * m4/ksba.m4: Update from libksba. * m4/ntbtls.m4: Update from ntbtls. * common/signal.c [!HAVE_DOSISH_SYSTEM] (init_one_signal): Replace RETSIGTYPE to void. [!HAVE_DOSISH_SYSTEM] (got_fatal_signal, got_usr_signal): Likewise. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
157 lines
5.5 KiB
Plaintext
157 lines
5.5 KiB
Plaintext
# ksba.m4 - autoconf macro to detect ksba
|
|
# Copyright (C) 2002, 2018 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
|
|
# modifications, as long as this notice is preserved.
|
|
#
|
|
# 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: 2020-11-18
|
|
|
|
dnl AM_PATH_KSBA([MINIMUM-VERSION,
|
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
|
|
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
|
|
dnl with the API version to also check the API compatibility. Example:
|
|
dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
|
|
dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using
|
|
dnl this features allows to prevent build against newer versions of libksba
|
|
dnl with a changed API.
|
|
dnl
|
|
AC_DEFUN([AM_PATH_KSBA],
|
|
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
|
dnl --with-libksba-prefix=PFX is the preferred name for this option,
|
|
dnl since that is consistent with how our three siblings use the directory/
|
|
dnl package name in --with-$dir_name-prefix=PFX.
|
|
AC_ARG_WITH(libksba-prefix,
|
|
AS_HELP_STRING([--with-libksba-prefix=PFX],
|
|
[prefix where KSBA is installed (optional)]),
|
|
ksba_config_prefix="$withval", ksba_config_prefix="")
|
|
|
|
dnl Accept --with-ksba-prefix and make it work the same as
|
|
dnl --with-libksba-prefix above, for backwards compatibility,
|
|
dnl but do not document this old, inconsistently-named option.
|
|
AC_ARG_WITH(ksba-prefix,,
|
|
ksba_config_prefix="$withval", ksba_config_prefix="")
|
|
|
|
if test x$ksba_config_prefix != x ; then
|
|
if test x${KSBA_CONFIG+set} != xset ; then
|
|
KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
|
|
fi
|
|
fi
|
|
|
|
use_gpgrt_config=""
|
|
if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
|
if $GPGRT_CONFIG ksba --exists; then
|
|
KSBA_CONFIG="$GPGRT_CONFIG ksba"
|
|
AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
|
|
use_gpgrt_config=yes
|
|
fi
|
|
fi
|
|
if test -z "$use_gpgrt_config"; then
|
|
AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
|
|
fi
|
|
|
|
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/'`
|
|
min_ksba_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
|
|
else
|
|
req_ksba_api=0
|
|
min_ksba_version="$tmp"
|
|
fi
|
|
|
|
AC_MSG_CHECKING(for KSBA - version >= $min_ksba_version)
|
|
ok=no
|
|
if test "$KSBA_CONFIG" != "no" ; then
|
|
req_major=`echo $min_ksba_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
|
req_minor=`echo $min_ksba_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
req_micro=`echo $min_ksba_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
if test -z "$use_gpgrt_config"; then
|
|
ksba_config_version=`$KSBA_CONFIG --version`
|
|
else
|
|
ksba_config_version=`$KSBA_CONFIG --modversion`
|
|
fi
|
|
major=`echo $ksba_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
minor=`echo $ksba_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
micro=`echo $ksba_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
|
if test "$major" -gt "$req_major"; then
|
|
ok=yes
|
|
else
|
|
if test "$major" -eq "$req_major"; then
|
|
if test "$minor" -gt "$req_minor"; then
|
|
ok=yes
|
|
else
|
|
if test "$minor" -eq "$req_minor"; then
|
|
if test "$micro" -ge "$req_micro"; then
|
|
ok=yes
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
if test $ok = yes; then
|
|
AC_MSG_RESULT([yes ($ksba_config_version)])
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
fi
|
|
if test $ok = yes; then
|
|
# Even if we have a recent libksba, we should check that the
|
|
# API is compatible.
|
|
if test "$req_ksba_api" -gt 0 ; then
|
|
if test -z "$use_gpgrt_config"; then
|
|
tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
|
|
else
|
|
tmp=`$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
|
|
AC_MSG_RESULT(okay)
|
|
else
|
|
ok=no
|
|
AC_MSG_RESULT([does not match. want=$req_ksba_api got=$tmp.])
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
if test $ok = yes; then
|
|
KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
|
|
KSBA_LIBS=`$KSBA_CONFIG --libs`
|
|
ifelse([$2], , :, [$2])
|
|
if test -z "$use_gpgrt_config"; then
|
|
libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
|
|
else
|
|
libksba_config_host=`$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([[
|
|
***
|
|
*** 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
|
|
*** to specify a matching config script.
|
|
***]])
|
|
fi
|
|
fi
|
|
else
|
|
KSBA_CFLAGS=""
|
|
KSBA_LIBS=""
|
|
ifelse([$3], , :, [$3])
|
|
fi
|
|
AC_SUBST(KSBA_CFLAGS)
|
|
AC_SUBST(KSBA_LIBS)
|
|
])
|