mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
m4: Update our library m4 files from master
* m4/gpg-error.m4: Updated * m4/ksba.m4: Updated * m4/libassuan.m4: Updated * m4/libgcrypt.m4: Updated * m4/npth.m4: Updated * m4/ntbtls.m4: Updated -- This better fits with the new gpgrt-config system
This commit is contained in:
Werner Koch
parent
137590fd86
commit
c8cd66ae7e
6 changed files with 353 additions and 162 deletions
116
m4/gpg-error.m4
116
m4/gpg-error.m4
|
|
@ -1,5 +1,6 @@
|
|||
# gpg-error.m4 - autoconf macro to detect libgpg-error.
|
||||
# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
|
||||
# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021
|
||||
# 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 +10,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: 2021-03-31
|
||||
|
||||
|
||||
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
|
||||
|
|
@ -31,7 +32,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
|||
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(libgpg-error-prefix,
|
||||
AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
|
||||
AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
|
||||
[prefix where GPG Error is installed (optional)]),
|
||||
[gpg_error_config_prefix="$withval"])
|
||||
|
||||
|
|
@ -61,16 +62,89 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
|||
fi
|
||||
|
||||
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
|
||||
min_gpg_error_version=ifelse([$1], ,0.0,$1)
|
||||
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||
min_gpg_error_version=ifelse([$1], ,1.33,$1)
|
||||
ok=no
|
||||
if test "$GPG_ERROR_CONFIG" != "no" \
|
||||
&& test -f "$GPG_ERROR_CONFIG" ; then
|
||||
|
||||
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
|
||||
if test "$GPGRT_CONFIG" != "no"; then
|
||||
# Determine gpgrt_libdir
|
||||
#
|
||||
# Get the prefix of gpgrt-config assuming it's something like:
|
||||
# <PREFIX>/bin/gpgrt-config
|
||||
gpgrt_prefix=${GPGRT_CONFIG%/*/*}
|
||||
possible_libdir1=${gpgrt_prefix}/lib
|
||||
# Determine by using system libdir-format with CC, it's like:
|
||||
# Normal style: /usr/lib
|
||||
# GNU cross style: /usr/<triplet>/lib
|
||||
# Debian style: /usr/lib/<multiarch-name>
|
||||
# Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
|
||||
# It is assumed that CC is specified to the one of host on cross build.
|
||||
if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
|
||||
sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
|
||||
/g;p;}"); then
|
||||
# From the output of -print-search-dirs, select valid pkgconfig dirs.
|
||||
libdir_candidates=$(for dir in $libdir_candidates; do
|
||||
if p=$(cd $dir 2>/dev/null && pwd); then
|
||||
test -d "$p/pkgconfig" && echo $p;
|
||||
fi
|
||||
done)
|
||||
|
||||
for possible_libdir0 in $libdir_candidates; do
|
||||
# possible_libdir0:
|
||||
# Fallback candidate, the one of system-installed (by $CC)
|
||||
# (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
|
||||
# possible_libdir1:
|
||||
# Another candidate, user-locally-installed
|
||||
# (<gpgrt_prefix>/lib)
|
||||
# possible_libdir2
|
||||
# Most preferred
|
||||
# (<gpgrt_prefix>/<triplet>/lib,
|
||||
# <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
|
||||
if test "${possible_libdir0##*/}" = "lib"; then
|
||||
possible_prefix0=${possible_libdir0%/lib}
|
||||
possible_prefix0_triplet=${possible_prefix0##*/}
|
||||
if test -z "$possible_prefix0_triplet"; then
|
||||
continue
|
||||
fi
|
||||
possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
|
||||
else
|
||||
possible_prefix0=${possible_libdir0%%/lib*}
|
||||
possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
|
||||
fi
|
||||
if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
|
||||
gpgrt_libdir=${possible_libdir2}
|
||||
elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
|
||||
gpgrt_libdir=${possible_libdir1}
|
||||
elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
|
||||
gpgrt_libdir=${possible_libdir0}
|
||||
fi
|
||||
if test -n "$gpgrt_libdir"; then break; fi
|
||||
done
|
||||
else
|
||||
# When we cannot determine system libdir-format, use this:
|
||||
gpgrt_libdir=${possible_libdir1}
|
||||
fi
|
||||
else
|
||||
unset GPGRT_CONFIG
|
||||
fi
|
||||
|
||||
if test -n "$gpgrt_libdir"; then
|
||||
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||
else
|
||||
unset GPGRT_CONFIG
|
||||
fi
|
||||
elif test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
|
||||
fi
|
||||
if test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
req_major=`echo $min_gpg_error_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
req_minor=`echo $min_gpg_error_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
|
||||
major=`echo $gpg_error_config_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
minor=`echo $gpg_error_config_version | \
|
||||
|
|
@ -85,22 +159,34 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||
if test $ok = yes; then
|
||||
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
|
||||
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
|
||||
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
|
||||
GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
|
||||
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
|
||||
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
|
||||
if test -z "$GPGRT_CONFIG"; then
|
||||
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=`$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=`$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=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
|
||||
if test -z "$GPGRT_CONFIG"; then
|
||||
gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
|
||||
else
|
||||
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
|
||||
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-gpg-error-prefix
|
||||
*** You may want to use the configure option --with-libgpg-error-prefix
|
||||
*** to specify a matching config script or use \$SYSROOT.
|
||||
***]])
|
||||
gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue