| |
| |
| @@ -13068,6 +13068,10 @@ |
| PRINTABLE_OS_NAME="GNU/Linux" |
| ;; |
| |
| + *-midipix*) |
| + PRINTABLE_OS_NAME="Midipix" |
| + ;; |
| + |
| *) |
| PRINTABLE_OS_NAME=`uname -s || echo "Unknown"` |
| ;; |
| @@ -14141,155 +14145,7 @@ |
| # gpg-error is required. |
| # |
| |
| - gpg_error_config_prefix="" |
| - |
| -# Check whether --with-libgpg-error-prefix was given. |
| -if test "${with_libgpg_error_prefix+set}" = set; then : |
| - withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval" |
| -fi |
| - |
| - |
| - |
| -# Check whether --with-gpg-error-prefix was given. |
| -if test "${with_gpg_error_prefix+set}" = set; then : |
| - withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval" |
| -fi |
| - |
| - |
| - 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 |
| - ;; |
| - '') |
| - ;; |
| - *) |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 |
| -$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} |
| - ;; |
| - esac |
| - fi |
| - fi |
| - |
| - # Extract the first word of "gpg-error-config", so it can be a program name with args. |
| -set dummy gpg-error-config; ac_word=$2 |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| -$as_echo_n "checking for $ac_word... " >&6; } |
| -if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then : |
| - $as_echo_n "(cached) " >&6 |
| -else |
| - case $GPG_ERROR_CONFIG in |
| - [\\/]* | ?:[\\/]*) |
| - ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path. |
| - ;; |
| - *) |
| - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| -for as_dir in $PATH |
| -do |
| - IFS=$as_save_IFS |
| - test -z "$as_dir" && as_dir=. |
| - for ac_exec_ext in '' $ac_executable_extensions; do |
| - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| - ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| - break 2 |
| - fi |
| -done |
| - done |
| -IFS=$as_save_IFS |
| - |
| - test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no" |
| - ;; |
| -esac |
| -fi |
| -GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG |
| -if test -n "$GPG_ERROR_CONFIG"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5 |
| -$as_echo "$GPG_ERROR_CONFIG" >&6; } |
| -else |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| -$as_echo "no" >&6; } |
| -fi |
| - |
| - |
| - min_gpg_error_version="$NEED_GPG_ERROR_VERSION" |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5 |
| -$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; } |
| - ok=no |
| - if test "$GPG_ERROR_CONFIG" != "no" \ |
| - && test -f "$GPG_ERROR_CONFIG" ; 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 | \ |
| - 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 |
| - 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` |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5 |
| -$as_echo "yes ($gpg_error_config_version)" >&6; } |
| - : |
| - gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` |
| - if test x"$gpg_error_config_host" != xnone ; then |
| - if test x"$gpg_error_config_host" != x"$host" ; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
| -*** |
| -*** 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 |
| -*** to specify a matching config script or use \$SYSROOT. |
| -***" >&5 |
| -$as_echo "$as_me: WARNING: |
| -*** |
| -*** 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 |
| -*** to specify a matching config script or use \$SYSROOT. |
| -***" >&2;} |
| - 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="" |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| -$as_echo "no" >&6; } |
| - : |
| - fi |
| - |
| - |
| - |
| - |
| - |
| -if test "x$GPG_ERROR_LIBS" = "x"; then |
| - as_fn_error $? "libgpg-error is needed. |
| - See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5 |
| -fi |
| + GPG_ERROR_LIBS="-lgpg-error" |
| |
| |
| $as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT" >>confdefs.h |