"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "m4/gpg-error.m4" between
libksba-1.5.1.tar.bz2 and libksba-1.6.0.tar.bz2

About: KSBA is a library to make the tasks of working with X.509 certificates, CMS data and related objects more easy.

gpg-error.m4  (libksba-1.5.1.tar.bz2):gpg-error.m4  (libksba-1.6.0.tar.bz2)
# gpg-error.m4 - autoconf macro to detect libgpg-error. # gpg-error.m4 - autoconf macro to detect libgpg-error.
# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 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 # This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# #
# This file is distributed in the hope that it will be useful, but # 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 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# Last-changed: 2020-11-17 # Last-changed: 2021-03-31
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl dnl
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, 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 GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
dnl used for programs requireing real multi thread support. dnl used for programs requireing real multi thread support.
dnl dnl
dnl If a prefix option is not used, the config script is first 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 searched in $SYSROOT/bin and then along $PATH. If the used
skipping to change at line 66 skipping to change at line 67
AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
;; ;;
esac esac
fi fi
fi fi
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,1.33,$1) min_gpg_error_version=ifelse([$1], ,1.33,$1)
ok=no ok=no
if test "$prefix" = NONE ; then AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
prefix_option_expanded=/usr/local if test "$GPGRT_CONFIG" != "no"; then
else # Determine gpgrt_libdir
prefix_option_expanded="$prefix" #
fi # Get the prefix of gpgrt-config assuming it's something like:
if test "$exec_prefix" = NONE ; then # <PREFIX>/bin/gpgrt-config
exec_prefix_option_expanded=$prefix_option_expanded gpgrt_prefix=${GPGRT_CONFIG%/*/*}
else possible_libdir1=${gpgrt_prefix}/lib
exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec # Determine by using system libdir-format with CC, it's like:
_prefix) # Normal style: /usr/lib
fi # GNU cross style: /usr/<triplet>/lib
libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_pref # Debian style: /usr/lib/<multiarch-name>
ix_option_expanded eval echo $libdir) # 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)
if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then for possible_libdir0 in $libdir_candidates; do
gpgrt_libdir=$libdir_option_expanded # possible_libdir0:
else # Fallback candidate, the one of system-installed (by $CC)
if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then # possible_libdir1:
if test -f $possible_libdir/pkgconfig/gpg-error.pc; then # Another candidate, user-locally-installed
gpgrt_libdir=$possible_libdir # (<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 fi
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 fi
else
unset GPGRT_CONFIG
fi fi
if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then if test -n "$gpgrt_libdir"; then
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
if test "$GPGRT_CONFIG" = "no"; then if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
unset GPGRT_CONFIG 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 else
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" unset GPGRT_CONFIG
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 fi
else elif test "$GPG_ERROR_CONFIG" != "no"; then
gpg_error_config_version=`$GPG_ERROR_CONFIG --version` gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
fi fi
if test "$GPG_ERROR_CONFIG" != "no"; then if test "$GPG_ERROR_CONFIG" != "no"; then
req_major=`echo $min_gpg_error_version | \ req_major=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \ req_minor=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
major=`echo $gpg_error_config_version | \ major=`echo $gpg_error_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $gpg_error_config_version | \ minor=`echo $gpg_error_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
if test "$major" -gt "$req_major"; then if test "$major" -gt "$req_major"; then
ok=yes ok=yes
else else
if test "$major" -eq "$req_major"; then if test "$major" -eq "$req_major"; then
if test "$minor" -ge "$req_minor"; then if test "$minor" -ge "$req_minor"; then
ok=yes ok=yes
fi fi
fi 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-conf
ig])
else
unset GPGRT_CONFIG
fi
fi
fi
fi
fi fi
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
if test $ok = yes; then if test $ok = yes; then
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
if test -z "$GPGRT_CONFIG"; then if test -z "$GPGRT_CONFIG"; then
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
else else
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
 End of changes. 10 change blocks. 
53 lines changed or deleted 69 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)