|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
--- libksba-1.3.5/baconfigure.orig 2016-08-22 11:56:54.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
@@ -13852,155 +13852,9 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
# Checks for libraries.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
#
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- gpg_error_config_prefix=""
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
+#Overcomplicated and useless check for gpg-error, use CFLAGS and LDFLAGS! >:(
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
+ GPG_ERROR_LIBS="-lgpg-error"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-# Check whether --with-libgpg-error-prefix was given.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-if test "${with_libgpg_error_prefix+set}" = set; then :
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-# Check whether --with-gpg-error-prefix was given.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-if test "${with_gpg_error_prefix+set}" = set; then :
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test x"${GPG_ERROR_CONFIG}" = x ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test x"${gpg_error_config_prefix}" != x ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- case "${SYSROOT}" in
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- /*)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ;;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- '')
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ;;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- *)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ;;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- esac
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-set dummy gpg-error-config; ac_word=$2
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then :
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- $as_echo_n "(cached) " >&6
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- case $GPG_ERROR_CONFIG in
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- [\\/]* | ?:[\\/]*)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ;;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- *)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-for as_dir in $PATH
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-do
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- IFS=$as_save_IFS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- test -z "$as_dir" && as_dir=.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- break 2
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-done
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- done
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-IFS=$as_save_IFS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ;;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-esac
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-if test -n "$GPG_ERROR_CONFIG"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "$GPG_ERROR_CONFIG" >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- min_gpg_error_version="$NEED_GPG_ERROR_VERSION"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ok=no
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test "$GPG_ERROR_CONFIG" != "no" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- && test -f "$GPG_ERROR_CONFIG" ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- req_major=`echo $min_gpg_error_version | \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- req_minor=`echo $min_gpg_error_version | \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- major=`echo $gpg_error_config_version | \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- minor=`echo $gpg_error_config_version | \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test "$major" -gt "$req_major"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ok=yes
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test "$major" -eq "$req_major"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test "$minor" -ge "$req_minor"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- ok=yes
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test $ok = yes; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "yes ($gpg_error_config_version)" >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- :
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test x"$gpg_error_config_host" != xnone ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- if test x"$gpg_error_config_host" != x"$host" ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-***
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** The config script $GPG_ERROR_CONFIG was
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** built for $gpg_error_config_host and thus may not match the
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** used host $host.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** You may want to use the configure option --with-gpg-error-prefix
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** to specify a matching config script or use \$SYSROOT.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-***" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "$as_me: WARNING:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-***
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** The config script $GPG_ERROR_CONFIG was
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** built for $gpg_error_config_host and thus may not match the
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** used host $host.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** You may want to use the configure option --with-gpg-error-prefix
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-*** to specify a matching config script or use \$SYSROOT.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-***" >&2;}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_CFLAGS=""
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_LIBS=""
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_MT_CFLAGS=""
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- GPG_ERROR_MT_LIBS=""
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- :
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-if test "x$GPG_ERROR_LIBS" = "x"; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- as_fn_error $? "libgpg-error is needed.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
- See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
79884d |
$as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KSBA" >>confdefs.h
|