No OneTemporary
Actions

Size

25 KB

Subscribers

None

View Options

	diff --git a/autogen.sh b/autogen.sh
	index 0b08e8b..71f89e2 100755
	--- a/autogen.sh
	+++ b/autogen.sh
	@@ -1,544 +1,547 @@
	#! /bin/sh
	# autogen.sh
	# Copyright (C) 2003, 2014, 2017, 2018, 2022 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 program 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.
	#
	# This is a generic script to create the configure script and handle cross
	# build environments. It requires the presence of a autogen.rc file to
	# configure it for the respective package. It is maintained as part of
	# GnuPG and source copied by other packages.
	#
	-# Version: 2024-12-03
	+# Version: 2025-09-23

	configure_ac="configure.ac"

	cvtver () {
	awk 'NR==1 {split($NF,A,".");X=1000000A[1]+1000A[2]+A[3];print X;exit 0}'
	}

	check_version () {
	if [ $(( `("$1" --version \|\| echo "0") \| cvtver` >= $2 )) = 1 ]; then
	return 0
	fi
	echo "Error: "\`$1\'" not installed or too old." >&2
	echo ' Version '$3' or newer is required.' >&2
	[ -n "$4" ] && echo ' Note that this is part of '\`$4\''.' >&2
	DIE="yes"
	return 1
	}

	fatal () {
	echo "autogen.sh:" "$*" >&2
	DIE=yes
	}

	info () {
	if [ -z "${SILENT}" ]; then
	echo "autogen.sh:" "$*" >&2
	fi
	}

	die_p () {
	if [ "$DIE" = "yes" ]; then
	echo "autogen.sh: Stop." >&2
	exit 1
	fi
	}

	replace_sysroot () {
	configure_opts=$(echo $configure_opts \| sed "s#@SYSROOT@#${w32root}#g")
	extraoptions=$(echo $extraoptions \| sed "s#@SYSROOT@#${w32root}#g")
	}

	# Allow to override the default tool names
	AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
	AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}

	AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
	ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}

	GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
	MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}

	DIE=no
	FORCE=
	SILENT=
	PRINT_HOST=no
	PRINT_BUILD=no
	PRINT_TSDIR=no
	tmp=$(dirname "$0")
	tsdir=$(cd "${tmp}"; pwd)

	if [ -n "${AUTOGEN_SH_SILENT}" ]; then
	SILENT=" --silent"
	fi
	if test x"$1" = x"--help"; then
	echo "usage: ./autogen.sh [OPTIONS] [ARGS]"
	echo " Options:"
	echo " --silent Silent operation"
	echo " --force Pass --force to autoconf"
	echo " --find-version Helper for configure.ac"
	echo " --git-build Run all commands to build from a Git"
	echo " --print-host Print only the host triplet"
	echo " --print-build Print only the build platform triplet"
	echo " --print-tsdir Print only the dir of this script"
	echo " --build-TYPE Configure to cross build for TYPE"
	echo ""
	echo " ARGS are passed to configure in --build-TYPE mode."
	echo " Configuration for this script is expected in autogen.rc"
	exit 0
	fi
	if test x"$1" = x"--silent"; then
	SILENT=" --silent"
	shift
	fi
	if test x"$1" = x"--force"; then
	FORCE=" --force"
	shift
	fi
	if test x"$1" = x"--print-host"; then
	PRINT_HOST=yes
	shift
	fi
	if test x"$1" = x"--print-build"; then
	PRINT_BUILD=yes
	shift
	fi


	# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces
	# as unsafe because it is too easy to get scripts wrong in this regard.
	am_lf='
	'
	case `pwd` in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe working directory name" ;;
	esac
	case $tsdir in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe source directory: \`$tsdir'" ;;
	esac
	case $HOME in
	[\;\\\"\#\$\&\'\`$am_lf\ \ ])
	fatal "unsafe home directory: \`$HOME'" ;;
	esac
	die_p


	# List of variables sourced from autogen.rc. The strings '@SYSROOT@' in
	# these variables are replaced by the actual system root.
	configure_opts=
	extraoptions=
	# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
	maintainer_mode_option=
	w32_toolprefixes=
	w32_extraoptions=
	w64_toolprefixes=
	w64_extraoptions=
	amd64_toolprefixes=
	disable_gettext_checks=
	# End list of optional variables sourced from ~/.gnupg-autogen.rc
	# What follows are variables which are sourced but default to
	# environment variables or lacking them hardcoded values.
	#w32root=
	#w64root=
	#amd64root=

	# Convenience option to use certain configure options for some hosts.
	myhost=""
	myhostsub=""
	case "$1" in
	--find-version)
	myhost="find-version"
	SILENT=" --silent"
	shift
	;;
	--print-tsdir)
	myhost="print-tsdir"
	SILENT=" --silent"
	shift
	;;
	--git-build)
	myhost="git-build"
	shift
	;;
	--build-w32)
	myhost="w32"
	shift
	;;
	--build-w64)
	myhost="w32"
	myhostsub="64"
	shift
	;;
	--build-amd64)
	myhost="amd64"
	shift
	;;
	--build*)
	fatal "Error: invalid build option $1"
	shift
	;;
	*)
	;;
	esac
	die_p


	# ** GIT BUILD **
	# This is a helper to build from git.
	if [ "$myhost" = "git-build" ]; then
	tmp="$(pwd)"
	cd "$tsdir" \|\| fatal "error cd-ing to $tsdir"
	./autogen.sh \|\| fatal "error running ./autogen.sh"
	cd "$tmp" \|\| fatal "error cd-ing back to $tmp"
	die_p
	"$tsdir"/configure \|\| fatal "error running $tsdir/configure"
	die_p
	make \|\| fatal "error running make"
	die_p
	make check \|\| fatal "error running make check"
	die_p
	exit 0
	fi
	# ** end GIT BUILD **


	# Source our configuration
	if [ -f "${tsdir}/autogen.rc" ]; then
	. "${tsdir}/autogen.rc"
	fi

	# Source optional site specific configuration
	if [ -f "$HOME/.gnupg-autogen.rc" ]; then
	info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
	. "$HOME/.gnupg-autogen.rc"
	fi

	# Disable the --enable-maintainer_mode option.
	if [ "${maintainer_mode_option}" = off ]; then
	maintainer_mode_option=
	elif [ -z "${maintainer_mode_option}" ]; then
	maintainer_mode_option=--enable-maintainer-mode
	fi

	# ** FIND VERSION **
	# This is a helper for the configure.ac M4 magic
	# Called
	# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]
	# returns a complete version string with automatic beta numbering.
	if [ "$myhost" = "find-version" ]; then
	package="$1"
	major="$2"
	minor="$3"
	micro="$4"

	if [ -z "$package" -o -z "$major" -o -z "$minor" ]; then
	echo "usage: ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]" >&2
	exit 1
	fi

	if [ -z "$micro" ]; then
	matchstr1="$package-$major.[0-9]*"
	matchstr2="$package-$major-base"
	matchstr3=""
	vers="$major.$minor"
	else
	matchstr1="$package-$major.$minor.[0-9]*"
	matchstr2="$package-$major.[0-9]*-base"
	matchstr3="$package-$major-base"
	vers="$major.$minor.$micro"
	fi
	+ matchexcl="--exclude $package-beta"

	beta=no
	if [ -e .git ]; then
	ingit=yes
	- tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
	+ tmp=$(git describe --match "${matchstr1}" $matchexcl --long 2>/dev/null)
	if [ -n "$tmp" ]; then
	tmp=$(echo "$tmp" \| sed s/^"$package"// \
	\| awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
	else
	# (due tof "-base" in the tag we need to take the 4th field)
	- tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null)
	+ tmp=$(git describe --match "${matchstr2}" $matchexcl --long 2>/dev/null)
	if [ -n "$tmp" ]; then
	tmp=$(echo "$tmp" \| sed s/^"$package"// \
	\| awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}')
	elif [ -n "${matchstr3}" ]; then
	- tmp=$(git describe --match "${matchstr3}" --long 2>/dev/null)
	+ tmp=$(git describe --match "${matchstr3}" $matchexcl --long 2>/dev/null)
	if [ -n "$tmp" ]; then
	tmp=$(echo "$tmp" \| sed s/^"$package"// \
	\| awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}')
	fi
	fi
	fi
	[ -n "$tmp" ] && beta=yes
	cid=$(git rev-parse --verify HEAD \| tr -d '\n\r')
	rev=$(git rev-parse --short HEAD \| tr -d '\n\r')
	rvd=$((0x$(echo ${rev} \| dd bs=1 count=4 2>/dev/null)))
	else
	ingit=no
	beta=yes
	tmp="-unknown"
	cid="0000000"
	rev="0000000"
	rvd="0"
	fi

	echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:$cid:"
	exit 0
	fi
	# ** end FIND VERSION **

	# ** PRINT TSDIR VERSION **
	# This is a helper used by some configure.ac M4 magic
	if [ "$myhost" = "print-tsdir" ]; then
	echo "$tsdir"
	exit 0
	fi
	# ** end PRINT TSDIR **


	if [ ! -f "$tsdir/build-aux/config.guess" ]; then
	fatal "$tsdir/build-aux/config.guess not found"
	exit 1
	fi
	build=`$tsdir/build-aux/config.guess`
	if [ $PRINT_BUILD = yes ]; then
	echo "$build"
	exit 0
	fi



	# ******************
	# W32 build script
	# ******************
	if [ "$myhost" = "w32" ]; then
	case $myhostsub in
	64)
	w32root="$w64root"
	[ -z "$w32root" ] && w32root="$HOME/w64root"
	toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
	extraoptions="$extraoptions $w64_extraoptions"
	;;
	*)
	[ -z "$w32root" ] && w32root="$HOME/w32root"
	toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
	toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
	extraoptions="$extraoptions $w32_extraoptions"
	;;
	esac
	w32root=$(echo "$w32root" \| sed s,^//,/,)
	info "Using $w32root as standard install directory"
	replace_sysroot

	# Locate the cross compiler
	crossbindir=
	for host in $toolprefixes; do
	if ${host}-gcc --version >/dev/null 2>&1 ; then
	crossbindir=/usr/${host}/bin
	conf_CC="CC=${host}-gcc"
	break;
	fi
	done
	if [ -z "$crossbindir" ]; then
	fatal "cross compiler kit not installed"
	if [ -z "$myhostsub" ]; then
	info "Under Debian GNU/Linux, you may install it using"
	info " apt-get install mingw32 mingw32-runtime mingw32-binutils"
	fi
	die_p
	fi
	if [ $PRINT_HOST = yes ]; then
	echo "$host"
	exit 0
	fi

	if [ -f "$tsdir/config.log" ]; then
	if ! head $tsdir/config.log \| grep "$host" >/dev/null; then
	fatal "Please run a 'make distclean' first"
	die_p
	fi
	fi

	$tsdir/configure "${maintainer_mode_option}" ${SILENT} \
	--prefix=${w32root} \
	--host=${host} --build=${build} SYSROOT=${w32root} \
	PKG_CONFIG_LIBDIR=${w32root}/lib/pkgconfig \
	${configure_opts} ${extraoptions} "$@"
	rc=$?
	exit $rc
	fi
	# *** end W32 build script *****

	# *** AMD64 cross build script *****
	# Used to cross-compile for AMD64 (for testing)
	if [ "$myhost" = "amd64" ]; then
	[ -z "$amd64root" ] && amd64root="$HOME/amd64root"
	info "Using $amd64root as standard install directory"
	replace_sysroot

	toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"

	# Locate the cross compiler
	crossbindir=
	for host in $toolprefixes ; do
	if ${host}-gcc --version >/dev/null 2>&1 ; then
	crossbindir=/usr/${host}/bin
	conf_CC="CC=${host}-gcc"
	break;
	fi
	done
	if [ -z "$crossbindir" ]; then
	echo "Cross compiler kit not installed" >&2
	echo "Stop." >&2
	exit 1
	fi
	if [ $PRINT_HOST = yes ]; then
	echo "$host"
	exit 0
	fi

	if [ -f "$tsdir/config.log" ]; then
	if ! head $tsdir/config.log \| grep "$host" >/dev/null; then
	echo "Please run a 'make distclean' first" >&2
	exit 1
	fi
	fi

	$tsdir/configure "${maintainer_mode_option}" ${SILENT} \
	--prefix=${amd64root} \
	--host=${host} --build=${build} \
	${configure_opts} ${extraoptions} "$@"
	rc=$?
	exit $rc
	fi
	# *** end AMD64 cross build script *****


	# Grep the required versions from configure.ac
	autoconf_vers=`sed -n '/^AC_PREREQ(/ {
	s/^.($.$)/\1/p
	q
	}' ${configure_ac}`
	autoconf_vers_num=`echo "$autoconf_vers" \| cvtver`

	automake_vers=`sed -n '/^min_automake_version=/ {
	s/^.="$.$"/\1/p
	q
	}' ${configure_ac}`
	automake_vers_num=`echo "$automake_vers" \| cvtver`

	gettext_vers="n/a"
	if [ -d "${tsdir}/po" ]; then
	gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
	s/^.\[$.$])/\1/p
	q
	}' ${configure_ac}`
	gettext_vers_num=`echo "$gettext_vers" \| cvtver`
	fi

	if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
	then
	echo "Error: version information not found in "\`${configure_ac}\'"." >&2
	exit 1
	fi


	if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
	check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
	fi
	if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
	check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
	fi
	if [ "$gettext_vers" != "n/a" ]; then
	if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
	check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
	fi
	fi

	if [ "$DIE" = "yes" ]; then
	cat <<EOF

	Note that you may use alternative versions of the tools by setting
	the corresponding environment variables; see README.GIT for details.

	EOF
	die_p
	fi

	# Check the git setup.
	if [ -d .git ]; then
	CP="cp -p"
	# If we have a GNU cp we can add -v
	if cp --version >/dev/null 2>/dev/null; then
	[ -z "${SILENT}" ] && CP="$CP -v"
	fi
	- if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
	+ if [ -f .git/hooks/pre-commit.sample ] \
	+ && [ ! -f .git/hooks/pre-commit ]; then
	[ -z "${SILENT}" ] && cat <<EOF
	* Activating trailing whitespace git pre-commit hook. *
	For more information see this thread:
	https://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
	To deactivate this pre-commit hook again move .git/hooks/pre-commit
	and .git/hooks/pre-commit.sample out of the way.
	EOF
	$CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
	chmod +x .git/hooks/pre-commit
	fi

	if [ "$gettext_vers" != "n/a" ]; then
	tmp=$(git config --get filter.cleanpo.clean)
	if [ "$tmp" != \
	"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
	then
	info "*** Adding GIT filter.cleanpo.clean configuration."
	git config --add filter.cleanpo.clean \
	"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
	fi
	fi
	- if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
	+ if [ -f build-aux/git-hooks/commit-msg ] \
	+ && [ ! -f .git/hooks/commit-msg ]; then
	[ -z "${SILENT}" ] && cat <<EOF
	* Activating commit log message check hook. *
	EOF
	$CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
	chmod +x .git/hooks/commit-msg
	if [ x"${display_name}" != x ]; then
	git config format.subjectPrefix "PATCH ${display_name}"
	git config sendemail.to "${patches_to}"
	fi
	fi
	fi

	aclocal_flags="-I m4"
	if [ -n "${extra_aclocal_flags}" ]; then
	aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
	fi
	if [ -n "${ACLOCAL_FLAGS}" ]; then
	aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
	fi

	automake_flags="--gnu"
	if [ -n "${extra_automake_flags}" ]; then
	automake_flags="${automake_flags} ${extra_automake_flags}"
	fi
	if [ -n "${AUTOMAKE_FLAGS}" ]; then
	automake_flags="${automake_flags} ${AUTOMAKE_FLAGS}"
	fi

	info "Running $ACLOCAL ${aclocal_flags} ..."
	$ACLOCAL ${aclocal_flags}
	info "Running autoheader..."
	$AUTOHEADER
	info "Running $AUTOMAKE ${automake_flags} ..."
	$AUTOMAKE ${automake_flags};
	info "Running autoconf${FORCE} ..."
	$AUTOCONF${FORCE}

	info "You may now run:${am_lf} ${final_info}"
	diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
	index 2d24071..73725c4 100644
	--- a/m4/gpg-error.m4
	+++ b/m4/gpg-error.m4
	@@ -1,234 +1,234 @@
	# gpg-error.m4 - autoconf macro to detect libgpg-error.
	# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 2022, 2024
	# 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: 2024-06-13

	dnl
	dnl Find gpg-error-config, for backward compatibility
	dnl
	dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG
	AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl
	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)
	])

	dnl
	dnl Find gpgrt-config, which uses .pc file
	dnl (minimum pkg-config functionality, supporting cross build)
	dnl
	dnl _AM_PATH_GPGRT_CONFIG
	AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
	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
	fi
	if test -z "$gpgrt_libdir"; then
	# No valid pkgconfig dir in any of the system directories, fallback
	gpgrt_libdir=${possible_libdir1}
	fi
	else
	unset GPGRT_CONFIG
	fi

	if test -n "$gpgrt_libdir"; then
	# Add the --libdir option to GPGRT_CONFIG
	GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
	# Make sure if gpgrt-config really works, by testing config gpg-error
	if ! $GPGRT_CONFIG gpg-error --exists; then
	# If it doesn't work, clear the GPGRT_CONFIG variable.
	unset GPGRT_CONFIG
	fi
	else
	# GPGRT_CONFIG found but no suitable dir for --libdir found.
	# This is a failure. Clear the GPGRT_CONFIG variable.
	unset GPGRT_CONFIG
	fi
	])

	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 requiring 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])dnl
	AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
	AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
	- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
	+ if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; 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`
	- elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
	+ elif test x"$GPG_ERROR_CONFIG" != x && test "$GPG_ERROR_CONFIG" != "no"; then
	gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
	else
	gpg_error_config_version="0.0"
	fi

	min_gpg_error_version=ifelse([$1], ,1.33,$1)
	ok=no
	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
	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)
	])

File Metadata

Mime Type: text/x-diff
Expires: Sat, Dec 6, 11:43 PM (1 d, 3 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: b9/0f/6a58ce701f7a999959c8622bdb33

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions