mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +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>
189 lines
7.0 KiB
Plaintext
189 lines
7.0 KiB
Plaintext
# gpg-error.m4 - autoconf macro to detect libgpg-error.
|
|
# 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
|
|
# 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-17
|
|
|
|
|
|
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
|
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
dnl
|
|
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
|
|
dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
|
|
dnl used for programs requireing real multi thread support.
|
|
dnl
|
|
dnl If a prefix option is not used, the config script is first
|
|
dnl searched in $SYSROOT/bin and then along $PATH. If the used
|
|
dnl config script does not match the host specification the script
|
|
dnl is added to the gpg_config_script_warn variable.
|
|
dnl
|
|
AC_DEFUN([AM_PATH_GPG_ERROR],
|
|
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
|
gpg_error_config_prefix=""
|
|
dnl --with-libgpg-error-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(libgpg-error-prefix,
|
|
AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
|
|
[prefix where GPG Error is installed (optional)]),
|
|
[gpg_error_config_prefix="$withval"])
|
|
|
|
dnl Accept --with-gpg-error-prefix and make it work the same as
|
|
dnl --with-libgpg-error-prefix above, for backwards compatibility,
|
|
dnl but do not document this old, inconsistently-named option.
|
|
AC_ARG_WITH(gpg-error-prefix,,
|
|
[gpg_error_config_prefix="$withval"])
|
|
|
|
if test x"${GPG_ERROR_CONFIG}" = x ; then
|
|
if test x"${gpg_error_config_prefix}" != x ; then
|
|
GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
|
|
else
|
|
case "${SYSROOT}" in
|
|
/*)
|
|
if test -x "${SYSROOT}/bin/gpg-error-config" ; then
|
|
GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
|
|
fi
|
|
;;
|
|
'')
|
|
;;
|
|
*)
|
|
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
|
;;
|
|
esac
|
|
fi
|
|
fi
|
|
|
|
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
|
|
min_gpg_error_version=ifelse([$1], ,1.33,$1)
|
|
ok=no
|
|
|
|
if test "$prefix" = NONE ; then
|
|
prefix_option_expanded=/usr/local
|
|
else
|
|
prefix_option_expanded="$prefix"
|
|
fi
|
|
if test "$exec_prefix" = NONE ; then
|
|
exec_prefix_option_expanded=$prefix_option_expanded
|
|
else
|
|
exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
|
|
fi
|
|
libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
|
|
|
|
if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
|
|
gpgrt_libdir=$libdir_option_expanded
|
|
else
|
|
if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
|
|
if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
|
|
if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
|
|
gpgrt_libdir=$possible_libdir
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
|
|
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
|
if test "$GPGRT_CONFIG" = "no"; then
|
|
unset GPGRT_CONFIG
|
|
else
|
|
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
|
|
fi
|
|
else
|
|
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/'`
|
|
major=`echo $gpg_error_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
minor=`echo $gpg_error_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
|
if test "$major" -gt "$req_major"; then
|
|
ok=yes
|
|
else
|
|
if test "$major" -eq "$req_major"; then
|
|
if test "$minor" -ge "$req_minor"; then
|
|
ok=yes
|
|
fi
|
|
fi
|
|
fi
|
|
if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
|
|
if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
|
|
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
|
if test "$GPGRT_CONFIG" = "no"; then
|
|
unset GPGRT_CONFIG
|
|
else
|
|
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])
|
|
else
|
|
unset GPGRT_CONFIG
|
|
fi
|
|
fi
|
|
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 --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])
|
|
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
|
|
*** 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
|
|
*** to specify a matching config script or use \$SYSROOT.
|
|
***]])
|
|
gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
|
|
fi
|
|
fi
|
|
else
|
|
GPG_ERROR_CFLAGS=""
|
|
GPG_ERROR_LIBS=""
|
|
GPG_ERROR_MT_CFLAGS=""
|
|
GPG_ERROR_MT_LIBS=""
|
|
AC_MSG_RESULT(no)
|
|
ifelse([$3], , :, [$3])
|
|
fi
|
|
AC_SUBST(GPG_ERROR_CFLAGS)
|
|
AC_SUBST(GPG_ERROR_LIBS)
|
|
AC_SUBST(GPG_ERROR_MT_CFLAGS)
|
|
AC_SUBST(GPG_ERROR_MT_LIBS)
|
|
])
|