|
|
@@ -1,5 +1,5 @@
|
|
|
# libgcrypt.m4 - Autoconf macros to detect libgcrypt
|
|
|
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
|
|
|
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 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
|
|
|
@@ -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: 2014-10-02
|
|
|
+# Last-changed: 2020-09-27
|
|
|
|
|
|
|
|
|
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
|
|
|
@@ -19,7 +19,7 @@ dnl MINIMUM-VERSION is a string with the version number optionally prefixed
|
|
|
dnl with the API version to also check the API compatibility. Example:
|
|
|
dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
|
|
|
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
|
|
|
-dnl this feature prevents building against newer versions of libgcrypt
|
|
|
+dnl this features allows to prevent build against newer versions of libgcrypt
|
|
|
dnl with a changed API.
|
|
|
dnl
|
|
|
dnl If a prefix option is not used, the config script is first
|
|
|
@@ -30,14 +30,26 @@ dnl
|
|
|
AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
|
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
|
|
AC_ARG_WITH(libgcrypt-prefix,
|
|
|
- AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
|
|
|
+ AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
|
|
|
[prefix where LIBGCRYPT is installed (optional)]),
|
|
|
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
|
|
|
if test x"${LIBGCRYPT_CONFIG}" = x ; then
|
|
|
if test x"${libgcrypt_config_prefix}" != x ; then
|
|
|
LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
|
|
|
- else
|
|
|
- case "${SYSROOT}" in
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
+ use_gpgrt_config=""
|
|
|
+ if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
|
|
+ if $GPGRT_CONFIG libgcrypt --exists; then
|
|
|
+ LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
|
|
|
+ AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
|
|
|
+ use_gpgrt_config=yes
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ if test -z "$use_gpgrt_config"; then
|
|
|
+ if test x"${LIBGCRYPT_CONFIG}" = x ; then
|
|
|
+ case "${SYSROOT}" in
|
|
|
/*)
|
|
|
if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
|
|
|
LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
|
|
|
@@ -48,11 +60,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
|
*)
|
|
|
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
|
|
;;
|
|
|
- esac
|
|
|
- fi
|
|
|
+ esac
|
|
|
+ fi
|
|
|
+ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
|
|
|
fi
|
|
|
|
|
|
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
|
|
|
tmp=ifelse([$1], ,1:1.2.0,$1)
|
|
|
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
|
|
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
|
|
@@ -71,7 +83,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
|
req_micro=`echo $min_libgcrypt_version | \
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
|
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
|
|
|
+ if test -z "$use_gpgrt_config"; then
|
|
|
+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
|
|
|
+ else
|
|
|
+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
|
|
|
+ fi
|
|
|
major=`echo $libgcrypt_config_version | \
|
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
|
minor=`echo $libgcrypt_config_version | \
|
|
|
@@ -103,7 +119,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
|
# If we have a recent libgcrypt, we should also check that the
|
|
|
# API is compatible
|
|
|
if test "$req_libgcrypt_api" -gt 0 ; then
|
|
|
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
|
|
|
+ if test -z "$use_gpgrt_config"; then
|
|
|
+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
|
|
|
+ else
|
|
|
+ tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
|
|
+ fi
|
|
|
if test "$tmp" -gt 0 ; then
|
|
|
AC_MSG_CHECKING([LIBGCRYPT API version])
|
|
|
if test "$req_libgcrypt_api" -eq "$tmp" ; then
|
|
|
@@ -119,12 +139,16 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
|
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
|
|
|
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
|
|
|
ifelse([$2], , :, [$2])
|
|
|
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
|
|
|
+ if test -z "$use_gpgrt_config"; then
|
|
|
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
|
|
|
+ else
|
|
|
+ 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
|
|
|
AC_MSG_WARN([[
|
|
|
***
|
|
|
-*** The config script $LIBGCRYPT_CONFIG was
|
|
|
+*** The config script "$LIBGCRYPT_CONFIG" was
|
|
|
*** built for $libgcrypt_config_host and thus may not match the
|
|
|
*** used host $host.
|
|
|
*** You may want to use the configure option --with-libgcrypt-prefix
|
Evgeny Grin