[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.8-1-359-gf99eb77

Ove Kaaven ovek at arcticnet.no
Sun Jan 4 12:10:57 UTC 2009


The following commit has been merged in the master branch:
commit 8c3a532cde9ebf7875e44559847578313fffe973
Merge: 23506e9af30d4dba1c8c8687be61b6d9a081be32 12c809056eafceb3c1ff85fe90b1400739ed00f1
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sun Jan 4 04:44:20 2009 +0100

    New upstream release 1.1.9, released Nov 21, 2008.
    - A large number of regression test fixes.
    - Performance improvements in memory management.
    - Improved POP3 support in inetcomm.
    - Initial implementation of the XInput DLL.
    - Various bug fixes.

diff --combined configure
index 21cd36f,b2e0470..b1abb82
--- a/configure
+++ b/configure
@@@ -1,11 -1,11 +1,11 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for Wine 1.1.8.
 -# Generated by GNU Autoconf 2.63 for Wine 1.1.9.
++# Generated by GNU Autoconf 2.61 for Wine 1.1.9.
  #
  # Report bugs to <wine-devel at winehq.org>.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
@@@ -17,7 -17,7 +17,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
@@@ -39,17 -39,45 +39,17 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
 -as_nl='
 -'
 -export as_nl
 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
 -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 -  as_echo='printf %s\n'
 -  as_echo_n='printf %s'
 -else
 -  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 -    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 -    as_echo_n='/usr/ucb/echo -n'
 -  else
 -    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 -    as_echo_n_body='eval
 -      arg=$1;
 -      case $arg in
 -      *"$as_nl"*)
 -	expr "X$arg" : "X\\(.*\\)$as_nl";
 -	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 -      esac;
 -      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 -    '
 -    export as_echo_n_body
 -    as_echo_n='sh -c $as_echo_n_body as_echo'
 -  fi
 -  export as_echo_body
 -  as_echo='sh -c $as_echo_body as_echo'
 -fi
 -
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
 -  PATH_SEPARATOR=:
 -  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 -    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 -      PATH_SEPARATOR=';'
 -  }
 +  echo "#! /bin/sh" >conf$$.sh
 +  echo  "exit 0"   >>conf$$.sh
 +  chmod +x conf$$.sh
 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 +    PATH_SEPARATOR=';'
 +  else
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
  fi
  
  # Support unset when possible.
@@@ -65,8 -93,6 +65,8 @@@ f
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
 +as_nl='
 +'
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@@ -89,7 -115,7 +89,7 @@@ if test "x$as_myself" = x; the
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
 -  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 +  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    { (exit 1); exit 1; }
  fi
  
@@@ -102,17 -128,10 +102,17 @@@ PS2='> 
  PS4='+ '
  
  # NLS nuisances.
 -LC_ALL=C
 -export LC_ALL
 -LANGUAGE=C
 -export LANGUAGE
 +for as_var in \
 +  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 +  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 +  LC_TELEPHONE LC_TIME
 +do
 +  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 +    eval $as_var=C; export $as_var
 +  else
 +    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +  fi
 +done
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -134,7 -153,7 +134,7 @@@ as_me=`$as_basename -- "$0" |
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 -$as_echo X/"$0" |
 +echo X/"$0" |
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
@@@ -160,7 -179,7 +160,7 @@@ els
    as_have_required=no
  fi
  
 -  if test $as_have_required = yes &&	 (eval ":
 +  if test $as_have_required = yes && 	 (eval ":
  (as_func_return () {
    (exit \$1)
  }
@@@ -242,7 -261,7 +242,7 @@@ IFS=$as_save_IF
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
@@@ -263,7 -282,7 +263,7 @@@ _ASEO
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
@@@ -343,10 -362,10 +343,10 @@@ f
  
        if test "x$CONFIG_SHELL" != x; then
    for as_var in BASH_ENV ENV
 -	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 -	done
 -	export CONFIG_SHELL
 -	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 +        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +        done
 +        export CONFIG_SHELL
 +        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  fi
  
  
@@@ -415,9 -434,10 +415,9 @@@ f
  
  test \$exitcode = 0") || {
    echo No shell found that supports shell functions.
 -  echo Please tell bug-autoconf at gnu.org about your system,
 -  echo including any error possibly output before this message.
 -  echo This can help us improve future autoconf versions.
 -  echo Configuration will now proceed without shell functions.
 +  echo Please tell autoconf at gnu.org about your system,
 +  echo including any error possibly output before this
 +  echo message
  }
  
  
@@@ -453,7 -473,7 +453,7 @@@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
 -    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 +    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
@@@ -481,7 -501,6 +481,7 @@@ case `echo -n x` i
  *)
    ECHO_N='-n';;
  esac
 +
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@@ -494,19 -513,22 +494,19 @@@ if test -d conf$$.dir; the
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
 -  mkdir conf$$.dir 2>/dev/null
 -fi
 -if (echo >conf$$.file) 2>/dev/null; then
 -  if ln -s conf$$.file conf$$ 2>/dev/null; then
 -    as_ln_s='ln -s'
 -    # ... but there are two gotchas:
 -    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 -    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 -    # In both cases, we have to default to `cp -p'.
 -    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 -      as_ln_s='cp -p'
 -  elif ln conf$$.file conf$$ 2>/dev/null; then
 -    as_ln_s=ln
 -  else
 +  mkdir conf$$.dir
 +fi
 +echo >conf$$.file
 +if ln -s conf$$.file conf$$ 2>/dev/null; then
 +  as_ln_s='ln -s'
 +  # ... but there are two gotchas:
 +  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +  # In both cases, we have to default to `cp -p'.
 +  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
      as_ln_s='cp -p'
 -  fi
 +elif ln conf$$.file conf$$ 2>/dev/null; then
 +  as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
@@@ -531,10 -553,10 +531,10 @@@ els
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
 -	test -d "$1/.";
 +        test -d "$1/.";
        else
  	case $1 in
 -	-*)set "./$1";;
 +        -*)set "./$1";;
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
@@@ -574,8 -596,8 +574,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
  # Identity of this package.
  PACKAGE_NAME='Wine'
  PACKAGE_TARNAME='wine'
- PACKAGE_VERSION='1.1.8'
- PACKAGE_STRING='Wine 1.1.8'
+ PACKAGE_VERSION='1.1.9'
+ PACKAGE_STRING='Wine 1.1.9'
  PACKAGE_BUGREPORT='wine-devel at winehq.org'
  
  ac_unique_file="server/atom.c"
@@@ -615,181 -637,223 +615,180 @@@ ac_includes_default="
  # include <unistd.h>
  #endif"
  
 -ac_subst_vars='LTLIBOBJS
 -LIBOBJS
 -ALL_WINETEST_DEPENDS
 -ALL_PROGRAM_BIN_INSTALL_DIRS
 -ALL_PROGRAM_INSTALL_DIRS
 -ALL_PROGRAM_DIRS
 -ALL_TEST_DIRS
 -ALL_IMPLIB_DIRS
 -ALL_DLL_DIRS
 -ALL_TOP_DIRS
 -ALL_MAKEFILE_DEPENDS
 -ALL_MAKEFILES
 -ALL_MAKERULES
 -DEPENDENCIES
 -LDAPLIBS
 -LIBPOLL
 -LIBDL
 -EXTRA_BINARIES
 -MAIN_BINARY
 -SOCKETLIBS
 -CRTLIBS
 -LDPATH
 -BUILTINFLAG
 -EXTRACFLAGS
 -FONTCONFIGINCL
 -CUPSINCL
 -AUDIOIOLIBS
 -ALSALIBS
 -ESDLIBS
 -ESDINCL
 -ESDCONFIG
 -FREETYPEINCL
 -FREETYPELIBS
 -ft_devel
 -LCMSLIBS
 -RESOLVLIBS
 -GPHOTO2INCL
 -GPHOTO2LIBS
 -gphoto2port_devel
 -gphoto2_devel
 -SANEINCL
 -sane_devel
 -GNUTLSINCL
 -HALINCL
 -XSLTINCL
 -XML2INCL
 -XML2LIBS
 -NASLIBS
 -CROSSTEST
 -CROSSWINDRES
 -CROSSCC
 -CARBONLIB
 -COREAUDIO
 -DISKARBITRATIONLIB
 -LDEXECFLAGS
 -IOKITLIB
 -COREFOUNDATIONLIB
 -SECURITYLIB
 -MINGWAR
 -DLLWRAP
 -DLLTOOL
 -LDD
 -LDRPATH_LOCAL
 -LDRPATH_INSTALL
 -IMPLIBEXT
 -LIBEXT
 -LDDLLFLAGS
 -LDSHARED
 -DLLFLAGS
 -DLLEXT
 -OPENGL_LIBS
 -XLIB
 -LIBPTHREAD
 -PRELINK
 -ICOTOOL
 -RSVG
 -PKG_CONFIG
 -FONTFORGE
 -LINTFLAGS
 -LINT
 -INSTALL_DATA
 -INSTALL_SCRIPT
 -INSTALL_PROGRAM
 -LDCONFIG
 -EGREP
 -GREP
 -LN
 -LN_S
 -WINDRES
 -STRIP
 -RANLIB
 -ARFLAGS
 -ac_ct_AR
 -AR
 -ac_ct_NM
 -NM
 -ac_ct_LD
 -LD
 -ac_ct_AS
 -AS
 -BISON
 -FLEX
 -X_EXTRA_LIBS
 -X_LIBS
 -X_PRE_LIBS
 -X_CFLAGS
 -CPP
 -XMKMF
 -TOOLSDIR
 -CPPBIN
 -ac_ct_CXX
 -CXXFLAGS
 -CXX
 -OBJEXT
 -EXEEXT
 -ac_ct_CC
 -CPPFLAGS
 -LDFLAGS
 -CFLAGS
 -CC
 -SET_MAKE
 -WIN16_INSTALL
 -WIN16_FILES
 -host_os
 -host_vendor
 -host_cpu
 -host
 -build_os
 -build_vendor
 -build_cpu
 -build
 -MAINTAINER_MODE
 -target_alias
 -host_alias
 -build_alias
 -LIBS
 -ECHO_T
 -ECHO_N
 -ECHO_C
 -DEFS
 -mandir
 -localedir
 -libdir
 -psdir
 -pdfdir
 -dvidir
 -htmldir
 -infodir
 -docdir
 -oldincludedir
 -includedir
 -localstatedir
 -sharedstatedir
 -sysconfdir
 -datadir
 -datarootdir
 -libexecdir
 -sbindir
 -bindir
 -program_transform_name
 -prefix
 -exec_prefix
 -PACKAGE_BUGREPORT
 -PACKAGE_STRING
 -PACKAGE_VERSION
 -PACKAGE_TARNAME
 -PACKAGE_NAME
 +ac_subst_vars='SHELL
  PATH_SEPARATOR
 -SHELL'
 +PACKAGE_NAME
 +PACKAGE_TARNAME
 +PACKAGE_VERSION
 +PACKAGE_STRING
 +PACKAGE_BUGREPORT
 +exec_prefix
 +prefix
 +program_transform_name
 +bindir
 +sbindir
 +libexecdir
 +datarootdir
 +datadir
 +sysconfdir
 +sharedstatedir
 +localstatedir
 +includedir
 +oldincludedir
 +docdir
 +infodir
 +htmldir
 +dvidir
 +pdfdir
 +psdir
 +libdir
 +localedir
 +mandir
 +DEFS
 +ECHO_C
 +ECHO_N
 +ECHO_T
 +LIBS
 +build_alias
 +host_alias
 +target_alias
 +MAINTAINER_MODE
 +build
 +build_cpu
 +build_vendor
 +build_os
 +host
 +host_cpu
 +host_vendor
 +host_os
 +WIN16_FILES
 +WIN16_INSTALL
 +SET_MAKE
 +CC
 +CFLAGS
 +LDFLAGS
 +CPPFLAGS
 +ac_ct_CC
 +EXEEXT
 +OBJEXT
 +CXX
 +CXXFLAGS
 +ac_ct_CXX
 +CPPBIN
 +TOOLSDIR
 +XMKMF
 +CPP
 +X_CFLAGS
 +X_PRE_LIBS
 +X_LIBS
 +X_EXTRA_LIBS
 +FLEX
 +BISON
 +AS
 +ac_ct_AS
 +LD
 +ac_ct_LD
 +NM
 +ac_ct_NM
 +AR
 +ac_ct_AR
 +ARFLAGS
 +RANLIB
 +STRIP
 +WINDRES
 +LN_S
 +LN
 +GREP
 +EGREP
 +LDCONFIG
 +INSTALL_PROGRAM
 +INSTALL_SCRIPT
 +INSTALL_DATA
 +LINT
 +LINTFLAGS
 +FONTFORGE
 +PKG_CONFIG
 +RSVG
 +ICOTOOL
 +PRELINK
 +LIBPTHREAD
 +XLIB
 +OPENGL_LIBS
 +DLLEXT
 +DLLFLAGS
 +LDSHARED
 +LDDLLFLAGS
 +LIBEXT
 +IMPLIBEXT
 +LDRPATH_INSTALL
 +LDRPATH_LOCAL
 +LDD
 +DLLTOOL
 +DLLWRAP
 +MINGWAR
 +SECURITYLIB
 +COREFOUNDATIONLIB
 +IOKITLIB
 +LDEXECFLAGS
 +DISKARBITRATIONLIB
 +COREAUDIO
 +CARBONLIB
 +CROSSCC
 +CROSSWINDRES
 +CROSSTEST
 +NASLIBS
 +XML2LIBS
 +XML2INCL
- XSLTLIBS
 +XSLTINCL
 +HALINCL
 +GNUTLSINCL
 +sane_devel
 +SANEINCL
 +gphoto2_devel
 +gphoto2port_devel
 +GPHOTO2LIBS
 +GPHOTO2INCL
 +RESOLVLIBS
 +LCMSLIBS
 +ft_devel
 +FREETYPELIBS
 +FREETYPEINCL
 +ESDCONFIG
 +ESDINCL
 +ESDLIBS
 +ALSALIBS
 +AUDIOIOLIBS
 +CUPSINCL
 +FONTCONFIGINCL
 +EXTRACFLAGS
 +BUILTINFLAG
 +LDPATH
 +CRTLIBS
 +SOCKETLIBS
 +MAIN_BINARY
 +EXTRA_BINARIES
 +LIBDL
 +LIBPOLL
 +LDAPLIBS
 +DEPENDENCIES
 +ALL_MAKERULES
 +ALL_MAKEFILES
 +ALL_MAKEFILE_DEPENDS
 +ALL_TOP_DIRS
 +ALL_DLL_DIRS
 +ALL_IMPLIB_DIRS
 +ALL_TEST_DIRS
 +ALL_PROGRAM_DIRS
 +ALL_PROGRAM_INSTALL_DIRS
 +ALL_PROGRAM_BIN_INSTALL_DIRS
 +ALL_WINETEST_DEPENDS
 +LIBOBJS
 +LTLIBOBJS'
  ac_subst_files='MAKE_RULES
  MAKE_DLL_RULES
  MAKE_IMPLIB_RULES
  MAKE_TEST_RULES
  MAKE_PROG_RULES'
 -ac_user_opts='
 -enable_option_checking
 -enable_win16
 -enable_win64
 -enable_tests
 -enable_maintainer_mode
 -with_alsa
 -with_audioio
 -with_capi
 -with_cms
 -with_coreaudio
 -with_cups
 -with_curses
 -with_esd
 -with_fontconfig
 -with_freetype
 -with_gphoto
 -with_glu
 -with_gnutls
 -with_hal
 -with_jack
 -with_jpeg
 -with_ldap
 -with_nas
 -with_opengl
 -with_openssl
 -with_oss
 -with_png
 -with_sane
 -with_xcomposite
 -with_xcursor
 -with_xinerama
 -with_xinput
 -with_xml
 -with_xrandr
 -with_xrender
 -with_xshape
 -with_xshm
 -with_xslt
 -with_xxf86vm
 -with_wine_tools
 -with_x
 -'
        ac_precious_vars='build_alias
  host_alias
  target_alias
@@@ -808,6 -872,8 +807,6 @@@ CPP
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
 -ac_unrecognized_opts=
 -ac_unrecognized_sep=
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
@@@ -906,13 -972,21 +905,13 @@@ d
      datarootdir=$ac_optarg ;;
  
    -disable-* | --disable-*)
 -    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 +    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 -      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
 +    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
 -    ac_useropt_orig=$ac_useropt
 -    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 -    case $ac_user_opts in
 -      *"
 -"enable_$ac_useropt"
 -"*) ;;
 -      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 -	 ac_unrecognized_sep=', ';;
 -    esac
 -    eval enable_$ac_useropt=no ;;
 +    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=no ;;
  
    -docdir | --docdir | --docdi | --doc | --do)
      ac_prev=docdir ;;
@@@ -925,13 -999,21 +924,13 @@@
      dvidir=$ac_optarg ;;
  
    -enable-* | --enable-*)
 -    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 +    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 -      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
 +    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
 -    ac_useropt_orig=$ac_useropt
 -    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 -    case $ac_user_opts in
 -      *"
 -"enable_$ac_useropt"
 -"*) ;;
 -      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 -	 ac_unrecognized_sep=', ';;
 -    esac
 -    eval enable_$ac_useropt=\$ac_optarg ;;
 +    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@@ -1122,22 -1204,38 +1121,22 @@@
      ac_init_version=: ;;
  
    -with-* | --with-*)
 -    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 +    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 -      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
 +    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
 -    ac_useropt_orig=$ac_useropt
 -    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 -    case $ac_user_opts in
 -      *"
 -"with_$ac_useropt"
 -"*) ;;
 -      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 -	 ac_unrecognized_sep=', ';;
 -    esac
 -    eval with_$ac_useropt=\$ac_optarg ;;
 +    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=\$ac_optarg ;;
  
    -without-* | --without-*)
 -    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 +    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 -      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
 +    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
 -    ac_useropt_orig=$ac_useropt
 -    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 -    case $ac_user_opts in
 -      *"
 -"with_$ac_useropt"
 -"*) ;;
 -      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 -	 ac_unrecognized_sep=', ';;
 -    esac
 -    eval with_$ac_useropt=no ;;
 +    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=no ;;
  
    --x)
      # Obsolete; use --with-x.
@@@ -1157,7 -1255,7 +1156,7 @@@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
 -  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 +  -*) { echo "$as_me: error: unrecognized option: $ac_option
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
@@@ -1166,16 -1264,16 +1165,16 @@@
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
 -      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
 +      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
    *)
      # FIXME: should be removed in autoconf 3.0.
 -    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 +    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 -      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 +      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
  
@@@ -1184,22 -1282,38 +1183,22 @@@ don
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 -  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
 +  { echo "$as_me: error: missing argument to $ac_option" >&2
     { (exit 1); exit 1; }; }
  fi
  
 -if test -n "$ac_unrecognized_opts"; then
 -  case $enable_option_checking in
 -    no) ;;
 -    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
 -   { (exit 1); exit 1; }; } ;;
 -    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 -  esac
 -fi
 -
 -# Check all directory arguments for consistency.
 +# Be sure to have absolute directory names.
  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
  		datadir sysconfdir sharedstatedir localstatedir includedir \
  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
  		libdir localedir mandir
  do
    eval ac_val=\$$ac_var
 -  # Remove trailing slashes.
 -  case $ac_val in
 -    */ )
 -      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
 -      eval $ac_var=\$ac_val;;
 -  esac
 -  # Be sure to have absolute directory names.
    case $ac_val in
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
 -  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 +  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     { (exit 1); exit 1; }; }
  done
  
@@@ -1214,7 -1328,7 +1213,7 @@@ target=$target_alia
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
 -    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
 +    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
@@@ -1230,10 -1344,10 +1229,10 @@@ test "$silent" = yes && exec 6>/dev/nul
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
 -  { $as_echo "$as_me: error: working directory cannot be determined" >&2
 +  { echo "$as_me: error: Working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 -  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
 +  { echo "$as_me: error: pwd does not report name of working directory" >&2
     { (exit 1); exit 1; }; }
  
  
@@@ -1241,12 -1355,12 +1240,12 @@@
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then the parent directory.
 -  ac_confdir=`$as_dirname -- "$as_myself" ||
 -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -	 X"$as_myself" : 'X\(//\)[^/]' \| \
 -	 X"$as_myself" : 'X\(//\)$' \| \
 -	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 -$as_echo X"$as_myself" |
 +  ac_confdir=`$as_dirname -- "$0" ||
 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$0" : 'X\(//\)[^/]' \| \
 +	 X"$0" : 'X\(//\)$' \| \
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 +echo X"$0" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -1273,12 -1387,12 +1272,12 @@@ els
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 -  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
 +  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
 -	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
 +	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
     { (exit 1); exit 1; }; }
  	pwd)`
  # When building in place, set srcdir=.
@@@ -1305,7 -1419,7 +1304,7 @@@ if test "$ac_init_help" = "long"; the
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
- \`configure' configures Wine 1.1.8 to adapt to many kinds of systems.
+ \`configure' configures Wine 1.1.9 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@@ -1327,9 -1441,9 +1326,9 @@@ Configuration
  
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
 -                          [$ac_default_prefix]
 +			  [$ac_default_prefix]
    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
 -                          [PREFIX]
 +			  [PREFIX]
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@@ -1339,25 -1453,25 +1338,25 @@@ for instance \`--prefix=\$HOME'
  For better control, use the options below.
  
  Fine tuning of the installation directories:
 -  --bindir=DIR            user executables [EPREFIX/bin]
 -  --sbindir=DIR           system admin executables [EPREFIX/sbin]
 -  --libexecdir=DIR        program executables [EPREFIX/libexec]
 -  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
 -  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
 -  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
 -  --libdir=DIR            object code libraries [EPREFIX/lib]
 -  --includedir=DIR        C header files [PREFIX/include]
 -  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
 -  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
 -  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
 -  --infodir=DIR           info documentation [DATAROOTDIR/info]
 -  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 -  --mandir=DIR            man documentation [DATAROOTDIR/man]
 -  --docdir=DIR            documentation root [DATAROOTDIR/doc/wine]
 -  --htmldir=DIR           html documentation [DOCDIR]
 -  --dvidir=DIR            dvi documentation [DOCDIR]
 -  --pdfdir=DIR            pdf documentation [DOCDIR]
 -  --psdir=DIR             ps documentation [DOCDIR]
 +  --bindir=DIR           user executables [EPREFIX/bin]
 +  --sbindir=DIR          system admin executables [EPREFIX/sbin]
 +  --libexecdir=DIR       program executables [EPREFIX/libexec]
 +  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
 +  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
 +  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
 +  --libdir=DIR           object code libraries [EPREFIX/lib]
 +  --includedir=DIR       C header files [PREFIX/include]
 +  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
 +  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
 +  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
 +  --infodir=DIR          info documentation [DATAROOTDIR/info]
 +  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
 +  --mandir=DIR           man documentation [DATAROOTDIR/man]
 +  --docdir=DIR           documentation root [DATAROOTDIR/doc/wine]
 +  --htmldir=DIR          html documentation [DOCDIR]
 +  --dvidir=DIR           dvi documentation [DOCDIR]
 +  --pdfdir=DIR           pdf documentation [DOCDIR]
 +  --psdir=DIR            ps documentation [DOCDIR]
  _ACEOF
  
    cat <<\_ACEOF
@@@ -1374,16 -1488,18 +1373,17 @@@ f
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of Wine 1.1.8:";;
+      short | recursive ) echo "Configuration of Wine 1.1.9:";;
     esac
    cat <<\_ACEOF
  
  Optional Features:
 -  --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --disable-win16         do not include Win16 support
    --enable-win64          build a Win64 emulator on AMD64 (won't run Win32
                            binaries)
+   --disable-tests         do not build the regression tests
    --enable-maintainer-mode
                            enable maintainer-specific build rules
  
@@@ -1451,15 -1567,17 +1451,15 @@@ f
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 -    test -d "$ac_dir" ||
 -      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
 -      continue
 +    test -d "$ac_dir" || continue
      ac_builddir=.
  
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
 -  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
    # A ".." for each directory in $ac_dir_suffix.
 -  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -1495,7 -1613,7 +1495,7 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
        echo &&
        $SHELL "$ac_srcdir/configure" --help=recursive
      else
 -      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 +      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi || ac_status=$?
      cd "$ac_pwd" || { ac_status=$?; break; }
    done
@@@ -1504,11 -1622,11 +1504,11 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- Wine configure 1.1.8
+ Wine configure 1.1.9
 -generated by GNU Autoconf 2.63
 +generated by GNU Autoconf 2.61
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -1518,8 -1636,8 +1518,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by Wine $as_me 1.1.8, which was
+ It was created by Wine $as_me 1.1.9, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
  
@@@ -1555,7 -1673,7 +1555,7 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  $as_echo "PATH: $as_dir"
 +  echo "PATH: $as_dir"
  done
  IFS=$as_save_IFS
  
@@@ -1590,7 -1708,7 +1590,7 @@@ d
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
      *\'*)
 -      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
      1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@@ -1642,11 -1760,12 +1642,11 @@@ _ASBO
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
 -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
 -      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
        *) $as_unset $ac_var ;;
        esac ;;
      esac
@@@ -1676,9 -1795,9 +1676,9 @@@ _ASBO
      do
        eval ac_val=\$$ac_var
        case $ac_val in
 -      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
 -      $as_echo "$ac_var='\''$ac_val'\''"
 +      echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
  
@@@ -1693,9 -1812,9 +1693,9 @@@ _ASBO
        do
  	eval ac_val=\$$ac_var
  	case $ac_val in
 -	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  	esac
 -	$as_echo "$ac_var='\''$ac_val'\''"
 +	echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
@@@ -1711,8 -1830,8 +1711,8 @@@ _ASBO
        echo
      fi
      test "$ac_signal" != 0 &&
 -      $as_echo "$as_me: caught signal $ac_signal"
 -    $as_echo "$as_me: exit $exit_status"
 +      echo "$as_me: caught signal $ac_signal"
 +    echo "$as_me: exit $exit_status"
    } >&5
    rm -f core *.core core.conftest.* &&
      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@@ -1754,21 -1873,24 +1754,21 @@@ _ACEO
  
  
  # Let the site file select an alternate cache file if it wants to.
 -# Prefer an explicitly selected file to automatically selected ones.
 -ac_site_file1=NONE
 -ac_site_file2=NONE
 +# Prefer explicitly selected file to automatically selected ones.
  if test -n "$CONFIG_SITE"; then
 -  ac_site_file1=$CONFIG_SITE
 +  set x "$CONFIG_SITE"
  elif test "x$prefix" != xNONE; then
 -  ac_site_file1=$prefix/share/config.site
 -  ac_site_file2=$prefix/etc/config.site
 +  set x "$prefix/share/config.site" "$prefix/etc/config.site"
  else
 -  ac_site_file1=$ac_default_prefix/share/config.site
 -  ac_site_file2=$ac_default_prefix/etc/config.site
 +  set x "$ac_default_prefix/share/config.site" \
 +	"$ac_default_prefix/etc/config.site"
  fi
 -for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 +shift
 +for ac_site_file
  do
 -  test "x$ac_site_file" = xNONE && continue
    if test -r "$ac_site_file"; then
 -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 -$as_echo "$as_me: loading site script $ac_site_file" >&6;}
 +    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 +echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
@@@ -1778,16 -1900,16 +1778,16 @@@ if test -r "$cache_file"; the
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
 -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
 -$as_echo "$as_me: loading cache $cache_file" >&6;}
 +    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 +echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
        *)                      . "./$cache_file";;
      esac
    fi
  else
 -  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
 -$as_echo "$as_me: creating cache $cache_file" >&6;}
 +  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
 +echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
  
@@@ -1801,29 -1923,38 +1801,29 @@@ for ac_var in $ac_precious_vars; d
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
 -      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 +      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
 -      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 +      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -	# differences in whitespace do not lead to failure.
 -	ac_old_val_w=`echo x $ac_old_val`
 -	ac_new_val_w=`echo x $ac_new_val`
 -	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 -	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 -	  ac_cache_corrupted=:
 -	else
 -	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 -	  eval $ac_var=\$ac_old_val
 -	fi
 -	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
 -$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 -	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
 -$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
 +	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 +	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 +echo "$as_me:   former value:  $ac_old_val" >&2;}
 +	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 +echo "$as_me:   current value: $ac_new_val" >&2;}
 +	ac_cache_corrupted=:
        fi;;
    esac
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
 -    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
@@@ -1833,10 -1964,12 +1833,10 @@@
    fi
  done
  if $ac_cache_corrupted; then
 -  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 -  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
 +  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 +echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 +  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
@@@ -1891,8 -2024,8 +1891,8 @@@ for ac_dir in tools "$srcdir"/tools; d
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tools \"$srcdir\"/tools" >&5
 -$as_echo "$as_me: error: cannot find install-sh or install.sh in tools \"$srcdir\"/tools" >&2;}
 +  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tools \"$srcdir\"/tools" >&5
 +echo "$as_me: error: cannot find install-sh or install.sh in tools \"$srcdir\"/tools" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
@@@ -1917,6 -2050,11 +1917,11 @@@ if test "${enable_win64+set}" = set; th
    enableval=$enable_win64;
  fi
  
+ # Check whether --enable-tests was given.
+ if test "${enable_tests+set}" = set; then
+   enableval=$enable_tests;
+ fi
+ 
  # Check whether --enable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
    enableval=$enable_maintainer_mode;
@@@ -2140,34 -2278,34 +2145,34 @@@ f
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 -  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
 +  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5
 -$as_echo_n "checking build system type... " >&6; }
 +{ echo "$as_me:$LINENO: checking build system type" >&5
 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
  if test "${ac_cv_build+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_build_alias=$build_alias
  test "x$ac_build_alias" = x &&
    ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
  test "x$ac_build_alias" = x &&
 -  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
 +  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 -  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
 +  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 -$as_echo "$ac_cv_build" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 +echo "${ECHO_T}$ac_cv_build" >&6; }
  case $ac_cv_build in
  *-*-*) ;;
 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
 -$as_echo "$as_me: error: invalid value of canonical build" >&2;}
 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
 +echo "$as_me: error: invalid value of canonical build" >&2;}
     { (exit 1); exit 1; }; };;
  esac
  build=$ac_cv_build
@@@ -2184,27 -2322,27 +2189,27 @@@ IFS=$ac_save_IF
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
 -{ $as_echo "$as_me:$LINENO: checking host system type" >&5
 -$as_echo_n "checking host system type... " >&6; }
 +{ echo "$as_me:$LINENO: checking host system type" >&5
 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
  if test "${ac_cv_host+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "x$host_alias" = x; then
    ac_cv_host=$ac_cv_build
  else
    ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
 -    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
 +    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 -$as_echo "$ac_cv_host" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 +echo "${ECHO_T}$ac_cv_host" >&6; }
  case $ac_cv_host in
  *-*-*) ;;
 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
 -$as_echo "$as_me: error: invalid value of canonical host" >&2;}
 +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
 +echo "$as_me: error: invalid value of canonical host" >&2;}
     { (exit 1); exit 1; }; };;
  esac
  host=$ac_cv_host
@@@ -2257,20 -2395,21 +2262,20 @@@ f
  case "$srcdir" in
   .) ;;
   *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then
 -      { { $as_echo "$as_me:$LINENO: error: you are building out of the source tree, but the source tree contains object files.
 +      { { echo "$as_me:$LINENO: error: you are building out of the source tree, but the source tree contains object files.
  You need to run 'make distclean' in the source tree first." >&5
 -$as_echo "$as_me: error: you are building out of the source tree, but the source tree contains object files.
 +echo "$as_me: error: you are building out of the source tree, but the source tree contains object files.
  You need to run 'make distclean' in the source tree first." >&2;}
     { (exit 1); exit 1; }; }
      fi ;;
  esac
  
  
 -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 -set x ${MAKE-make}
 -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
 +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
@@@ -2287,12 -2426,12 +2292,12 @@@ esa
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
    SET_MAKE=
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
@@@ -2304,10 -2443,10 +2309,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -2320,7 -2459,7 +2325,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2331,11 -2470,11 +2336,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 -$as_echo "$CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -2344,10 -2483,10 +2349,10 @@@ if test -z "$ac_cv_prog_CC"; the
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -2360,7 -2499,7 +2365,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2371,11 -2510,11 +2376,11 @@@ f
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -$as_echo "$ac_ct_CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_CC" = x; then
@@@ -2383,12 -2522,8 +2388,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
@@@ -2401,10 -2536,10 +2406,10 @@@ if test -z "$CC"; the
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -2417,7 -2552,7 +2422,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2428,11 -2563,11 +2433,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 -$as_echo "$CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -2441,10 -2576,10 +2446,10 @@@ f
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -2462,7 -2597,7 +2467,7 @@@ d
         continue
       fi
      ac_cv_prog_CC="cc"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2485,11 -2620,11 +2490,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 -$as_echo "$CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -2500,10 -2635,10 +2505,10 @@@ if test -z "$CC"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -2516,7 -2651,7 +2521,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2527,11 -2662,11 +2532,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 -$as_echo "$CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -2544,10 -2679,10 +2549,10 @@@ if test -z "$CC"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -2560,7 -2695,7 +2565,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2571,11 -2706,11 +2576,11 @@@ f
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -$as_echo "$ac_ct_CC" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -2587,12 -2722,8 +2592,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
@@@ -2602,44 -2733,50 +2607,44 @@@ f
  fi
  
  
 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 +echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +   { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
 -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
 -set X $ac_compile
 -ac_compiler=$2
 +echo "$as_me:$LINENO: checking for C compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
  { (ac_try="$ac_compiler --version >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -v >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler -v >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -V >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler -V >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
@@@ -2658,27 -2795,22 +2663,27 @@@ main (
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
 -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 -$as_echo_n "checking for C compiler default output file name... " >&6; }
 -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -
 -# The possible output files:
 -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 -
 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 +#
 +# List of possible output files, starting from the most likely.
 +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
 +# only as a last resort.  b.out is created by i960 compilers.
 +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
 +#
 +# The IRIX 6 linker writes into existing files which may not be
 +# executable, retaining their permissions.  Remove them first so a
 +# subsequent execution test works.
  ac_rmfiles=
  for ac_file in $ac_files
  do
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
    esac
  done
@@@ -2689,10 -2821,11 +2694,10 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@@ -2703,7 -2836,7 +2708,7 @@@ for ac_file in $ac_files '
  do
    test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
@@@ -2730,25 -2863,27 +2735,25 @@@ els
    ac_file=''
  fi
  
 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
 -$as_echo "$ac_file" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
 +echo "${ECHO_T}$ac_file" >&6; }
  if test -z "$ac_file"; then
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: C compiler cannot create executables
 +echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
 -   { (exit 77); exit 77; }; }; }
 +   { (exit 77); exit 77; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
  
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 -$as_echo_n "checking whether the C compiler works... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
@@@ -2757,49 -2892,53 +2762,49 @@@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
    else
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
 -	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 +	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: cannot run C compiled programs.
 +echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +   { (exit 1); exit 1; }; }
      fi
    fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
 +{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
 -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 -$as_echo_n "checking whether we are cross compiling... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
 -$as_echo "$cross_compiling" >&6; }
 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
 +echo "${ECHO_T}$cross_compiling" >&6; }
  
 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 -$as_echo_n "checking for suffix of executables... " >&6; }
 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@@ -2808,31 -2947,33 +2813,31 @@@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	  break;;
      * ) break;;
    esac
  done
  else
 -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 +  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +   { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 -$as_echo "$ac_cv_exeext" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
  
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
 -$as_echo_n "checking for suffix of object files... " >&6; }
 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
  if test "${ac_cv_objext+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -2855,40 -2996,43 +2860,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
  done
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +   { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 -$as_echo "$ac_cv_objext" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 +echo "${ECHO_T}$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -2914,20 -3058,21 +2919,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
@@@ -2937,15 -3082,19 +2942,15 @@@ rm -f core conftest.err conftest.$ac_ob
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 -if test $ac_compiler_gnu = yes; then
 -  GCC=yes
 -else
 -  GCC=
 -fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 +GCC=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
 -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 -$as_echo_n "checking whether $CC accepts -g... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
  if test "${ac_cv_prog_cc_g+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
@@@ -2972,20 -3121,21 +2977,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CFLAGS=""
@@@ -3010,20 -3160,21 +3015,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    :
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
@@@ -3049,20 -3200,21 +3054,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -3077,8 -3229,8 +3082,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 -$as_echo "$ac_cv_prog_cc_g" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
@@@ -3094,10 -3246,10 +3099,10 @@@ els
      CFLAGS=
    fi
  fi
 -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
  if test "${ac_cv_prog_cc_c89+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
@@@ -3168,20 -3320,21 +3173,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_c89=$ac_arg
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -3197,15 -3350,15 +3202,15 @@@ f
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
 -    { $as_echo "$as_me:$LINENO: result: none needed" >&5
 -$as_echo "none needed" >&6; } ;;
 +    { echo "$as_me:$LINENO: result: none needed" >&5
 +echo "${ECHO_T}none needed" >&6; } ;;
    xno)
 -    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
 -$as_echo "unsupported" >&6; } ;;
 +    { echo "$as_me:$LINENO: result: unsupported" >&5
 +echo "${ECHO_T}unsupported" >&6; } ;;
    *)
      CC="$CC $ac_cv_prog_cc_c89"
 -    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 +    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
  esac
  
  
@@@ -3229,10 -3382,10 +3234,10 @@@ if test -z "$CXX"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CXX+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@@ -3245,7 -3398,7 +3250,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3256,11 -3409,11 +3261,11 @@@ f
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
 -  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 -$as_echo "$CXX" >&6; }
 +  { echo "$as_me:$LINENO: result: $CXX" >&5
 +echo "${ECHO_T}$CXX" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -3273,10 -3426,10 +3278,10 @@@ if test -z "$CXX"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CXX"; then
    ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@@ -3289,7 -3442,7 +3294,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CXX="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3300,11 -3453,11 +3305,11 @@@ f
  fi
  ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  if test -n "$ac_ct_CXX"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 -$as_echo "$ac_ct_CXX" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 +echo "${ECHO_T}$ac_ct_CXX" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -3316,12 -3469,8 +3321,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CXX=$ac_ct_CXX
@@@ -3331,43 -3480,47 +3336,43 @@@ f
    fi
  fi
  # Provide some information about the compiler.
 -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 -set X $ac_compile
 -ac_compiler=$2
 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
  { (ac_try="$ac_compiler --version >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -v >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler -v >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  { (ac_try="$ac_compiler -V >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compiler -V >&5") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  
 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -3393,20 -3546,21 +3398,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
@@@ -3416,15 -3570,19 +3421,15 @@@ rm -f core conftest.err conftest.$ac_ob
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 -if test $ac_compiler_gnu = yes; then
 -  GXX=yes
 -else
 -  GXX=
 -fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
 +GXX=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
 -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 -$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
  if test "${ac_cv_prog_cxx_g+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
     ac_cxx_werror_flag=yes
@@@ -3451,20 -3609,21 +3456,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cxx_g=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CXXFLAGS=""
@@@ -3489,20 -3648,21 +3494,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    :
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@@ -3528,20 -3688,21 +3533,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cxx_g=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -3556,8 -3717,8 +3561,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 -$as_echo "$ac_cv_prog_cxx_g" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
@@@ -3582,10 -3743,10 +3587,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cpp; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CPPBIN+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CPPBIN"; then
    ac_cv_prog_CPPBIN="$CPPBIN" # Let the user override the test.
@@@ -3598,7 -3759,7 +3603,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CPPBIN="${ac_tool_prefix}cpp"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3609,11 -3770,11 +3614,11 @@@ f
  fi
  CPPBIN=$ac_cv_prog_CPPBIN
  if test -n "$CPPBIN"; then
 -  { $as_echo "$as_me:$LINENO: result: $CPPBIN" >&5
 -$as_echo "$CPPBIN" >&6; }
 +  { echo "$as_me:$LINENO: result: $CPPBIN" >&5
 +echo "${ECHO_T}$CPPBIN" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -3622,10 -3783,10 +3627,10 @@@ if test -z "$ac_cv_prog_CPPBIN"; the
    ac_ct_CPPBIN=$CPPBIN
    # Extract the first word of "cpp", so it can be a program name with args.
  set dummy cpp; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CPPBIN+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_CPPBIN"; then
    ac_cv_prog_ac_ct_CPPBIN="$ac_ct_CPPBIN" # Let the user override the test.
@@@ -3638,7 -3799,7 +3643,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CPPBIN="cpp"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3649,11 -3810,11 +3654,11 @@@ f
  fi
  ac_ct_CPPBIN=$ac_cv_prog_ac_ct_CPPBIN
  if test -n "$ac_ct_CPPBIN"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CPPBIN" >&5
 -$as_echo "$ac_ct_CPPBIN" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_CPPBIN" >&5
 +echo "${ECHO_T}$ac_ct_CPPBIN" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_CPPBIN" = x; then
@@@ -3661,12 -3822,8 +3666,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CPPBIN=$ac_ct_CPPBIN
@@@ -3676,15 -3833,15 +3681,15 @@@ els
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5
 -$as_echo_n "checking for the directory containing the Wine tools... " >&6; }
 +{ echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5
 +echo $ECHO_N "checking for the directory containing the Wine tools... $ECHO_C" >&6; }
  if test "${wine_cv_toolsdir+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -z "$with_wine_tools"; then
       if test "$cross_compiling" = "yes"; then
 -       { { $as_echo "$as_me:$LINENO: error: you must use the --with-wine-tools option when cross-compiling." >&5
 -$as_echo "$as_me: error: you must use the --with-wine-tools option when cross-compiling." >&2;}
 +       { { echo "$as_me:$LINENO: error: you must use the --with-wine-tools option when cross-compiling." >&5
 +echo "$as_me: error: you must use the --with-wine-tools option when cross-compiling." >&2;}
     { (exit 1); exit 1; }; }
       else
         wine_cv_toolsdir="\$(TOPOBJDIR)"
@@@ -3695,13 -3852,13 +3700,13 @@@
         *)  wine_cv_toolsdir="\$(TOPOBJDIR)/$with_wine_tools" ;;
       esac
     else
 -     { { $as_echo "$as_me:$LINENO: error: could not find Wine tools in $with_wine_tools." >&5
 -$as_echo "$as_me: error: could not find Wine tools in $with_wine_tools." >&2;}
 +     { { echo "$as_me:$LINENO: error: could not find Wine tools in $with_wine_tools." >&5
 +echo "$as_me: error: could not find Wine tools in $with_wine_tools." >&2;}
     { (exit 1); exit 1; }; }
     fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $wine_cv_toolsdir" >&5
 -$as_echo "$wine_cv_toolsdir" >&6; }
 +{ echo "$as_me:$LINENO: result: $wine_cv_toolsdir" >&5
 +echo "${ECHO_T}$wine_cv_toolsdir" >&6; }
  TOOLSDIR=$wine_cv_toolsdir
  
  
@@@ -3711,15 -3868,15 +3716,15 @@@ ac_cpp='$CPP $CPPFLAGS
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 -$as_echo_n "checking how to run the C preprocessor... " >&6; }
 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
    if test "${ac_cv_prog_CPP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@@ -3751,20 -3908,21 +3756,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    :
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
@@@ -3788,13 -3946,14 +3793,13 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -3802,7 -3961,7 +3807,7 @@@
    # Broken: success on invalid input.
  continue
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
@@@ -3827,8 -3986,8 +3832,8 @@@ f
  else
    ac_cv_prog_CPP=$CPP
  fi
 -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 -$as_echo "$CPP" >&6; }
 +{ echo "$as_me:$LINENO: result: $CPP" >&5
 +echo "${ECHO_T}$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
@@@ -3856,20 -4015,21 +3861,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    :
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
@@@ -3893,13 -4053,14 +3898,13 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -3907,7 -4068,7 +3912,7 @@@
    # Broken: success on invalid input.
  continue
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
@@@ -3923,11 -4084,13 +3928,11 @@@ rm -f conftest.err conftest.$ac_ex
  if $ac_preproc_ok; then
    :
  else
 -  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 +  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
 +   { (exit 1); exit 1; }; }
  fi
  
  ac_ext=c
@@@ -3937,8 -4100,8 +3942,8 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
 -{ $as_echo "$as_me:$LINENO: checking for X" >&5
 -$as_echo_n "checking for X... " >&6; }
 +{ echo "$as_me:$LINENO: checking for X" >&5
 +echo $ECHO_N "checking for X... $ECHO_C" >&6; }
  
  
  # Check whether --with-x was given.
@@@ -3952,11 -4115,11 +3957,11 @@@ if test "x$with_x" = xno; the
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
 -    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
 -$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
 +    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
 +echo "$as_me: error: Cannot use X directory names containing '" >&2;}
     { (exit 1); exit 1; }; };; #(
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    # One or both of the vars are not set, and there is no cached value.
  ac_x_includes=no ac_x_libraries=no
@@@ -3977,7 -4140,7 +3982,7 @@@ _ACEO
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
      # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
 -    for ac_extension in a so sl dylib la dll; do
 +    for ac_extension in a so sl; do
        if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
  	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
  	ac_im_usrlibdir=$ac_im_libdir; break
@@@ -3991,7 -4154,7 +3996,7 @@@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
 -	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 +	/usr/lib | /lib) ;;
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
@@@ -4052,13 -4215,14 +4057,13 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -4066,7 -4230,7 +4071,7 @@@
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    for ac_dir in $ac_x_header_dirs; do
@@@ -4107,30 -4271,33 +4112,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	LIBS=$ac_save_LIBS
 -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
  do
    # Don't even attempt the hair of trying to link an X program!
 -  for ac_extension in a so sl dylib la dll; do
 +  for ac_extension in a so sl; do
      if test -r "$ac_dir/libX11.$ac_extension"; then
        ac_x_libraries=$ac_dir
        break 2
@@@ -4139,6 -4306,7 +4144,6 @@@
  done
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = no
@@@ -4161,8 -4329,8 +4166,8 @@@ f
  fi # $with_x != no
  
  if test "$have_x" != yes; then
 -  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
 -$as_echo "$have_x" >&6; }
 +  { echo "$as_me:$LINENO: result: $have_x" >&5
 +echo "${ECHO_T}$have_x" >&6; }
    no_x=yes
  else
    # If each of the values was on the command line, it overrides each guess.
@@@ -4172,8 -4340,8 +4177,8 @@@
    ac_cv_have_x="have_x=yes\
  	ac_x_includes='$x_includes'\
  	ac_x_libraries='$x_libraries'"
 -  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 +  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
  fi
  
  if test "$no_x" = yes; then
@@@ -4194,8 -4362,8 +4199,8 @@@ els
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
 -    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 -$as_echo_n "checking whether -R must be followed by a space... " >&6; }
 +    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
      ac_xsave_c_werror_flag=$ac_c_werror_flag
      ac_c_werror_flag=yes
@@@ -4220,23 -4388,26 +4225,23 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
         X_LIBS="$X_LIBS -R$x_libraries"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
@@@ -4261,33 -4432,38 +4266,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  	  X_LIBS="$X_LIBS -R $x_libraries"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
 -$as_echo "neither works" >&6; }
 +	{ echo "$as_me:$LINENO: result: neither works" >&5
 +echo "${ECHO_T}neither works" >&6; }
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      ac_c_werror_flag=$ac_xsave_c_werror_flag
@@@ -4333,27 -4509,30 +4338,27 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    :
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
 +	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
@@@ -4385,41 -4564,45 +4390,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dnet_dnet_ntoa=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 -      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
 +      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
@@@ -4451,39 -4634,44 +4456,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
      fi
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
@@@ -4496,10 -4684,10 +4501,10 @@@
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
 -    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
 -$as_echo_n "checking for gethostbyname... " >&6; }
 +    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
  if test "${ac_cv_func_gethostbyname+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -4552,37 -4740,41 +4557,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_func_gethostbyname=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_gethostbyname=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
 -$as_echo "$ac_cv_func_gethostbyname" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
  
      if test $ac_cv_func_gethostbyname = no; then
 -      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 +      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
  if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
@@@ -4614,41 -4806,45 +4619,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_nsl_gethostbyname=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_nsl_gethostbyname=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
 +if test $ac_cv_lib_nsl_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
        if test $ac_cv_lib_nsl_gethostbyname = no; then
 -	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
 +	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
@@@ -4680,33 -4876,37 +4685,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_bsd_gethostbyname=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_bsd_gethostbyname=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
 +if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
@@@ -4720,10 -4920,10 +4725,10 @@@
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
 -    { $as_echo "$as_me:$LINENO: checking for connect" >&5
 -$as_echo_n "checking for connect... " >&6; }
 +    { echo "$as_me:$LINENO: checking for connect" >&5
 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
  if test "${ac_cv_func_connect+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -4776,37 -4976,41 +4781,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_func_connect=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_connect=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 -$as_echo "$ac_cv_func_connect" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 +echo "${ECHO_T}$ac_cv_func_connect" >&6; }
  
      if test $ac_cv_func_connect = no; then
 -      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 -$as_echo_n "checking for connect in -lsocket... " >&6; }
 +      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
  if test "${ac_cv_lib_socket_connect+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@@ -4838,43 -5042,47 +4843,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_socket_connect=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_socket_connect=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 -$as_echo "$ac_cv_lib_socket_connect" >&6; }
 -if test "x$ac_cv_lib_socket_connect" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
 +if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
 -    { $as_echo "$as_me:$LINENO: checking for remove" >&5
 -$as_echo_n "checking for remove... " >&6; }
 +    { echo "$as_me:$LINENO: checking for remove" >&5
 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
  if test "${ac_cv_func_remove+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -4927,37 -5135,41 +4932,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_func_remove=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_remove=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
 -$as_echo "$ac_cv_func_remove" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
 +echo "${ECHO_T}$ac_cv_func_remove" >&6; }
  
      if test $ac_cv_func_remove = no; then
 -      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
 -$as_echo_n "checking for remove in -lposix... " >&6; }
 +      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
  if test "${ac_cv_lib_posix_remove+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
@@@ -4989,43 -5201,47 +4994,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_posix_remove=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_posix_remove=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
 -$as_echo "$ac_cv_lib_posix_remove" >&6; }
 -if test "x$ac_cv_lib_posix_remove" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
 +if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 -    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
 -$as_echo_n "checking for shmat... " >&6; }
 +    { echo "$as_me:$LINENO: checking for shmat" >&5
 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
  if test "${ac_cv_func_shmat+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -5078,37 -5294,41 +5083,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_func_shmat=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_shmat=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
 -$as_echo "$ac_cv_func_shmat" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
  
      if test $ac_cv_func_shmat = no; then
 -      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
 -$as_echo_n "checking for shmat in -lipc... " >&6; }
 +      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
@@@ -5140,33 -5360,37 +5145,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_ipc_shmat=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_ipc_shmat=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
 +if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
@@@ -5182,10 -5406,10 +5187,10 @@@
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
 -  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
 +  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
@@@ -5217,33 -5441,37 +5222,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_ICE_IceConnectionNumber=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
@@@ -5256,10 -5484,10 +5261,10 @@@ for ac_prog in fle
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_FLEX+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$FLEX"; then
    ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
@@@ -5272,7 -5500,7 +5277,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_FLEX="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5283,11 -5511,11 +5288,11 @@@ f
  fi
  FLEX=$ac_cv_prog_FLEX
  if test -n "$FLEX"; then
 -  { $as_echo "$as_me:$LINENO: result: $FLEX" >&5
 -$as_echo "$FLEX" >&6; }
 +  { echo "$as_me:$LINENO: result: $FLEX" >&5
 +echo "${ECHO_T}$FLEX" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5297,8 -5525,8 +5302,8 @@@ test -n "$FLEX" || FLEX="none
  
  if test "$FLEX" = "none"
  then
 -  { { $as_echo "$as_me:$LINENO: error: no suitable flex found. Please install the 'flex' package." >&5
 -$as_echo "$as_me: error: no suitable flex found. Please install the 'flex' package." >&2;}
 +  { { echo "$as_me:$LINENO: error: no suitable flex found. Please install the 'flex' package." >&5
 +echo "$as_me: error: no suitable flex found. Please install the 'flex' package." >&2;}
     { (exit 1); exit 1; }; }
  fi
  
@@@ -5306,10 -5534,10 +5311,10 @@@ for ac_prog in biso
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_BISON+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$BISON"; then
    ac_cv_prog_BISON="$BISON" # Let the user override the test.
@@@ -5322,7 -5550,7 +5327,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_BISON="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5333,11 -5561,11 +5338,11 @@@ f
  fi
  BISON=$ac_cv_prog_BISON
  if test -n "$BISON"; then
 -  { $as_echo "$as_me:$LINENO: result: $BISON" >&5
 -$as_echo "$BISON" >&6; }
 +  { echo "$as_me:$LINENO: result: $BISON" >&5
 +echo "${ECHO_T}$BISON" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5347,8 -5575,8 +5352,8 @@@ test -n "$BISON" || BISON="none
  
  if test "$BISON" = "none"
  then
 -  { { $as_echo "$as_me:$LINENO: error: no suitable bison found. Please install the 'bison' package." >&5
 -$as_echo "$as_me: error: no suitable bison found. Please install the 'bison' package." >&2;}
 +  { { echo "$as_me:$LINENO: error: no suitable bison found. Please install the 'bison' package." >&5
 +echo "$as_me: error: no suitable bison found. Please install the 'bison' package." >&2;}
     { (exit 1); exit 1; }; }
  fi
  
@@@ -5357,10 -5585,10 +5362,10 @@@ if test -n "$ac_tool_prefix"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_AS+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$AS"; then
    ac_cv_prog_AS="$AS" # Let the user override the test.
@@@ -5373,7 -5601,7 +5378,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AS="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5384,11 -5612,11 +5389,11 @@@ f
  fi
  AS=$ac_cv_prog_AS
  if test -n "$AS"; then
 -  { $as_echo "$as_me:$LINENO: result: $AS" >&5
 -$as_echo "$AS" >&6; }
 +  { echo "$as_me:$LINENO: result: $AS" >&5
 +echo "${ECHO_T}$AS" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5401,10 -5629,10 +5406,10 @@@ if test -z "$AS"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_AS"; then
    ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
@@@ -5417,7 -5645,7 +5422,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AS="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5428,11 -5656,11 +5433,11 @@@ f
  fi
  ac_ct_AS=$ac_cv_prog_ac_ct_AS
  if test -n "$ac_ct_AS"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
 -$as_echo "$ac_ct_AS" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
 +echo "${ECHO_T}$ac_ct_AS" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5444,12 -5672,8 +5449,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      AS=$ac_ct_AS
@@@ -5461,10 -5685,10 +5466,10 @@@ if test -n "$ac_tool_prefix"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_LD+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$LD"; then
    ac_cv_prog_LD="$LD" # Let the user override the test.
@@@ -5477,7 -5701,7 +5482,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5488,11 -5712,11 +5493,11 @@@ f
  fi
  LD=$ac_cv_prog_LD
  if test -n "$LD"; then
 -  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 -$as_echo "$LD" >&6; }
 +  { echo "$as_me:$LINENO: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5505,10 -5729,10 +5510,10 @@@ if test -z "$LD"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_LD"; then
    ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
@@@ -5521,7 -5745,7 +5526,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_LD="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5532,11 -5756,11 +5537,11 @@@ f
  fi
  ac_ct_LD=$ac_cv_prog_ac_ct_LD
  if test -n "$ac_ct_LD"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
 -$as_echo "$ac_ct_LD" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
 +echo "${ECHO_T}$ac_ct_LD" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5548,12 -5772,8 +5553,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      LD=$ac_ct_LD
@@@ -5565,10 -5785,10 +5570,10 @@@ if test -n "$ac_tool_prefix"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_NM+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$NM"; then
    ac_cv_prog_NM="$NM" # Let the user override the test.
@@@ -5581,7 -5801,7 +5586,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5592,11 -5812,11 +5597,11 @@@ f
  fi
  NM=$ac_cv_prog_NM
  if test -n "$NM"; then
 -  { $as_echo "$as_me:$LINENO: result: $NM" >&5
 -$as_echo "$NM" >&6; }
 +  { echo "$as_me:$LINENO: result: $NM" >&5
 +echo "${ECHO_T}$NM" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5609,10 -5829,10 +5614,10 @@@ if test -z "$NM"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_NM"; then
    ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
@@@ -5625,7 -5845,7 +5630,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_NM="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5636,11 -5856,11 +5641,11 @@@ f
  fi
  ac_ct_NM=$ac_cv_prog_ac_ct_NM
  if test -n "$ac_ct_NM"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
 -$as_echo "$ac_ct_NM" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
 +echo "${ECHO_T}$ac_ct_NM" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5652,12 -5872,8 +5657,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      NM=$ac_ct_NM
@@@ -5669,10 -5885,10 +5674,10 @@@ if test -n "$ac_tool_prefix"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
@@@ -5685,7 -5901,7 +5690,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5696,11 -5912,11 +5701,11 @@@ f
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 -$as_echo "$AR" >&6; }
 +  { echo "$as_me:$LINENO: result: $AR" >&5
 +echo "${ECHO_T}$AR" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5713,10 -5929,10 +5718,10 @@@ if test -z "$AR"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_AR"; then
    ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@@ -5729,7 -5945,7 +5734,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AR="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5740,11 -5956,11 +5745,11 @@@ f
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 -$as_echo "$ac_ct_AR" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 +echo "${ECHO_T}$ac_ct_AR" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5756,12 -5972,8 +5761,12 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
@@@ -5773,10 -5985,10 +5778,10 @@@ ARFLAGS=r
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_RANLIB+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@@ -5789,7 -6001,7 +5794,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5800,11 -6012,11 +5805,11 @@@ f
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
 -$as_echo "$RANLIB" >&6; }
 +  { echo "$as_me:$LINENO: result: $RANLIB" >&5
 +echo "${ECHO_T}$RANLIB" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5813,10 -6025,10 +5818,10 @@@ if test -z "$ac_cv_prog_RANLIB"; the
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@@ -5829,7 -6041,7 +5834,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5840,11 -6052,11 +5845,11 @@@ f
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 -$as_echo "$ac_ct_RANLIB" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_RANLIB" = x; then
@@@ -5852,12 -6064,8 +5857,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      RANLIB=$ac_ct_RANLIB
@@@ -5869,10 -6077,10 +5874,10 @@@ f
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_STRIP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$STRIP"; then
    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@@ -5885,7 -6093,7 +5890,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5896,11 -6104,11 +5901,11 @@@ f
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
 -  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
 -$as_echo "$STRIP" >&6; }
 +  { echo "$as_me:$LINENO: result: $STRIP" >&5
 +echo "${ECHO_T}$STRIP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -5909,10 -6117,10 +5914,10 @@@ if test -z "$ac_cv_prog_STRIP"; the
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_STRIP"; then
    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@@ -5925,7 -6133,7 +5930,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5936,11 -6144,11 +5941,11 @@@ f
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 -$as_echo "$ac_ct_STRIP" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 +echo "${ECHO_T}$ac_ct_STRIP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_STRIP" = x; then
@@@ -5948,12 -6156,8 +5953,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      STRIP=$ac_ct_STRIP
@@@ -5965,10 -6169,10 +5970,10 @@@ f
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
  set dummy ${ac_tool_prefix}windres; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_WINDRES+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$WINDRES"; then
    ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@@ -5981,7 -6185,7 +5986,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5992,11 -6196,11 +5997,11 @@@ f
  fi
  WINDRES=$ac_cv_prog_WINDRES
  if test -n "$WINDRES"; then
 -  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
 -$as_echo "$WINDRES" >&6; }
 +  { echo "$as_me:$LINENO: result: $WINDRES" >&5
 +echo "${ECHO_T}$WINDRES" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6005,10 -6209,10 +6010,10 @@@ if test -z "$ac_cv_prog_WINDRES"; the
    ac_ct_WINDRES=$WINDRES
    # Extract the first word of "windres", so it can be a program name with args.
  set dummy windres; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_WINDRES"; then
    ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@@ -6021,7 -6225,7 +6026,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_WINDRES="windres"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6032,11 -6236,11 +6037,11 @@@ f
  fi
  ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
  if test -n "$ac_ct_WINDRES"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
 -$as_echo "$ac_ct_WINDRES" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
 +echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_WINDRES" = x; then
@@@ -6044,12 -6248,8 +6049,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      WINDRES=$ac_ct_WINDRES
@@@ -6058,69 -6258,64 +6063,69 @@@ els
    WINDRES="$ac_cv_prog_WINDRES"
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
 -$as_echo_n "checking whether ln -s works... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 -$as_echo "no, using $LN_S" >&6; }
 +  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 +echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking whether ln works" >&5
 -$as_echo_n "checking whether ln works... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether ln works" >&5
 +echo $ECHO_N "checking whether ln works... $ECHO_C" >&6; }
  rm -f conf$$ conf$$.file
  echo >conf$$.file
  if ln conf$$.file conf$$ 2>/dev/null; then
    LN=ln
  
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  else
    LN="cp -p"
  
 -  { $as_echo "$as_me:$LINENO: result: no, using $LN" >&5
 -$as_echo "no, using $LN" >&6; }
 +  { echo "$as_me:$LINENO: result: no, using $LN" >&5
 +echo "${ECHO_T}no, using $LN" >&6; }
  fi
  rm -f conf$$ conf$$.file
 -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 +if test "${ac_cv_path_GREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  # Extract the first word of "grep ggrep" to use in msg output
 +if test -z "$GREP"; then
 +set dummy grep ggrep; ac_prog_name=$2
  if test "${ac_cv_path_GREP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test -z "$GREP"; then
    ac_path_GREP_found=false
 -  # Loop through the user's path and test for each of PROGNAME-LIST
 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_prog in grep ggrep; do
 -    for ac_exec_ext in '' $ac_executable_extensions; do
 -      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 -# Check for GNU ac_path_GREP and select it if it is found.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 +    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 +    # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  *)
    ac_count=0
 -  $as_echo_n 0123456789 >"conftest.in"
 +  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
 -    $as_echo 'GREP' >> "conftest.nl"
 +    echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
@@@ -6135,74 -6330,60 +6140,74 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
 -      $ac_path_GREP_found && break 3
 -    done
 +
 +    $ac_path_GREP_found && break 3
    done
  done
 +
 +done
  IFS=$as_save_IFS
 -  if test -z "$ac_cv_path_GREP"; then
 -    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +
 +
 +fi
 +
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
     { (exit 1); exit 1; }; }
 -  fi
 +fi
 +
  else
    ac_cv_path_GREP=$GREP
  fi
  
 +
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 -$as_echo "$ac_cv_path_GREP" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
   GREP="$ac_cv_path_GREP"
  
  
 -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 -$as_echo_n "checking for egrep... " >&6; }
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
  if test "${ac_cv_path_EGREP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
     then ac_cv_path_EGREP="$GREP -E"
     else
 -     if test -z "$EGREP"; then
 +     # Extract the first word of "egrep" to use in msg output
 +if test -z "$EGREP"; then
 +set dummy egrep; ac_prog_name=$2
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
    ac_path_EGREP_found=false
 -  # Loop through the user's path and test for each of PROGNAME-LIST
 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_prog in egrep; do
 -    for ac_exec_ext in '' $ac_executable_extensions; do
 -      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
 -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 -# Check for GNU ac_path_EGREP and select it if it is found.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
 +    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 +    # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  *)
    ac_count=0
 -  $as_echo_n 0123456789 >"conftest.in"
 +  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
 -    $as_echo 'EGREP' >> "conftest.nl"
 +    echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
@@@ -6217,42 -6398,33 +6222,42 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
 -      $ac_path_EGREP_found && break 3
 -    done
 +
 +    $ac_path_EGREP_found && break 3
    done
  done
 +
 +done
  IFS=$as_save_IFS
 -  if test -z "$ac_cv_path_EGREP"; then
 -    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +
 +
 +fi
 +
 +EGREP="$ac_cv_path_EGREP"
 +if test -z "$EGREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
     { (exit 1); exit 1; }; }
 -  fi
 +fi
 +
  else
    ac_cv_path_EGREP=$EGREP
  fi
  
 +
     fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 -$as_echo "$ac_cv_path_EGREP" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
   EGREP="$ac_cv_path_EGREP"
  
  
  # Extract the first word of "ldconfig", so it can be a program name with args.
  set dummy ldconfig; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_LDCONFIG+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $LDCONFIG in
    [\\/]* | ?:[\\/]*)
@@@ -6267,7 -6439,7 +6272,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6280,11 -6452,11 +6285,11 @@@ esa
  fi
  LDCONFIG=$ac_cv_path_LDCONFIG
  if test -n "$LDCONFIG"; then
 -  { $as_echo "$as_me:$LINENO: result: $LDCONFIG" >&5
 -$as_echo "$LDCONFIG" >&6; }
 +  { echo "$as_me:$LINENO: result: $LDCONFIG" >&5
 +echo "${ECHO_T}$LDCONFIG" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6301,11 -6473,12 +6306,11 @@@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
 -# Reject install programs that cannot install multiple files.
 -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 -$as_echo_n "checking for a BSD-compatible install... " >&6; }
 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@@ -6334,17 -6507,29 +6339,17 @@@ case $as_dir/ i
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
 -	    rm -rf conftest.one conftest.two conftest.dir
 -	    echo one > conftest.one
 -	    echo two > conftest.two
 -	    mkdir conftest.dir
 -	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
 -	      test -s conftest.one && test -s conftest.two &&
 -	      test -s conftest.dir/conftest.one &&
 -	      test -s conftest.dir/conftest.two
 -	    then
 -	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 -	      break 3
 -	    fi
 +	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 +	    break 3
  	  fi
  	fi
        done
      done
      ;;
  esac
  done
  IFS=$as_save_IFS
  
 -rm -rf conftest.one conftest.two conftest.dir
  
  fi
    if test "${ac_cv_path_install+set}" = set; then
@@@ -6357,8 -6542,8 +6362,8 @@@
      INSTALL=$ac_install_sh
    fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
 -$as_echo "$INSTALL" >&6; }
 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5
 +echo "${ECHO_T}$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
@@@ -6377,10 -6562,10 +6382,10 @@@ for ac_prog in lclint lin
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_LINT+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$LINT"; then
    ac_cv_prog_LINT="$LINT" # Let the user override the test.
@@@ -6393,7 -6578,7 +6398,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_LINT="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6404,11 -6589,11 +6409,11 @@@ f
  fi
  LINT=$ac_cv_prog_LINT
  if test -n "$LINT"; then
 -  { $as_echo "$as_me:$LINENO: result: $LINT" >&5
 -$as_echo "$LINT" >&6; }
 +  { echo "$as_me:$LINENO: result: $LINT" >&5
 +echo "${ECHO_T}$LINT" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6426,10 -6611,10 +6431,10 @@@ for ac_prog in fontforg
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_FONTFORGE+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$FONTFORGE"; then
    ac_cv_prog_FONTFORGE="$FONTFORGE" # Let the user override the test.
@@@ -6442,7 -6627,7 +6447,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_FONTFORGE="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6453,11 -6638,11 +6458,11 @@@ f
  fi
  FONTFORGE=$ac_cv_prog_FONTFORGE
  if test -n "$FONTFORGE"; then
 -  { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5
 -$as_echo "$FONTFORGE" >&6; }
 +  { echo "$as_me:$LINENO: result: $FONTFORGE" >&5
 +echo "${ECHO_T}$FONTFORGE" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6469,10 -6654,10 +6474,10 @@@ for ac_prog in pkg-confi
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$PKG_CONFIG"; then
    ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
@@@ -6485,7 -6670,7 +6490,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_PKG_CONFIG="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6496,11 -6681,11 +6501,11 @@@ f
  fi
  PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
 -  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 -$as_echo "$PKG_CONFIG" >&6; }
 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6512,10 -6697,10 +6517,10 @@@ for ac_prog in rsv
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_RSVG+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$RSVG"; then
    ac_cv_prog_RSVG="$RSVG" # Let the user override the test.
@@@ -6528,7 -6713,7 +6533,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RSVG="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6539,11 -6724,11 +6544,11 @@@ f
  fi
  RSVG=$ac_cv_prog_RSVG
  if test -n "$RSVG"; then
 -  { $as_echo "$as_me:$LINENO: result: $RSVG" >&5
 -$as_echo "$RSVG" >&6; }
 +  { echo "$as_me:$LINENO: result: $RSVG" >&5
 +echo "${ECHO_T}$RSVG" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6555,10 -6740,10 +6560,10 @@@ for ac_prog in icotoo
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ICOTOOL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ICOTOOL"; then
    ac_cv_prog_ICOTOOL="$ICOTOOL" # Let the user override the test.
@@@ -6571,7 -6756,7 +6576,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ICOTOOL="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6582,11 -6767,11 +6587,11 @@@ f
  fi
  ICOTOOL=$ac_cv_prog_ICOTOOL
  if test -n "$ICOTOOL"; then
 -  { $as_echo "$as_me:$LINENO: result: $ICOTOOL" >&5
 -$as_echo "$ICOTOOL" >&6; }
 +  { echo "$as_me:$LINENO: result: $ICOTOOL" >&5
 +echo "${ECHO_T}$ICOTOOL" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6606,10 -6791,10 +6611,10 @@@ case $host_cpu i
    *i[3456789]86*)
      # Extract the first word of "prelink", so it can be a program name with args.
  set dummy prelink; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_PRELINK+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $PRELINK in
    [\\/]* | ?:[\\/]*)
@@@ -6624,7 -6809,7 +6629,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PRELINK="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6637,11 -6822,11 +6642,11 @@@ esa
  fi
  PRELINK=$ac_cv_path_PRELINK
  if test -n "$PRELINK"; then
 -  { $as_echo "$as_me:$LINENO: result: $PRELINK" >&5
 -$as_echo "$PRELINK" >&6; }
 +  { echo "$as_me:$LINENO: result: $PRELINK" >&5
 +echo "${ECHO_T}$PRELINK" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -6650,10 -6835,10 +6655,10 @@@ esa
  
  
  
 -{ $as_echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5
 -$as_echo_n "checking for i386_set_ldt in -li386... " >&6; }
 +{ echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5
 +echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6; }
  if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-li386  $LIBS"
@@@ -6685,33 -6870,37 +6690,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_i386_i386_set_ldt=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_i386_i386_set_ldt=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_set_ldt" >&5
 -$as_echo "$ac_cv_lib_i386_i386_set_ldt" >&6; }
 -if test "x$ac_cv_lib_i386_i386_set_ldt" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_set_ldt" >&5
 +echo "${ECHO_T}$ac_cv_lib_i386_i386_set_ldt" >&6; }
 +if test $ac_cv_lib_i386_i386_set_ldt = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBI386 1
  _ACEOF
@@@ -6721,10 -6910,10 +6726,10 @@@
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
 -$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
 +{ echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
 +echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6; }
  if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lossaudio  $LIBS"
@@@ -6756,33 -6945,37 +6761,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_ossaudio__oss_ioctl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_ossaudio__oss_ioctl=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 -$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
 -if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 +echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
 +if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBOSSAUDIO 1
  _ACEOF
@@@ -6791,10 -6984,10 +6796,10 @@@
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 +{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpthread  $LIBS"
@@@ -6826,33 -7019,37 +6831,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_pthread_pthread_create=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_pthread_pthread_create=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 -$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
 -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
 +if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  
  fi
@@@ -6864,10 -7061,10 +6869,10 @@@ OPENGL_LIBS="
  
  
  
 -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -$as_echo_n "checking for ANSI C header files... " >&6; }
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
  if test "${ac_cv_header_stdc+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -6894,20 -7091,21 +6899,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_header_stdc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stdc=no
@@@ -6999,37 -7197,40 +7004,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    { (case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
 -rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -$as_echo "$ac_cv_header_stdc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
@@@ -7051,11 -7252,11 +7056,11 @@@ f
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  		  inttypes.h stdint.h unistd.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7073,20 -7274,21 +7078,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7094,12 -7296,15 +7099,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7334,20 -7539,21 +7339,20 @@@ for ac_header in 
  	valgrind/valgrind.h
  
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -7363,32 -7569,33 +7368,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -7402,51 -7609,52 +7407,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -7455,31 -7663,34 +7460,31 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
  
  done
  
 -{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
 -$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
 +echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
  if test "${ac_cv_header_stat_broken+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7513,20 -7724,21 +7518,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_header_stat_broken=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stat_broken=yes
@@@ -7534,8 -7746,8 +7539,8 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
 -$as_echo "$ac_cv_header_stat_broken" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
 +echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
  if test $ac_cv_header_stat_broken = yes; then
  
  cat >>confdefs.h <<\_ACEOF
@@@ -7552,11 -7764,11 +7557,11 @@@ f
  
  for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7577,20 -7789,21 +7582,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7598,12 -7811,15 +7603,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7638,11 -7854,11 +7643,11 @@@ for ac_header in 
  	netipx/ipx.h \
  
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7672,20 -7888,21 +7677,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7693,12 -7910,15 +7698,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7712,11 -7932,11 +7717,11 @@@ don
  
  for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7761,20 -7981,21 +7766,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7782,12 -8003,15 +7787,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7798,11 -8022,11 +7803,11 @@@ don
  
  for ac_header in linux/ipx.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7826,20 -8050,21 +7831,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7847,12 -8072,15 +7852,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7863,11 -8091,11 +7868,11 @@@ don
  
  for ac_header in resolv.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7894,20 -8122,21 +7899,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7915,12 -8144,15 +7920,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7931,11 -8163,11 +7936,11 @@@ don
  
  for ac_header in ucontext.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7953,20 -8185,21 +7958,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7974,12 -8207,15 +7979,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7990,11 -8226,11 +7995,11 @@@ don
  
  for ac_header in sys/thr.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -8015,20 -8251,21 +8020,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -8036,12 -8273,15 +8041,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -8052,11 -8292,11 +8057,11 @@@ don
  
  for ac_header in pthread_np.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -8076,20 -8316,21 +8081,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -8097,12 -8338,15 +8102,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -8113,11 -8357,11 +8118,11 @@@ don
  
  for ac_header in linux/videodev.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -8141,20 -8385,21 +8146,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -8162,12 -8407,15 +8167,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -8178,11 -8426,11 +8183,11 @@@ don
  
  for ac_header in linux/capi.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -8200,20 -8448,21 +8205,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -8221,12 -8470,15 +8226,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -8253,10 -8505,10 +8258,10 @@@ LDRPATH_LOCAL="
  
  # Extract the first word of "ldd", so it can be a program name with args.
  set dummy ldd; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_LDD+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $LDD in
    [\\/]* | ?:[\\/]*)
@@@ -8272,7 -8524,7 +8277,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8285,11 -8537,11 +8290,11 @@@ esa
  fi
  LDD=$ac_cv_path_LDD
  if test -n "$LDD"; then
 -  { $as_echo "$as_me:$LINENO: result: $LDD" >&5
 -$as_echo "$LDD" >&6; }
 +  { echo "$as_me:$LINENO: result: $LDD" >&5
 +echo "${ECHO_T}$LDD" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -8299,10 -8551,10 +8304,10 @@@ case $host_os i
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_DLLTOOL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$DLLTOOL"; then
    ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@@ -8315,7 -8567,7 +8320,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8326,11 -8578,11 +8331,11 @@@ f
  fi
  DLLTOOL=$ac_cv_prog_DLLTOOL
  if test -n "$DLLTOOL"; then
 -  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
 -$as_echo "$DLLTOOL" >&6; }
 +  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
 +echo "${ECHO_T}$DLLTOOL" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -8339,10 -8591,10 +8344,10 @@@ if test -z "$ac_cv_prog_DLLTOOL"; the
    ac_ct_DLLTOOL=$DLLTOOL
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_DLLTOOL"; then
    ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@@ -8355,7 -8607,7 +8360,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DLLTOOL="dlltool"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8366,11 -8618,11 +8371,11 @@@ f
  fi
  ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  if test -n "$ac_ct_DLLTOOL"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
 -$as_echo "$ac_ct_DLLTOOL" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_DLLTOOL" = x; then
@@@ -8378,12 -8630,8 +8383,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      DLLTOOL=$ac_ct_DLLTOOL
@@@ -8395,10 -8643,10 +8400,10 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_DLLWRAP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$DLLWRAP"; then
    ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
@@@ -8411,7 -8659,7 +8416,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8422,11 -8670,11 +8427,11 @@@ f
  fi
  DLLWRAP=$ac_cv_prog_DLLWRAP
  if test -n "$DLLWRAP"; then
 -  { $as_echo "$as_me:$LINENO: result: $DLLWRAP" >&5
 -$as_echo "$DLLWRAP" >&6; }
 +  { echo "$as_me:$LINENO: result: $DLLWRAP" >&5
 +echo "${ECHO_T}$DLLWRAP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -8435,10 -8683,10 +8440,10 @@@ if test -z "$ac_cv_prog_DLLWRAP"; the
    ac_ct_DLLWRAP=$DLLWRAP
    # Extract the first word of "dllwrap", so it can be a program name with args.
  set dummy dllwrap; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_DLLWRAP"; then
    ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
@@@ -8451,7 -8699,7 +8456,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8462,11 -8710,11 +8467,11 @@@ f
  fi
  ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
  if test -n "$ac_ct_DLLWRAP"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
 -$as_echo "$ac_ct_DLLWRAP" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
 +echo "${ECHO_T}$ac_ct_DLLWRAP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_DLLWRAP" = x; then
@@@ -8474,12 -8722,8 +8479,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      DLLWRAP=$ac_ct_DLLWRAP
@@@ -8491,10 -8735,10 +8496,10 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_MINGWAR+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$MINGWAR"; then
    ac_cv_prog_MINGWAR="$MINGWAR" # Let the user override the test.
@@@ -8507,7 -8751,7 +8512,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_MINGWAR="${ac_tool_prefix}ar"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8518,11 -8762,11 +8523,11 @@@ f
  fi
  MINGWAR=$ac_cv_prog_MINGWAR
  if test -n "$MINGWAR"; then
 -  { $as_echo "$as_me:$LINENO: result: $MINGWAR" >&5
 -$as_echo "$MINGWAR" >&6; }
 +  { echo "$as_me:$LINENO: result: $MINGWAR" >&5
 +echo "${ECHO_T}$MINGWAR" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -8531,10 -8775,10 +8536,10 @@@ if test -z "$ac_cv_prog_MINGWAR"; the
    ac_ct_MINGWAR=$MINGWAR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_MINGWAR+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ac_ct_MINGWAR"; then
    ac_cv_prog_ac_ct_MINGWAR="$ac_ct_MINGWAR" # Let the user override the test.
@@@ -8547,7 -8791,7 +8552,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_MINGWAR="ar"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -8558,11 -8802,11 +8563,11 @@@ f
  fi
  ac_ct_MINGWAR=$ac_cv_prog_ac_ct_MINGWAR
  if test -n "$ac_ct_MINGWAR"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWAR" >&5
 -$as_echo "$ac_ct_MINGWAR" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_ct_MINGWAR" >&5
 +echo "${ECHO_T}$ac_ct_MINGWAR" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
    if test "x$ac_ct_MINGWAR" = x; then
@@@ -8570,12 -8814,8 +8575,12 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&5
 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      MINGWAR=$ac_ct_MINGWAR
@@@ -8641,10 -8881,10 +8646,10 @@@ f
    *)
      DLLFLAGS="$DLLFLAGS -fPIC"
      DLLEXT=".so"
 -    { $as_echo "$as_me:$LINENO: checking whether we can build a GNU style ELF dll" >&5
 -$as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
 +    { echo "$as_me:$LINENO: checking whether we can build a GNU style ELF dll" >&5
 +echo $ECHO_N "checking whether we can build a GNU style ELF dll... $ECHO_C" >&6; }
  if test "${ac_cv_c_dll_gnuelf+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
@@@ -8657,40 -8897,44 +8662,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c_dll_gnuelf="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_dll_gnuelf="no"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_dll_gnuelf" >&5
 -$as_echo "$ac_cv_c_dll_gnuelf" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_dll_gnuelf" >&5
 +echo "${ECHO_T}$ac_cv_c_dll_gnuelf" >&6; }
      if test "$ac_cv_c_dll_gnuelf" = "yes"
      then
        LDSHARED="\$(CC) -shared"
        LDDLLFLAGS="-shared -Wl,-Bsymbolic"
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1"
@@@ -8715,39 -8959,43 +8720,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" >&5
 -$as_echo "$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" >&6; }
  if test $ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1 = yes; then
    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%)"
  else
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1"
@@@ -8772,32 -9020,36 +8777,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1" >&5
 -$as_echo "$ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1" >&6; }
  if test $ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1 = yes; then
    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-h,%)"
  fi
@@@ -8805,10 -9057,10 +8810,10 @@@
  fi
  
  
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs"
@@@ -8833,41 -9085,45 +8838,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&5
 -$as_echo "$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&6; }
  if test $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs = yes; then
    LDDLLFLAGS="$LDDLLFLAGS,-z,defs"
  fi
  
  
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini"
@@@ -8892,42 -9148,46 +8897,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini" >&5
 -$as_echo "$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini" >&6; }
  if test $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini = yes; then
    LDDLLFLAGS="$LDDLLFLAGS,-init,__wine_spec_init,-fini,__wine_spec_fini"
  fi
  
  
        echo '{ global: *; };' >conftest.map
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map"
@@@ -8952,42 -9212,46 +8957,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map" >&5
 -$as_echo "$ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map" >&6; }
  if test $ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map = yes; then
    LDSHARED="$LDSHARED \$(VERSCRIPT:%=-Wl,--version-script=%)"
  fi
  
        rm -f conftest.map
  
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
 +echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,--export-dynamic... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fPIC__Wl___export_dynamic+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
@@@ -9012,42 -9276,182 +9017,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fPIC__Wl___export_dynamic=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fPIC__Wl___export_dynamic=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__Wl___export_dynamic" >&5
 -$as_echo "$ac_cv_cflags__fPIC__Wl___export_dynamic" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fPIC__Wl___export_dynamic" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fPIC__Wl___export_dynamic" >&6; }
  if test $ac_cv_cflags__fPIC__Wl___export_dynamic = yes; then
    LDEXECFLAGS="-Wl,--export-dynamic"
  
  fi
  
  
 -      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
 -fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -CFLAGS=$ac_wine_try_cflags_saved
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -if test `eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'` = yes; then
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 -else
 -  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
 -fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -CFLAGS=$ac_wine_try_cflags_saved
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -if test `eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'` = yes; then
 -  LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 -fi
 -
 -fi
 -
 -
 -      { $as_echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--enable-new-dtags" >&5
 -$as_echo_n "checking whether the compiler supports -Wl,--enable-new-dtags... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--enable-new-dtags" >&5
 +echo $ECHO_N "checking whether the compiler supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__Wl___enable_new_dtags+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wl,--enable-new-dtags"
@@@ -9072,32 -9476,36 +9077,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__Wl___enable_new_dtags=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__Wl___enable_new_dtags=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___enable_new_dtags" >&5
 -$as_echo "$ac_cv_cflags__Wl___enable_new_dtags" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___enable_new_dtags" >&5
 +echo "${ECHO_T}$ac_cv_cflags__Wl___enable_new_dtags" >&6; }
  if test $ac_cv_cflags__Wl___enable_new_dtags = yes; then
    LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"
  fi
@@@ -9105,10 -9513,10 +9110,10 @@@
  
        case $host_cpu in
          *i[3456789]86* | x86_64)
 -          { $as_echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5
 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; }
 +          { echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5
 +echo $ECHO_N "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400"
@@@ -9133,32 -9541,36 +9138,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5
 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5
 +echo "${ECHO_T}$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; }
  if test $ac_cv_cflags__Wl___section_start__interp_0x7bf00400 = yes; then
    LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
  fi
@@@ -9167,10 -9579,10 +9172,10 @@@
        esac
  
      else
 -      { $as_echo "$as_me:$LINENO: checking whether we can build a UnixWare (Solaris) dll" >&5
 -$as_echo_n "checking whether we can build a UnixWare (Solaris) dll... " >&6; }
 +      { echo "$as_me:$LINENO: checking whether we can build a UnixWare (Solaris) dll" >&5
 +echo $ECHO_N "checking whether we can build a UnixWare (Solaris) dll... $ECHO_C" >&6; }
  if test "${ac_cv_c_dll_unixware+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
@@@ -9183,42 -9595,46 +9188,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c_dll_unixware="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_dll_unixware="no"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_dll_unixware" >&5
 -$as_echo "$ac_cv_c_dll_unixware" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_dll_unixware" >&5
 +echo "${ECHO_T}$ac_cv_c_dll_unixware" >&6; }
        if test "$ac_cv_c_dll_unixware" = "yes"
        then
          LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"
          LDDLLFLAGS="-Wl,-G,-B,symbolic"
  
        else
 -        { $as_echo "$as_me:$LINENO: checking whether we can build an HP-UX dll" >&5
 -$as_echo_n "checking whether we can build an HP-UX dll... " >&6; }
 +        { echo "$as_me:$LINENO: checking whether we can build an HP-UX dll" >&5
 +echo $ECHO_N "checking whether we can build an HP-UX dll... $ECHO_C" >&6; }
  if test "${ac_cv_c_dll_hpux+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -shared"
@@@ -9231,32 -9647,36 +9236,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c_dll_hpux="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_dll_hpux="no"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_dll_hpux" >&5
 -$as_echo "$ac_cv_c_dll_hpux" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_dll_hpux" >&5
 +echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; }
          if test "$ac_cv_c_dll_hpux" = "yes"
          then
            LIBEXT="sl"
@@@ -9272,12 -9692,12 +9277,12 @@@ esa
  enable_winequartz_drv=${enable_winequartz_drv:-no}
  
  if test "$LIBEXT" = "a"; then
 -  { { $as_echo "$as_me:$LINENO: error: could not find a way to build shared libraries.
 +  { { echo "$as_me:$LINENO: error: could not find a way to build shared libraries.
  It is currently not possible to build Wine without shared library
  (.so) support to allow transparent switch between .so and .dll files.
  If you are using Linux, you will need a newer binutils.
  " >&5
 -$as_echo "$as_me: error: could not find a way to build shared libraries.
 +echo "$as_me: error: could not find a way to build shared libraries.
  It is currently not possible to build Wine without shared library
  (.so) support to allow transparent switch between .so and .dll files.
  If you are using Linux, you will need a newer binutils.
@@@ -9291,10 -9711,10 +9296,10 @@@ the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CROSSCC+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CROSSCC"; then
    ac_cv_prog_CROSSCC="$CROSSCC" # Let the user override the test.
@@@ -9307,7 -9727,7 +9312,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CROSSCC="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -9318,11 -9738,11 +9323,11 @@@ f
  fi
  CROSSCC=$ac_cv_prog_CROSSCC
  if test -n "$CROSSCC"; then
 -  { $as_echo "$as_me:$LINENO: result: $CROSSCC" >&5
 -$as_echo "$CROSSCC" >&6; }
 +  { echo "$as_me:$LINENO: result: $CROSSCC" >&5
 +echo "${ECHO_T}$CROSSCC" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -9334,10 -9754,10 +9339,10 @@@ test -n "$CROSSCC" || CROSSCC="false
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_DLLTOOL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$DLLTOOL"; then
    ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@@ -9350,7 -9770,7 +9355,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DLLTOOL="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -9361,11 -9781,11 +9366,11 @@@ f
  fi
  DLLTOOL=$ac_cv_prog_DLLTOOL
  if test -n "$DLLTOOL"; then
 -  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
 -$as_echo "$DLLTOOL" >&6; }
 +  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
 +echo "${ECHO_T}$DLLTOOL" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -9377,10 -9797,10 +9382,10 @@@ test -n "$DLLTOOL" || DLLTOOL="false
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CROSSWINDRES+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$CROSSWINDRES"; then
    ac_cv_prog_CROSSWINDRES="$CROSSWINDRES" # Let the user override the test.
@@@ -9393,7 -9813,7 +9398,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CROSSWINDRES="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -9404,11 -9824,11 +9409,11 @@@ f
  fi
  CROSSWINDRES=$ac_cv_prog_CROSSWINDRES
  if test -n "$CROSSWINDRES"; then
 -  { $as_echo "$as_me:$LINENO: result: $CROSSWINDRES" >&5
 -$as_echo "$CROSSWINDRES" >&6; }
 +  { echo "$as_me:$LINENO: result: $CROSSWINDRES" >&5
 +echo "${ECHO_T}$CROSSWINDRES" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -9420,10 -9840,10 +9425,10 @@@ test -n "$CROSSWINDRES" || CROSSWINDRES
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_MINGWAR+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$MINGWAR"; then
    ac_cv_prog_MINGWAR="$MINGWAR" # Let the user override the test.
@@@ -9436,7 -9856,7 +9441,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_MINGWAR="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -9447,11 -9867,11 +9452,11 @@@ f
  fi
  MINGWAR=$ac_cv_prog_MINGWAR
  if test -n "$MINGWAR"; then
 -  { $as_echo "$as_me:$LINENO: result: $MINGWAR" >&5
 -$as_echo "$MINGWAR" >&6; }
 +  { echo "$as_me:$LINENO: result: $MINGWAR" >&5
 +echo "${ECHO_T}$MINGWAR" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -9473,10 -9893,10 +9478,10 @@@ the
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
 -    { $as_echo "$as_me:$LINENO: checking for -lX11" >&5
 -$as_echo_n "checking for -lX11... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lX11" >&5
 +echo $ECHO_N "checking for -lX11... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_X11+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lX11 $X_LIBS $X_EXTRA_LIBS $LIBS"
@@@ -9508,41 -9928,45 +9513,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_X11=`otool -L conftest$ac_exeext | grep "libX11\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libX11\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep "libX11\\.$LIBEXT" | sed -e "s/^.*\(libX11\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_X11" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
 -$as_echo "$ac_cv_lib_soname_X11" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_X11" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBX11 "$ac_cv_lib_soname_X11"
@@@ -9551,10 -9975,10 +9556,10 @@@ _ACEO
  
  fi
  
 -    { $as_echo "$as_me:$LINENO: checking for -lXext" >&5
 -$as_echo_n "checking for -lXext... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lXext" >&5
 +echo $ECHO_N "checking for -lXext... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xext+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXext $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -9586,41 -10010,45 +9591,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xext=`otool -L conftest$ac_exeext | grep "libXext\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXext\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXext\\.$LIBEXT" | sed -e "s/^.*\(libXext\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xext" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
 -$as_echo "$ac_cv_lib_soname_Xext" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xext" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext"
@@@ -9655,11 -10083,11 +9660,11 @@@ for ac_header in X11/Xlib.h 
                        X11/extensions/Xrender.h \
                        X11/extensions/xf86vmode.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -9682,20 -10110,21 +9687,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -9703,12 -10132,15 +9708,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -9718,10 -10150,10 +9723,10 @@@ don
  
                  if test "$ac_cv_header_X11_XKBlib_h" = "yes"
          then
 -              { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5
 -$as_echo_n "checking for XkbQueryExtension in -lX11... " >&6; }
 +              { echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5
 +echo $ECHO_N "checking for XkbQueryExtension in -lX11... $ECHO_C" >&6; }
  if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -9753,33 -10185,37 +9758,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_X11_XkbQueryExtension=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_X11_XkbQueryExtension=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5
 -$as_echo "$ac_cv_lib_X11_XkbQueryExtension" >&6; }
 -if test "x$ac_cv_lib_X11_XkbQueryExtension" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_X11_XkbQueryExtension" >&6; }
 +if test $ac_cv_lib_X11_XkbQueryExtension = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XKB 1
@@@ -9791,10 -10227,10 +9796,10 @@@ f
  
                  if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
          then
 -            { $as_echo "$as_me:$LINENO: checking for -lXcursor" >&5
 -$as_echo_n "checking for -lXcursor... " >&6; }
 +            { echo "$as_me:$LINENO: checking for -lXcursor" >&5
 +echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xcursor+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXcursor $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -9826,41 -10262,45 +9831,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXcursor\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\\.$LIBEXT" | sed -e "s/^.*\(libXcursor\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xcursor" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5
 -$as_echo "$ac_cv_lib_soname_Xcursor" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor"
@@@ -9874,9 -10314,9 +9879,9 @@@ f
    case "x$with_xcursor" in
    x)   wine_notices="$wine_notices|libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
  This is an error since --with-xcursor was requested." >&5
 -$as_echo "$as_me: error: libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
 +echo "$as_me: error: libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
  This is an error since --with-xcursor was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -9885,10 -10325,10 +9890,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
          then
 -            { $as_echo "$as_me:$LINENO: checking for -lXi" >&5
 -$as_echo_n "checking for -lXi... " >&6; }
 +            { echo "$as_me:$LINENO: checking for -lXi" >&5
 +echo $ECHO_N "checking for -lXi... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xi+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXi $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -9920,41 -10360,45 +9925,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xi=`otool -L conftest$ac_exeext | grep "libXi\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXi\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xi=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXi\\.$LIBEXT" | sed -e "s/^.*\(libXi\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xi" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5
 -$as_echo "$ac_cv_lib_soname_Xi" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xi" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXI "$ac_cv_lib_soname_Xi"
@@@ -9968,9 -10412,9 +9973,9 @@@ f
    case "x$with_xinput" in
    x)   wine_notices="$wine_notices|libxi ${notice_platform}development files not found, the Xinput extension won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
  This is an error since --with-xinput was requested." >&5
 -$as_echo "$as_me: error: libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
 +echo "$as_me: error: libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
  This is an error since --with-xinput was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -9979,10 -10423,10 +9984,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
          then
 -              { $as_echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5
 -$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; }
 +              { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5
 +echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6; }
  if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10014,33 -10458,37 +10019,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_Xext_XShmQueryExtension=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_Xext_XShmQueryExtension=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5
 -$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; }
 -if test "x$ac_cv_lib_Xext_XShmQueryExtension" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6; }
 +if test $ac_cv_lib_Xext_XShmQueryExtension = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBXXSHM 1
@@@ -10053,9 -10501,9 +10058,9 @@@ f
    case "x$with_xshm" in
    x)   wine_notices="$wine_notices|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
  This is an error since --with-xshm was requested." >&5
 -$as_echo "$as_me: error: XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
 +echo "$as_me: error: XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
  This is an error since --with-xshm was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10064,10 -10512,10 +10069,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
          then
 -              { $as_echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
 -$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
 +              { echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
 +echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; }
  if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10099,33 -10547,37 +10104,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_Xext_XShapeQueryExtension=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_Xext_XShapeQueryExtension=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
 -$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
 -if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
 +if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBXSHAPE 1
@@@ -10138,9 -10590,9 +10143,9 @@@ f
    case "x$with_xshape" in
    x)   wine_notices="$wine_notices|XShape ${notice_platform}development files not found, XShape won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: XShape ${notice_platform}development files not found, XShape won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: XShape ${notice_platform}development files not found, XShape won't be supported.
  This is an error since --with-xshape was requested." >&5
 -$as_echo "$as_me: error: XShape ${notice_platform}development files not found, XShape won't be supported.
 +echo "$as_me: error: XShape ${notice_platform}development files not found, XShape won't be supported.
  This is an error since --with-xshape was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10149,10 -10601,10 +10154,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
          then
 -            { $as_echo "$as_me:$LINENO: checking for -lXxf86vm" >&5
 -$as_echo_n "checking for -lXxf86vm... " >&6; }
 +            { echo "$as_me:$LINENO: checking for -lXxf86vm" >&5
 +echo $ECHO_N "checking for -lXxf86vm... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xxf86vm+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10184,41 -10636,45 +10189,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xxf86vm=`otool -L conftest$ac_exeext | grep "libXxf86vm\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXxf86vm\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xxf86vm=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXxf86vm\\.$LIBEXT" | sed -e "s/^.*\(libXxf86vm\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xxf86vm" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xxf86vm" >&5
 -$as_echo "$ac_cv_lib_soname_Xxf86vm" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xxf86vm" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xxf86vm" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXXF86VM "$ac_cv_lib_soname_Xxf86vm"
@@@ -10232,9 -10688,9 +10237,9 @@@ f
    case "x$with_xxf86vm" in
    x)   wine_notices="$wine_notices|libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
  This is an error since --with-xxf86vm was requested." >&5
 -$as_echo "$as_me: error: libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
 +echo "$as_me: error: libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
  This is an error since --with-xxf86vm was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10243,10 -10699,10 +10248,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x"
          then
 -            { $as_echo "$as_me:$LINENO: checking for -lXrender" >&5
 -$as_echo_n "checking for -lXrender... " >&6; }
 +            { echo "$as_me:$LINENO: checking for -lXrender" >&5
 +echo $ECHO_N "checking for -lXrender... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xrender+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10278,50 -10734,54 +10283,50 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xrender=`otool -L conftest$ac_exeext | grep "libXrender\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXrender\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXrender\\.$LIBEXT" | sed -e "s/^.*\(libXrender\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xrender" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
 -$as_echo "$ac_cv_lib_soname_Xrender" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xrender" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXRENDER "$ac_cv_lib_soname_Xrender"
  _ACEOF
  
 -       { $as_echo "$as_me:$LINENO: checking for XRenderSetPictureTransform in -lXrender" >&5
 -$as_echo_n "checking for XRenderSetPictureTransform in -lXrender... " >&6; }
 +       { echo "$as_me:$LINENO: checking for XRenderSetPictureTransform in -lXrender" >&5
 +echo $ECHO_N "checking for XRenderSetPictureTransform in -lXrender... $ECHO_C" >&6; }
  if test "${ac_cv_lib_Xrender_XRenderSetPictureTransform+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10353,33 -10813,37 +10358,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_Xrender_XRenderSetPictureTransform=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_Xrender_XRenderSetPictureTransform=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderSetPictureTransform" >&5
 -$as_echo "$ac_cv_lib_Xrender_XRenderSetPictureTransform" >&6; }
 -if test "x$ac_cv_lib_Xrender_XRenderSetPictureTransform" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderSetPictureTransform" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderSetPictureTransform" >&6; }
 +if test $ac_cv_lib_Xrender_XRenderSetPictureTransform = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XRENDERSETPICTURETRANSFORM 1
@@@ -10395,9 -10859,9 +10400,9 @@@ f
    case "x$with_xrender" in
    x)   wine_warnings="$wine_warnings|libxrender ${notice_platform}development files not found, XRender won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxrender ${notice_platform}development files not found, XRender won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxrender ${notice_platform}development files not found, XRender won't be supported.
  This is an error since --with-xrender was requested." >&5
 -$as_echo "$as_me: error: libxrender ${notice_platform}development files not found, XRender won't be supported.
 +echo "$as_me: error: libxrender ${notice_platform}development files not found, XRender won't be supported.
  This is an error since --with-xrender was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10428,21 -10892,22 +10433,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  { $as_echo "$as_me:$LINENO: checking for -lXrandr" >&5
 -$as_echo_n "checking for -lXrandr... " >&6; }
 +  { echo "$as_me:$LINENO: checking for -lXrandr" >&5
 +echo $ECHO_N "checking for -lXrandr... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xrandr+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXrandr $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10474,41 -10939,45 +10479,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xrandr=`otool -L conftest$ac_exeext | grep "libXrandr\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXrandr\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xrandr=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXrandr\\.$LIBEXT" | sed -e "s/^.*\(libXrandr\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xrandr" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrandr" >&5
 -$as_echo "$ac_cv_lib_soname_Xrandr" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrandr" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xrandr" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXRANDR "$ac_cv_lib_soname_Xrandr"
@@@ -10518,7 -10987,7 +10523,7 @@@ _ACEO
  fi
  
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -10530,9 -10999,9 +10535,9 @@@ rm -f core conftest.err conftest.$ac_ob
    case "x$with_xrandr" in
    x)   wine_notices="$wine_notices|libxrandr ${notice_platform}development files not found, XRandr won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxrandr ${notice_platform}development files not found, XRandr won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxrandr ${notice_platform}development files not found, XRandr won't be supported.
  This is an error since --with-xrandr was requested." >&5
 -$as_echo "$as_me: error: libxrandr ${notice_platform}development files not found, XRandr won't be supported.
 +echo "$as_me: error: libxrandr ${notice_platform}development files not found, XRandr won't be supported.
  This is an error since --with-xrandr was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10563,21 -11032,22 +10568,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  { $as_echo "$as_me:$LINENO: checking for -lXinerama" >&5
 -$as_echo_n "checking for -lXinerama... " >&6; }
 +  { echo "$as_me:$LINENO: checking for -lXinerama" >&5
 +echo $ECHO_N "checking for -lXinerama... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xinerama+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXinerama $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10609,41 -11079,45 +10614,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xinerama=`otool -L conftest$ac_exeext | grep "libXinerama\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXinerama\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xinerama=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXinerama\\.$LIBEXT" | sed -e "s/^.*\(libXinerama\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xinerama" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5
 -$as_echo "$ac_cv_lib_soname_Xinerama" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xinerama" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXINERAMA "$ac_cv_lib_soname_Xinerama"
@@@ -10653,7 -11127,7 +10658,7 @@@ _ACEO
  fi
  
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -10665,9 -11139,9 +10670,9 @@@ rm -f core conftest.err conftest.$ac_ob
    case "x$with_xinerama" in
    x)   wine_notices="$wine_notices|libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
  This is an error since --with-xinerama was requested." >&5
 -$as_echo "$as_me: error: libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
 +echo "$as_me: error: libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
  This is an error since --with-xinerama was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -10676,10 -11150,10 +10681,10 @@@ f
  
                  if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
          then
 -            { $as_echo "$as_me:$LINENO: checking for -lXcomposite" >&5
 -$as_echo_n "checking for -lXcomposite... " >&6; }
 +            { echo "$as_me:$LINENO: checking for -lXcomposite" >&5
 +echo $ECHO_N "checking for -lXcomposite... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_Xcomposite+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXcomposite $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -10711,41 -11185,45 +10716,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_Xcomposite=`otool -L conftest$ac_exeext | grep "libXcomposite\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXcomposite\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_Xcomposite=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcomposite\\.$LIBEXT" | sed -e "s/^.*\(libXcomposite\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcomposite" >&5
 -$as_echo "$ac_cv_lib_soname_Xcomposite" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcomposite" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_Xcomposite" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXCOMPOSITE "$ac_cv_lib_soname_Xcomposite"
@@@ -10759,19 -11237,19 +10764,19 @@@ f
    case "x$with_xcomposite" in
    x)   wine_notices="$wine_notices|libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
  This is an error since --with-xcomposite was requested." >&5
 -$as_echo "$as_me: error: libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
 +echo "$as_me: error: libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
  This is an error since --with-xcomposite was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
  fi
  
  
 -                { $as_echo "$as_me:$LINENO: checking for XICCallback.callback" >&5
 -$as_echo_n "checking for XICCallback.callback... " >&6; }
 +                { echo "$as_me:$LINENO: checking for XICCallback.callback" >&5
 +echo $ECHO_N "checking for XICCallback.callback... $ECHO_C" >&6; }
  if test "${ac_cv_member_XICCallback_callback+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -10799,20 -11277,21 +10804,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_XICCallback_callback=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -10841,20 -11320,21 +10846,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_XICCallback_callback=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_XICCallback_callback=no
@@@ -10865,9 -11345,9 +10870,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5
 -$as_echo "$ac_cv_member_XICCallback_callback" >&6; }
 -if test "x$ac_cv_member_XICCallback_callback" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5
 +echo "${ECHO_T}$ac_cv_member_XICCallback_callback" >&6; }
 +if test $ac_cv_member_XICCallback_callback = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_XICCALLBACK_CALLBACK 1
@@@ -10887,11 -11367,11 +10892,11 @@@ f
  
  for ac_header in GL/gl.h GL/glx.h GL/glext.h GL/glu.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -10911,20 -11391,21 +10916,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -10932,12 -11413,15 +10937,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -10946,10 -11430,10 +10951,10 @@@ don
  
  	if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes"
  	then
 -	    	    { $as_echo "$as_me:$LINENO: checking for up-to-date OpenGL version" >&5
 -$as_echo_n "checking for up-to-date OpenGL version... " >&6; }
 +	    	    { echo "$as_me:$LINENO: checking for up-to-date OpenGL version" >&5
 +echo $ECHO_N "checking for up-to-date OpenGL version... $ECHO_C" >&6; }
  if test "${wine_cv_opengl_header_version_OK+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -10972,20 -11456,21 +10977,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    wine_cv_opengl_header_version_OK="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	wine_cv_opengl_header_version_OK="no"
@@@ -10993,15 -11478,15 +10998,15 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $wine_cv_opengl_header_version_OK" >&5
 -$as_echo "$wine_cv_opengl_header_version_OK" >&6; }
 +{ echo "$as_me:$LINENO: result: $wine_cv_opengl_header_version_OK" >&5
 +echo "${ECHO_T}$wine_cv_opengl_header_version_OK" >&6; }
  
  	    if test "$wine_cv_opengl_header_version_OK" = "yes"
              then
 -				{ $as_echo "$as_me:$LINENO: checking for -lGL" >&5
 -$as_echo_n "checking for -lGL... " >&6; }
 +				{ echo "$as_me:$LINENO: checking for -lGL" >&5
 +echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_GL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
@@@ -11033,41 -11518,45 +11038,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_GL" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 -       { $as_echo "$as_me:$LINENO: checking for -lGL" >&5
 -$as_echo_n "checking for -lGL... " >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
 +       { echo "$as_me:$LINENO: checking for -lGL" >&5
 +echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_GL+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS"
@@@ -11099,37 -11588,41 +11104,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_GL" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
         if test -f /usr/X11R6/lib/libGL.a
  	                            then
  		                        opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
@@@ -11138,8 -11631,8 +11143,8 @@@ This probably prevents linking to OpenG
  	                                opengl_msg="No OpenGL library found on this system."
  	                            fi
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 -$as_echo "$ac_cv_lib_soname_GL" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBGL "$ac_cv_lib_soname_GL"
@@@ -11154,8 -11647,8 +11159,8 @@@ _ACEO
  fi
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 -$as_echo "$ac_cv_lib_soname_GL" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBGL "$ac_cv_lib_soname_GL"
@@@ -11171,10 -11664,10 +11176,10 @@@ f
  
                   if test "$ac_cv_header_GL_glu_h" = "yes"
                   then
 -                    { $as_echo "$as_me:$LINENO: checking for -lGLU" >&5
 -$as_echo_n "checking for -lGLU... " >&6; }
 +                    { echo "$as_me:$LINENO: checking for -lGLU" >&5
 +echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_GLU+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
@@@ -11206,41 -11699,45 +11211,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_GLU=`otool -L conftest$ac_exeext | grep "libGLU\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGLU\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_GLU=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGLU\\.$LIBEXT" | sed -e "s/^.*\(libGLU\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_GLU" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GLU" >&5
 -$as_echo "$ac_cv_lib_soname_GLU" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GLU" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_GLU" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBGLU "$ac_cv_lib_soname_GLU"
@@@ -11254,9 -11751,9 +11259,9 @@@ f
    case "x$with_glu" in
    x)   wine_notices="$wine_notices|libGLU ${notice_platform}development files not found, GLU won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libGLU ${notice_platform}development files not found, GLU won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libGLU ${notice_platform}development files not found, GLU won't be supported.
  This is an error since --with-glu was requested." >&5
 -$as_echo "$as_me: error: libGLU ${notice_platform}development files not found, GLU won't be supported.
 +echo "$as_me: error: libGLU ${notice_platform}development files not found, GLU won't be supported.
  This is an error since --with-glu was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -11279,10 -11776,10 +11284,10 @@@ f
    x)   wine_warnings="$wine_warnings|$opengl_msg
  OpenGL and Direct3D won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: $opengl_msg
 +  *)   { { echo "$as_me:$LINENO: error: $opengl_msg
  OpenGL and Direct3D won't be supported.
  This is an error since --with-opengl was requested." >&5
 -$as_echo "$as_me: error: $opengl_msg
 +echo "$as_me: error: $opengl_msg
  OpenGL and Direct3D won't be supported.
  This is an error since --with-opengl was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
@@@ -11295,20 -11792,21 +11300,20 @@@ f
  
  for ac_header in audio/audiolib.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -11324,32 -11822,33 +11329,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -11363,51 -11862,52 +11368,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -11416,30 -11916,33 +11421,30 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  for ac_header in audio/soundlib.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -11457,20 -11960,21 +11462,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -11478,22 -11982,25 +11483,22 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
  
  done
  
 -          { $as_echo "$as_me:$LINENO: checking for AuCreateFlow in -laudio" >&5
 -$as_echo_n "checking for AuCreateFlow in -laudio... " >&6; }
 +          { echo "$as_me:$LINENO: checking for AuCreateFlow in -laudio" >&5
 +echo $ECHO_N "checking for AuCreateFlow in -laudio... $ECHO_C" >&6; }
  if test "${ac_cv_lib_audio_AuCreateFlow+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
@@@ -11525,42 -12032,46 +11530,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_audio_AuCreateFlow=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_audio_AuCreateFlow=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audio_AuCreateFlow" >&5
 -$as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; }
 -if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_audio_AuCreateFlow" >&5
 +echo "${ECHO_T}$ac_cv_lib_audio_AuCreateFlow" >&6; }
 +if test $ac_cv_lib_audio_AuCreateFlow = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NAS 1
  _ACEOF
  
 -                        { $as_echo "$as_me:$LINENO: checking for XauGetBestAuthByAddr in -lXau" >&5
 -$as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; }
 +                        { echo "$as_me:$LINENO: checking for XauGetBestAuthByAddr in -lXau" >&5
 +echo $ECHO_N "checking for XauGetBestAuthByAddr in -lXau... $ECHO_C" >&6; }
  if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXau $X_LIBS $LIBS"
@@@ -11592,33 -12103,37 +11597,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_Xau_XauGetBestAuthByAddr=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_Xau_XauGetBestAuthByAddr=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetBestAuthByAddr" >&5
 -$as_echo "$ac_cv_lib_Xau_XauGetBestAuthByAddr" >&6; }
 -if test "x$ac_cv_lib_Xau_XauGetBestAuthByAddr" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetBestAuthByAddr" >&5
 +echo "${ECHO_T}$ac_cv_lib_Xau_XauGetBestAuthByAddr" >&6; }
 +if test $ac_cv_lib_Xau_XauGetBestAuthByAddr = yes; then
    NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
  else
    NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
@@@ -11644,11 -12159,11 +11649,11 @@@ f
  if test "x$XLIB" = "x"; then
    case "x$with_x" in
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: X development files not found. Wine will be built
 +  *)   { { echo "$as_me:$LINENO: error: X development files not found. Wine will be built
  without X support, which probably isn't what you want. You will need to install
  development packages of Xlib/Xfree86 at the very least.
  Use the --without-x option if you really want this." >&5
 -$as_echo "$as_me: error: X development files not found. Wine will be built
 +echo "$as_me: error: X development files not found. Wine will be built
  without X support, which probably isn't what you want. You will need to install
  development packages of Xlib/Xfree86 at the very least.
  Use the --without-x option if you really want this." >&2;}
@@@ -11662,8 -12177,6 +11667,6 @@@ XML2LIBS="
  
  XML2INCL=""
  
- XSLTLIBS=""
- 
  XSLTINCL=""
  
  if test "x$with_xml" != "xno"
@@@ -11681,20 -12194,21 +11684,20 @@@ the
  
  for ac_header in libxml/parser.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -11710,32 -12224,33 +11713,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -11749,51 -12264,52 +11752,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -11802,26 -12318,29 +11805,26 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
 - { $as_echo "$as_me:$LINENO: checking for xmlParseMemory in -lxml2" >&5
 -$as_echo_n "checking for xmlParseMemory in -lxml2... " >&6; }
 + { echo "$as_me:$LINENO: checking for xmlParseMemory in -lxml2" >&5
 +echo $ECHO_N "checking for xmlParseMemory in -lxml2... $ECHO_C" >&6; }
  if test "${ac_cv_lib_xml2_xmlParseMemory+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
@@@ -11853,33 -12372,37 +11856,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_xml2_xmlParseMemory=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_xml2_xmlParseMemory=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlParseMemory" >&5
 -$as_echo "$ac_cv_lib_xml2_xmlParseMemory" >&6; }
 -if test "x$ac_cv_lib_xml2_xmlParseMemory" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlParseMemory" >&5
 +echo "${ECHO_T}$ac_cv_lib_xml2_xmlParseMemory" >&6; }
 +if test $ac_cv_lib_xml2_xmlParseMemory = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBXML2 1
@@@ -11889,10 -12412,10 +11892,10 @@@ _ACEO
                   XML2INCL="$ac_xml_cflags"
  fi
  
 -             { $as_echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
 -$as_echo_n "checking for xmlReadMemory in -lxml2... " >&6; }
 +             { echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
 +echo $ECHO_N "checking for xmlReadMemory in -lxml2... $ECHO_C" >&6; }
  if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
@@@ -11924,33 -12447,37 +11927,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_xml2_xmlReadMemory=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_xml2_xmlReadMemory=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlReadMemory" >&5
 -$as_echo "$ac_cv_lib_xml2_xmlReadMemory" >&6; }
 -if test "x$ac_cv_lib_xml2_xmlReadMemory" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlReadMemory" >&5
 +echo "${ECHO_T}$ac_cv_lib_xml2_xmlReadMemory" >&6; }
 +if test $ac_cv_lib_xml2_xmlReadMemory = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XMLREADMEMORY 1
@@@ -11958,10 -12485,10 +11961,10 @@@ _ACEO
  
  fi
  
 -             { $as_echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
 -$as_echo_n "checking for xmlNewDocPI in -lxml2... " >&6; }
 +             { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
 +echo $ECHO_N "checking for xmlNewDocPI in -lxml2... $ECHO_C" >&6; }
  if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
@@@ -11993,33 -12520,37 +11996,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_xml2_xmlNewDocPI=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_xml2_xmlNewDocPI=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlNewDocPI" >&5
 -$as_echo "$ac_cv_lib_xml2_xmlNewDocPI" >&6; }
 -if test "x$ac_cv_lib_xml2_xmlNewDocPI" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlNewDocPI" >&5
 +echo "${ECHO_T}$ac_cv_lib_xml2_xmlNewDocPI" >&6; }
 +if test $ac_cv_lib_xml2_xmlNewDocPI = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XMLNEWDOCPI 1
@@@ -12038,9 -12569,9 +12041,9 @@@ if test "$ac_cv_lib_xml2_xmlParseMemory
    case "x$with_xml" in
    x)   wine_warnings="$wine_warnings|libxml2 ${notice_platform}development files not found, XML won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxml2 ${notice_platform}development files not found, XML won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxml2 ${notice_platform}development files not found, XML won't be supported.
  This is an error since --with-xml was requested." >&5
 -$as_echo "$as_me: error: libxml2 ${notice_platform}development files not found, XML won't be supported.
 +echo "$as_me: error: libxml2 ${notice_platform}development files not found, XML won't be supported.
  This is an error since --with-xml was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -12063,11 -12594,11 +12066,11 @@@ the
  
  for ac_header in libxslt/pattern.h libxslt/transform.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12087,20 -12618,21 +12090,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -12108,12 -12640,15 +12111,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -12123,14 -12658,14 +12126,14 @@@ don
      CPPFLAGS="$ac_save_CPPFLAGS"
      if test "$ac_cv_header_libxslt_transform_h" = "yes"
      then
-         { echo "$as_me:$LINENO: checking for xsltCompilePattern in -lxslt" >&5
- echo $ECHO_N "checking for xsltCompilePattern in -lxslt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_xslt_xsltCompilePattern+set}" = set; then
 -        { $as_echo "$as_me:$LINENO: checking for -lxslt" >&5
 -$as_echo_n "checking for -lxslt... " >&6; }
++        { echo "$as_me:$LINENO: checking for -lxslt" >&5
++echo $ECHO_N "checking for -lxslt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_xslt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
+   ac_check_soname_save_LIBS=$LIBS
  LIBS="-lxslt $ac_xslt_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@@ -12158,148 -12693,62 +12161,58 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_xslt_xsltCompilePattern=yes
+   case "$LIBEXT" in
+     dll) ;;
+     dylib) ac_cv_lib_soname_xslt=`otool -L conftest$ac_exeext | grep "libxslt\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libxslt\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+     *) ac_cv_lib_soname_xslt=`$ac_cv_path_LDD conftest$ac_exeext | grep "libxslt\\.$LIBEXT" | sed -e "s/^.*\(libxslt\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
+   esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	ac_cv_lib_xslt_xsltCompilePattern=no
+ 
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+   LIBS=$ac_check_soname_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCompilePattern" >&5
- echo "${ECHO_T}$ac_cv_lib_xslt_xsltCompilePattern" >&6; }
- if test $ac_cv_lib_xslt_xsltCompilePattern = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBXSLT 1
- _ACEOF
- 
-              XSLTLIBS="$ac_xslt_libs"
-              XSLTINCL="$ac_xslt_cflags"
-              ac_save_LIBS="$LIBS"
-              LIBS="$LIBS $ac_xslt_libs"
- 
- for ac_func in xsltInit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define $ac_func innocuous_$ac_func
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- 
- #undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
- #endif
+ if test "x$ac_cv_lib_soname_xslt" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
++  { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
  
- int
- main ()
- {
- return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_xslt" >&5
 -$as_echo "$ac_cv_lib_soname_xslt" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_xslt" >&5
++echo "${ECHO_T}$ac_cv_lib_soname_xslt" >&6; }
  
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBXSLT "$ac_cv_lib_soname_xslt"
  _ACEOF
  
- fi
- done
- 
-              LIBS="$ac_save_LIBS"
+        XSLTINCL="$ac_xslt_cflags"
  fi
  
      fi
  fi
- if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then
+ if test "x$ac_cv_lib_soname_xslt" = "x"; then
    case "x$with_xslt" in
    x)   wine_warnings="$wine_warnings|libxslt ${notice_platform}development files not found, xslt won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libxslt ${notice_platform}development files not found, xslt won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libxslt ${notice_platform}development files not found, xslt won't be supported.
  This is an error since --with-xslt was requested." >&5
 -$as_echo "$as_me: error: libxslt ${notice_platform}development files not found, xslt won't be supported.
 +echo "$as_me: error: libxslt ${notice_platform}development files not found, xslt won't be supported.
  This is an error since --with-xslt was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -12318,20 -12767,21 +12231,20 @@@ the
  
  for ac_header in dbus/dbus.h hal/libhal.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -12347,32 -12797,33 +12260,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -12386,51 -12837,52 +12299,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -12439,21 -12891,24 +12352,21 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -12462,10 -12917,10 +12375,10 @@@ don
  
      if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
      then
 -        { $as_echo "$as_me:$LINENO: checking for dbus_connection_close in -ldbus-1" >&5
 -$as_echo_n "checking for dbus_connection_close in -ldbus-1... " >&6; }
 +        { echo "$as_me:$LINENO: checking for dbus_connection_close in -ldbus-1" >&5
 +echo $ECHO_N "checking for dbus_connection_close in -ldbus-1... $ECHO_C" >&6; }
  if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbus-1 $ac_hal_libs $LIBS"
@@@ -12497,37 -12952,41 +12410,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_dbus_1_dbus_connection_close=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dbus_1_dbus_connection_close=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5
 -$as_echo "$ac_cv_lib_dbus_1_dbus_connection_close" >&6; }
 -if test "x$ac_cv_lib_dbus_1_dbus_connection_close" = x""yes; then
 -  { $as_echo "$as_me:$LINENO: checking for -lhal" >&5
 -$as_echo_n "checking for -lhal... " >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5
 +echo "${ECHO_T}$ac_cv_lib_dbus_1_dbus_connection_close" >&6; }
 +if test $ac_cv_lib_dbus_1_dbus_connection_close = yes; then
 +  { echo "$as_me:$LINENO: checking for -lhal" >&5
 +echo $ECHO_N "checking for -lhal... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_hal+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lhal $ac_hal_libs $LIBS"
@@@ -12559,41 -13018,45 +12472,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_hal=`otool -L conftest$ac_exeext | grep "libhal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libhal\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest$ac_exeext | grep "libhal\\.$LIBEXT" | sed -e "s/^.*\(libhal\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_hal" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5
 -$as_echo "$ac_cv_lib_soname_hal" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_hal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBHAL "$ac_cv_lib_soname_hal"
@@@ -12611,9 -13074,9 +12524,9 @@@ if test "x$ac_cv_lib_soname_hal" = "x"
    case "x$with_hal" in
    x)   wine_notices="$wine_notices|libhal ${notice_platform}development files not found, no dynamic device support." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libhal ${notice_platform}development files not found, no dynamic device support.
 +  *)   { { echo "$as_me:$LINENO: error: libhal ${notice_platform}development files not found, no dynamic device support.
  This is an error since --with-hal was requested." >&5
 -$as_echo "$as_me: error: libhal ${notice_platform}development files not found, no dynamic device support.
 +echo "$as_me: error: libhal ${notice_platform}development files not found, no dynamic device support.
  This is an error since --with-hal was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -12627,17 -13090,17 +12540,17 @@@ the
      ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
      CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
      if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
 -  { $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
 -$as_echo_n "checking for gnutls/gnutls.h... " >&6; }
 +  { echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
 +echo $ECHO_N "checking for gnutls/gnutls.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5
 -$as_echo "$ac_cv_header_gnutls_gnutls_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5
 +echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking gnutls/gnutls.h usability" >&5
 -$as_echo_n "checking gnutls/gnutls.h usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking gnutls/gnutls.h usability" >&5
 +echo $ECHO_N "checking gnutls/gnutls.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -12653,32 -13116,33 +12566,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking gnutls/gnutls.h presence" >&5
 -$as_echo_n "checking gnutls/gnutls.h presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking gnutls/gnutls.h presence" >&5
 +echo $ECHO_N "checking gnutls/gnutls.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -12692,51 -13156,52 +12605,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -12745,18 -13210,18 +12658,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
 -$as_echo_n "checking for gnutls/gnutls.h... " >&6; }
 +{ echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
 +echo $ECHO_N "checking for gnutls/gnutls.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_gnutls_gnutls_h=$ac_header_preproc
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5
 -$as_echo "$ac_cv_header_gnutls_gnutls_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5
 +echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; }
  
  fi
 -if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then
 +if test $ac_cv_header_gnutls_gnutls_h = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -12778,21 -13243,22 +12691,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  { $as_echo "$as_me:$LINENO: checking for -lgnutls" >&5
 -$as_echo_n "checking for -lgnutls... " >&6; }
 +  { echo "$as_me:$LINENO: checking for -lgnutls" >&5
 +echo $ECHO_N "checking for -lgnutls... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_gnutls+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lgnutls $ac_gnutls_libs $LIBS"
@@@ -12824,41 -13290,45 +12737,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libgnutls\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_gnutls=`$ac_cv_path_LDD conftest$ac_exeext | grep "libgnutls\\.$LIBEXT" | sed -e "s/^.*\(libgnutls\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_gnutls" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_gnutls" >&5
 -$as_echo "$ac_cv_lib_soname_gnutls" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_gnutls" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_gnutls" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBGNUTLS "$ac_cv_lib_soname_gnutls"
@@@ -12869,7 -13339,7 +12782,7 @@@ _ACEO
  fi
  
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -12885,9 -13355,9 +12798,9 @@@ if test "x$ac_cv_lib_soname_gnutls" = "
    case "x$with_gnutls" in
    x)   wine_notices="$wine_notices|libgnutls ${notice_platform}development files not found, no schannel support." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libgnutls ${notice_platform}development files not found, no schannel support.
 +  *)   { { echo "$as_me:$LINENO: error: libgnutls ${notice_platform}development files not found, no schannel support.
  This is an error since --with-gnutls was requested." >&5
 -$as_echo "$as_me: error: libgnutls ${notice_platform}development files not found, no schannel support.
 +echo "$as_me: error: libgnutls ${notice_platform}development files not found, no schannel support.
  This is an error since --with-gnutls was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -12897,10 -13367,10 +12810,10 @@@ f
  CURSESLIBS=""
  if test "$ac_cv_header_ncurses_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lncurses" >&5
 -$as_echo_n "checking for -lncurses... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lncurses" >&5
 +echo $ECHO_N "checking for -lncurses... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_ncurses+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lncurses  $LIBS"
@@@ -12932,41 -13402,45 +12845,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_ncurses=`otool -L conftest$ac_exeext | grep "libncurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libncurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest$ac_exeext | grep "libncurses\\.$LIBEXT" | sed -e "s/^.*\(libncurses\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_ncurses" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ncurses" >&5
 -$as_echo "$ac_cv_lib_soname_ncurses" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ncurses" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_ncurses" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBNCURSES "$ac_cv_lib_soname_ncurses"
@@@ -12977,10 -13451,10 +12890,10 @@@ f
  
  elif test "$ac_cv_header_curses_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lcurses" >&5
 -$as_echo_n "checking for -lcurses... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lcurses" >&5
 +echo $ECHO_N "checking for -lcurses... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_curses+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcurses  $LIBS"
@@@ -13012,41 -13486,45 +12925,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_curses=`otool -L conftest$ac_exeext | grep "libcurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_curses=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcurses\\.$LIBEXT" | sed -e "s/^.*\(libcurses\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_curses" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_curses" >&5
 -$as_echo "$ac_cv_lib_soname_curses" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_curses" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_curses" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBCURSES "$ac_cv_lib_soname_curses"
@@@ -13061,11 -13539,11 +12974,11 @@@ LIBS="$LIBS $CURSESLIBS
  
  for ac_func in mousemask
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13118,35 -13596,42 +13031,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -13157,9 -13642,9 +13070,9 @@@ if test "x$ac_cv_lib_soname_curses$ac_c
    case "x$with_curses" in
    x)   wine_notices="$wine_notices|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: lib(n)curses ${notice_platform}development files not found, curses won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: lib(n)curses ${notice_platform}development files not found, curses won't be supported.
  This is an error since --with-curses was requested." >&5
 -$as_echo "$as_me: error: lib(n)curses ${notice_platform}development files not found, curses won't be supported.
 +echo "$as_me: error: lib(n)curses ${notice_platform}development files not found, curses won't be supported.
  This is an error since --with-curses was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -13168,10 -13653,10 +13081,10 @@@ f
  
  # Extract the first word of "sane-config", so it can be a program name with args.
  set dummy sane-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_sane_devel+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$sane_devel"; then
    ac_cv_prog_sane_devel="$sane_devel" # Let the user override the test.
@@@ -13184,7 -13669,7 +13097,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_sane_devel="sane-config"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -13196,11 -13681,11 +13109,11 @@@ f
  fi
  sane_devel=$ac_cv_prog_sane_devel
  if test -n "$sane_devel"; then
 -  { $as_echo "$as_me:$LINENO: result: $sane_devel" >&5
 -$as_echo "$sane_devel" >&6; }
 +  { echo "$as_me:$LINENO: result: $sane_devel" >&5
 +echo "${ECHO_T}$sane_devel" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -13211,17 -13696,17 +13124,17 @@@ the
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $ac_sane_incl"
      if test "${ac_cv_header_sane_sane_h+set}" = set; then
 -  { $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
 -$as_echo_n "checking for sane/sane.h... " >&6; }
 +  { echo "$as_me:$LINENO: checking for sane/sane.h" >&5
 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_sane_sane_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
 -$as_echo "$ac_cv_header_sane_sane_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
 -$as_echo_n "checking sane/sane.h usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
 +echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -13237,32 -13722,33 +13150,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
 -$as_echo_n "checking sane/sane.h presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
 +echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -13276,51 -13762,52 +13189,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -13329,22 -13816,22 +13242,22 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
 -$as_echo_n "checking for sane/sane.h... " >&6; }
 +{ echo "$as_me:$LINENO: checking for sane/sane.h" >&5
 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_sane_sane_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_sane_sane_h=$ac_header_preproc
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
 -$as_echo "$ac_cv_header_sane_sane_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; }
  
  fi
 -if test "x$ac_cv_header_sane_sane_h" = x""yes; then
 -  { $as_echo "$as_me:$LINENO: checking for -lsane" >&5
 -$as_echo_n "checking for -lsane... " >&6; }
 +if test $ac_cv_header_sane_sane_h = yes; then
 +  { echo "$as_me:$LINENO: checking for -lsane" >&5
 +echo $ECHO_N "checking for -lsane... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_sane+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lsane $ac_sane_libs $LIBS"
@@@ -13376,41 -13863,45 +13289,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_sane=`otool -L conftest$ac_exeext | grep "libsane\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libsane\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_sane=`$ac_cv_path_LDD conftest$ac_exeext | grep "libsane\\.$LIBEXT" | sed -e "s/^.*\(libsane\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_sane" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_sane" >&5
 -$as_echo "$ac_cv_lib_soname_sane" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_sane" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_sane" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBSANE "$ac_cv_lib_soname_sane"
@@@ -13429,9 -13920,9 +13342,9 @@@ if test "x$ac_cv_lib_soname_sane" = "x"
    case "x$with_sane" in
    x)   wine_notices="$wine_notices|libsane ${notice_platform}development files not found, scanners won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libsane ${notice_platform}development files not found, scanners won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libsane ${notice_platform}development files not found, scanners won't be supported.
  This is an error since --with-sane was requested." >&5
 -$as_echo "$as_me: error: libsane ${notice_platform}development files not found, scanners won't be supported.
 +echo "$as_me: error: libsane ${notice_platform}development files not found, scanners won't be supported.
  This is an error since --with-sane was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -13440,10 -13931,10 +13353,10 @@@ f
  
  # Extract the first word of "gphoto2-config", so it can be a program name with args.
  set dummy gphoto2-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_gphoto2_devel+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$gphoto2_devel"; then
    ac_cv_prog_gphoto2_devel="$gphoto2_devel" # Let the user override the test.
@@@ -13456,7 -13947,7 +13369,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_gphoto2_devel="gphoto2-config"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -13468,20 -13959,20 +13381,20 @@@ f
  fi
  gphoto2_devel=$ac_cv_prog_gphoto2_devel
  if test -n "$gphoto2_devel"; then
 -  { $as_echo "$as_me:$LINENO: result: $gphoto2_devel" >&5
 -$as_echo "$gphoto2_devel" >&6; }
 +  { echo "$as_me:$LINENO: result: $gphoto2_devel" >&5
 +echo "${ECHO_T}$gphoto2_devel" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
  # Extract the first word of "gphoto2-port-config", so it can be a program name with args.
  set dummy gphoto2-port-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_gphoto2port_devel+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$gphoto2port_devel"; then
    ac_cv_prog_gphoto2port_devel="$gphoto2port_devel" # Let the user override the test.
@@@ -13494,7 -13985,7 +13407,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_gphoto2port_devel="gphoto2-port-config"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -13506,11 -13997,11 +13419,11 @@@ f
  fi
  gphoto2port_devel=$ac_cv_prog_gphoto2port_devel
  if test -n "$gphoto2port_devel"; then
 -  { $as_echo "$as_me:$LINENO: result: $gphoto2port_devel" >&5
 -$as_echo "$gphoto2port_devel" >&6; }
 +  { echo "$as_me:$LINENO: result: $gphoto2port_devel" >&5
 +echo "${ECHO_T}$gphoto2port_devel" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -13528,17 -14019,17 +13441,17 @@@ the
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl"
      if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
 -  { $as_echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5
 -$as_echo_n "checking for gphoto2-camera.h... " >&6; }
 +  { echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5
 +echo $ECHO_N "checking for gphoto2-camera.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gphoto2_camera_h" >&5
 -$as_echo "$ac_cv_header_gphoto2_camera_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gphoto2_camera_h" >&5
 +echo "${ECHO_T}$ac_cv_header_gphoto2_camera_h" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking gphoto2-camera.h usability" >&5
 -$as_echo_n "checking gphoto2-camera.h usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking gphoto2-camera.h usability" >&5
 +echo $ECHO_N "checking gphoto2-camera.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -13554,32 -14045,33 +13467,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking gphoto2-camera.h presence" >&5
 -$as_echo_n "checking gphoto2-camera.h presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking gphoto2-camera.h presence" >&5
 +echo $ECHO_N "checking gphoto2-camera.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -13593,51 -14085,52 +13506,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: gphoto2-camera.h: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: gphoto2-camera.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: gphoto2-camera.h: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -13646,22 -14139,22 +13559,22 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5
 -$as_echo_n "checking for gphoto2-camera.h... " >&6; }
 +{ echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5
 +echo $ECHO_N "checking for gphoto2-camera.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_gphoto2_camera_h=$ac_header_preproc
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gphoto2_camera_h" >&5
 -$as_echo "$ac_cv_header_gphoto2_camera_h" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gphoto2_camera_h" >&5
 +echo "${ECHO_T}$ac_cv_header_gphoto2_camera_h" >&6; }
  
  fi
 -if test "x$ac_cv_header_gphoto2_camera_h" = x""yes; then
 -  { $as_echo "$as_me:$LINENO: checking for gp_camera_new in -lgphoto2" >&5
 -$as_echo_n "checking for gp_camera_new in -lgphoto2... " >&6; }
 +if test $ac_cv_header_gphoto2_camera_h = yes; then
 +  { echo "$as_me:$LINENO: checking for gp_camera_new in -lgphoto2" >&5
 +echo $ECHO_N "checking for gp_camera_new in -lgphoto2... $ECHO_C" >&6; }
  if test "${ac_cv_lib_gphoto2_gp_camera_new+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgphoto2 $ac_gphoto2_libs $LIBS"
@@@ -13693,33 -14186,37 +13606,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_gphoto2_gp_camera_new=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_gphoto2_gp_camera_new=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gphoto2_gp_camera_new" >&5
 -$as_echo "$ac_cv_lib_gphoto2_gp_camera_new" >&6; }
 -if test "x$ac_cv_lib_gphoto2_gp_camera_new" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gphoto2_gp_camera_new" >&5
 +echo "${ECHO_T}$ac_cv_lib_gphoto2_gp_camera_new" >&6; }
 +if test $ac_cv_lib_gphoto2_gp_camera_new = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_GPHOTO2 1
@@@ -13740,9 -14237,9 +13653,9 @@@ if test "$ac_cv_lib_gphoto2_gp_camera_n
    case "x$with_gphoto" in
    x)   wine_notices="$wine_notices|libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
  This is an error since --with-gphoto was requested." >&5
 -$as_echo "$as_me: error: libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
 +echo "$as_me: error: libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
  This is an error since --with-gphoto was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -13754,10 -14251,10 +13667,10 @@@ RESOLVLIBS="
  
  if test "$ac_cv_header_resolv_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
 -$as_echo_n "checking for res_query in -lresolv... " >&6; }
 +    { echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
 +echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6; }
  if test "${ac_cv_lib_resolv_res_query+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lresolv  $LIBS"
@@@ -13789,33 -14286,37 +13702,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_resolv_res_query=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_resolv_res_query=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
 -$as_echo "$ac_cv_lib_resolv_res_query" >&6; }
 -if test "x$ac_cv_lib_resolv_res_query" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
 +echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6; }
 +if test $ac_cv_lib_resolv_res_query = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RESOLV 1
@@@ -13830,10 -14331,10 +13743,10 @@@ LCMSLIBS="
  
  if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
 -$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
 +    { echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
 +echo $ECHO_N "checking for cmsOpenProfileFromFile in -llcms... $ECHO_C" >&6; }
  if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-llcms  $LIBS"
@@@ -13865,33 -14366,37 +13778,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_lcms_cmsOpenProfileFromFile=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
 -$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
 -if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
 +echo "${ECHO_T}$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
 +if test $ac_cv_lib_lcms_cmsOpenProfileFromFile = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LCMS 1
@@@ -13905,9 -14410,9 +13818,9 @@@ if test "$ac_cv_lib_lcms_cmsOpenProfile
    case "x$with_cms" in
    x)   wine_notices="$wine_notices|liblcms ${notice_platform}development files not found, Color Management won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: liblcms ${notice_platform}development files not found, Color Management won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: liblcms ${notice_platform}development files not found, Color Management won't be supported.
  This is an error since --with-cms was requested." >&5
 -$as_echo "$as_me: error: liblcms ${notice_platform}development files not found, Color Management won't be supported.
 +echo "$as_me: error: liblcms ${notice_platform}development files not found, Color Management won't be supported.
  This is an error since --with-cms was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -13918,10 -14423,10 +13831,10 @@@ for ac_prog in freetype-config freetype
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ft_devel+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test -n "$ft_devel"; then
    ac_cv_prog_ft_devel="$ft_devel" # Let the user override the test.
@@@ -13934,7 -14439,7 +13847,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ft_devel="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -13945,11 -14450,11 +13858,11 @@@ f
  fi
  ft_devel=$ac_cv_prog_ft_devel
  if test -n "$ft_devel"; then
 -  { $as_echo "$as_me:$LINENO: result: $ft_devel" >&5
 -$as_echo "$ft_devel" >&6; }
 +  { echo "$as_me:$LINENO: result: $ft_devel" >&5
 +echo "${ECHO_T}$ft_devel" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -13961,10 -14466,10 +13874,10 @@@ if test "$ft_devel" != "false" -a "x$wi
  then
      ac_freetype_libs=`$ft_devel --libs`
      ac_freetype_incl=`$ft_devel --cflags`
 -    { $as_echo "$as_me:$LINENO: checking for -lfreetype" >&5
 -$as_echo_n "checking for -lfreetype... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lfreetype" >&5
 +echo $ECHO_N "checking for -lfreetype... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_freetype+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfreetype $ac_freetype_libs $LIBS"
@@@ -13996,41 -14501,45 +13909,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_freetype=`otool -L conftest$ac_exeext | grep "libfreetype\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfreetype\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfreetype\\.$LIBEXT" | sed -e "s/^.*\(libfreetype\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_freetype" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
         ft_lib=no
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
 -$as_echo "$ac_cv_lib_soname_freetype" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_freetype" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype"
@@@ -14068,11 -14577,11 +13981,11 @@@ for ac_header in ft2build.h 
                           freetype/ftmodapi.h \
                           freetype/internal/sfnt.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14092,20 -14601,21 +14005,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -14113,12 -14623,15 +14026,12 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -14139,13 -14652,14 +14052,13 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -14157,18 -14671,54 +14070,18 @@@ _ACEO
  
                      wine_cv_fttrigon=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    wine_cv_fttrigon=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -        { $as_echo "$as_me:$LINENO: checking for FT_TrueTypeEngineType" >&5
 -$as_echo_n "checking for FT_TrueTypeEngineType... " >&6; }
 +        { echo "$as_me:$LINENO: checking for FT_TrueTypeEngineType" >&5
 +echo $ECHO_N "checking for FT_TrueTypeEngineType... $ECHO_C" >&6; }
  if test "${ac_cv_type_FT_TrueTypeEngineType+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_FT_TrueTypeEngineType=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <freetype/ftmodapi.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (FT_TrueTypeEngineType))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -14177,14 -14727,11 +14090,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  /* end confdefs.h.  */
  #include <freetype/ftmodapi.h>
  
 +typedef FT_TrueTypeEngineType ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((FT_TrueTypeEngineType)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -14195,30 -14742,39 +14108,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 +  ac_cv_type_FT_TrueTypeEngineType=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_FT_TrueTypeEngineType=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
 +	ac_cv_type_FT_TrueTypeEngineType=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_FT_TrueTypeEngineType" >&5
 -$as_echo "$ac_cv_type_FT_TrueTypeEngineType" >&6; }
 -if test "x$ac_cv_type_FT_TrueTypeEngineType" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_FT_TrueTypeEngineType" >&5
 +echo "${ECHO_T}$ac_cv_type_FT_TrueTypeEngineType" >&6; }
 +if test $ac_cv_type_FT_TrueTypeEngineType = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FT_TRUETYPEENGINETYPE 1
@@@ -14232,11 -14788,11 +14145,11 @@@ f
  
  for ac_func in FT_Load_Sfnt_Table
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14289,35 -14845,42 +14202,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -14342,10 -14905,10 +14255,10 @@@ f
  if test "x$FREETYPELIBS" = "x"; then
    case "x$with_freetype" in
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: FreeType development files not found.
 +  *)   { { echo "$as_me:$LINENO: error: FreeType development files not found.
  Fonts will not be built. Dialog text may be invisible or unaligned.
  Use the --without-freetype option if you really want this." >&5
 -$as_echo "$as_me: error: FreeType development files not found.
 +echo "$as_me: error: FreeType development files not found.
  Fonts will not be built. Dialog text may be invisible or unaligned.
  Use the --without-freetype option if you really want this." >&2;}
     { (exit 1); exit 1; }; } ;;
@@@ -14354,10 -14917,10 +14267,10 @@@ f
  
  test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no}
  
 -{ $as_echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5
 -$as_echo_n "checking for parport header/ppdev.h... " >&6; }
 +{ echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5
 +echo $ECHO_N "checking for parport header/ppdev.h... $ECHO_C" >&6; }
  if test "${ac_cv_c_ppdev+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14380,20 -14943,21 +14293,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_ppdev="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_ppdev="no"
@@@ -14401,8 -14965,8 +14314,8 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_ppdev" >&5
 -$as_echo "$ac_cv_c_ppdev" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_ppdev" >&5
 +echo "${ECHO_T}$ac_cv_c_ppdev" >&6; }
  if test "$ac_cv_c_ppdev" = "yes"
  then
  
@@@ -14412,10 -14976,10 +14325,10 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for va_copy" >&5
 -$as_echo_n "checking for va_copy... " >&6; }
 +{ echo "$as_me:$LINENO: checking for va_copy" >&5
 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
  if test "${ac_cv_c_va_copy+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14438,32 -15002,36 +14351,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c_va_copy="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_va_copy="no"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5
 -$as_echo "$ac_cv_c_va_copy" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_va_copy" >&5
 +echo "${ECHO_T}$ac_cv_c_va_copy" >&6; }
  if test "$ac_cv_c_va_copy" = "yes"
  then
  
@@@ -14472,10 -15040,10 +14385,10 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for __va_copy" >&5
 -$as_echo_n "checking for __va_copy... " >&6; }
 +{ echo "$as_me:$LINENO: checking for __va_copy" >&5
 +echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6; }
  if test "${ac_cv_c___va_copy+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14498,32 -15066,36 +14411,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c___va_copy="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c___va_copy="no"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5
 -$as_echo "$ac_cv_c___va_copy" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c___va_copy" >&5
 +echo "${ECHO_T}$ac_cv_c___va_copy" >&6; }
  if test "$ac_cv_c___va_copy" = "yes"
  then
  
@@@ -14533,11 -15105,48 +14446,11 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
 -$as_echo_n "checking for pthread_rwlock_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
 +echo $ECHO_N "checking for pthread_rwlock_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_pthread_rwlock_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#define _GNU_SOURCE
 -#include <pthread.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (pthread_rwlock_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -14547,14 -15156,11 +14460,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  #define _GNU_SOURCE
  #include <pthread.h>
  
 +typedef pthread_rwlock_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((pthread_rwlock_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -14565,30 -15171,39 +14478,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 +  ac_cv_type_pthread_rwlock_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_pthread_rwlock_t=yes
 +	ac_cv_type_pthread_rwlock_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
  fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
 -$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; }
 -if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
 +echo "${ECHO_T}$ac_cv_type_pthread_rwlock_t" >&6; }
 +if test $ac_cv_type_pthread_rwlock_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_PTHREAD_RWLOCK_T 1
@@@ -14596,11 -15211,48 +14509,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlockattr_t" >&5
 -$as_echo_n "checking for pthread_rwlockattr_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for pthread_rwlockattr_t" >&5
 +echo $ECHO_N "checking for pthread_rwlockattr_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_pthread_rwlockattr_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_pthread_rwlockattr_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#define _GNU_SOURCE
 -#include <pthread.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (pthread_rwlockattr_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -14610,14 -15262,11 +14523,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  #define _GNU_SOURCE
  #include <pthread.h>
  
 +typedef pthread_rwlockattr_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((pthread_rwlockattr_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -14628,30 -15277,39 +14541,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 +  ac_cv_type_pthread_rwlockattr_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_pthread_rwlockattr_t=yes
 +	ac_cv_type_pthread_rwlockattr_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
  fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlockattr_t" >&5
 -$as_echo "$ac_cv_type_pthread_rwlockattr_t" >&6; }
 -if test "x$ac_cv_type_pthread_rwlockattr_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlockattr_t" >&5
 +echo "${ECHO_T}$ac_cv_type_pthread_rwlockattr_t" >&6; }
 +if test $ac_cv_type_pthread_rwlockattr_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_PTHREAD_RWLOCKATTR_T 1
@@@ -14673,11 -15331,11 +14586,11 @@@ for ac_func in 
          pthread_get_stackaddr_np \
          pthread_get_stacksize_np
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14730,35 -15388,42 +14643,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -14768,10 -15433,10 +14681,10 @@@ LIBS="$ac_wine_check_funcs_save_LIBS
  
  # Extract the first word of "esd-config", so it can be a program name with args.
  set dummy esd-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_ESDCONFIG+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    case $ESDCONFIG in
    [\\/]* | ?:[\\/]*)
@@@ -14786,7 -15451,7 +14699,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ESDCONFIG="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -14798,11 -15463,11 +14711,11 @@@ esa
  fi
  ESDCONFIG=$ac_cv_path_ESDCONFIG
  if test -n "$ESDCONFIG"; then
 -  { $as_echo "$as_me:$LINENO: result: $ESDCONFIG" >&5
 -$as_echo "$ESDCONFIG" >&6; }
 +  { echo "$as_me:$LINENO: result: $ESDCONFIG" >&5
 +echo "${ECHO_T}$ESDCONFIG" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
  
@@@ -14818,10 -15483,10 +14731,10 @@@ the
      ac_esd_libs=`$ESDCONFIG --libs`
      save_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS $ac_esd_incl"
 -    { $as_echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5
 -$as_echo_n "checking for esd_open_sound in -lesd... " >&6; }
 +    { echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5
 +echo $ECHO_N "checking for esd_open_sound in -lesd... $ECHO_C" >&6; }
  if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lesd $ac_esd_libs $LIBS"
@@@ -14853,33 -15518,37 +14766,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_esd_esd_open_sound=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_esd_esd_open_sound=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_open_sound" >&5
 -$as_echo "$ac_cv_lib_esd_esd_open_sound" >&6; }
 -if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_open_sound" >&5
 +echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6; }
 +if test $ac_cv_lib_esd_esd_open_sound = yes; then
    ESDINCL="$ac_esd_incl"
  
           ESDLIBS="$ac_esd_libs"
@@@ -14898,10 -15567,10 +14811,10 @@@ ALSALIBS="
  
  if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for snd_pcm_hw_params_get_access in -lasound" >&5
 -$as_echo_n "checking for snd_pcm_hw_params_get_access in -lasound... " >&6; }
 +    { echo "$as_me:$LINENO: checking for snd_pcm_hw_params_get_access in -lasound" >&5
 +echo $ECHO_N "checking for snd_pcm_hw_params_get_access in -lasound... $ECHO_C" >&6; }
  if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lasound  $LIBS"
@@@ -14933,33 -15602,37 +14846,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_asound_snd_pcm_hw_params_get_access=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_asound_snd_pcm_hw_params_get_access=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&5
 -$as_echo "$ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&6; }
 -if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&5
 +echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_hw_params_get_access" >&6; }
 +if test $ac_cv_lib_asound_snd_pcm_hw_params_get_access = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -14985,13 -15658,14 +14898,13 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -15003,7 -15677,7 +14916,7 @@@ _ACEO
  
                           ALSALIBS="-lasound"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15018,10 -15692,10 +14931,10 @@@ AUDIOIOLIBS="
  
  if test "$ac_cv_header_libaudioio_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for AudioIOGetVersion in -laudioio" >&5
 -$as_echo_n "checking for AudioIOGetVersion in -laudioio... " >&6; }
 +    { echo "$as_me:$LINENO: checking for AudioIOGetVersion in -laudioio" >&5
 +echo $ECHO_N "checking for AudioIOGetVersion in -laudioio... $ECHO_C" >&6; }
  if test "${ac_cv_lib_audioio_AudioIOGetVersion+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-laudioio  $LIBS"
@@@ -15053,33 -15727,37 +14966,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_audioio_AudioIOGetVersion=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_audioio_AudioIOGetVersion=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audioio_AudioIOGetVersion" >&5
 -$as_echo "$ac_cv_lib_audioio_AudioIOGetVersion" >&6; }
 -if test "x$ac_cv_lib_audioio_AudioIOGetVersion" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_audioio_AudioIOGetVersion" >&5
 +echo "${ECHO_T}$ac_cv_lib_audioio_AudioIOGetVersion" >&6; }
 +if test $ac_cv_lib_audioio_AudioIOGetVersion = yes; then
    AUDIOIOLIBS="-laudioio"
  
  cat >>confdefs.h <<\_ACEOF
@@@ -15093,10 -15771,10 +15006,10 @@@ f
  
  if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lcapi20" >&5
 -$as_echo_n "checking for -lcapi20... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lcapi20" >&5
 +echo $ECHO_N "checking for -lcapi20... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_capi20+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcapi20  $LIBS"
@@@ -15128,41 -15806,45 +15041,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_capi20=`otool -L conftest$ac_exeext | grep "libcapi20\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcapi20\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_capi20=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcapi20\\.$LIBEXT" | sed -e "s/^.*\(libcapi20\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_capi20" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_capi20" >&5
 -$as_echo "$ac_cv_lib_soname_capi20" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_capi20" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_capi20" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBCAPI20 "$ac_cv_lib_soname_capi20"
@@@ -15176,9 -15858,9 +15089,9 @@@ if test "x$ac_cv_lib_soname_capi20" = "
    case "x$with_capi" in
    x)   wine_notices="$wine_notices|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
  This is an error since --with-capi was requested." >&5
 -$as_echo "$as_me: error: libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
 +echo "$as_me: error: libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
  This is an error since --with-capi was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -15196,20 -15878,21 +15109,20 @@@ the
  
  for ac_header in cups/cups.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -15225,32 -15908,33 +15138,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -15264,51 -15948,52 +15177,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -15317,26 -16002,29 +15230,26 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
 - { $as_echo "$as_me:$LINENO: checking for -lcups" >&5
 -$as_echo_n "checking for -lcups... " >&6; }
 + { echo "$as_me:$LINENO: checking for -lcups" >&5
 +echo $ECHO_N "checking for -lcups... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_cups+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcups $ac_cups_libs $LIBS"
@@@ -15368,41 -16056,45 +15281,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_cups=`otool -L conftest$ac_exeext | grep "libcups\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcups\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcups\\.$LIBEXT" | sed -e "s/^.*\(libcups\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_cups" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5
 -$as_echo "$ac_cv_lib_soname_cups" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_cups" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBCUPS "$ac_cv_lib_soname_cups"
@@@ -15421,9 -16113,9 +15334,9 @@@ if test "x$ac_cv_lib_soname_cups" = "x"
    case "x$with_cups" in
    x)   wine_notices="$wine_notices|libcups ${notice_platform}development files not found, CUPS won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libcups ${notice_platform}development files not found, CUPS won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libcups ${notice_platform}development files not found, CUPS won't be supported.
  This is an error since --with-cups was requested." >&5
 -$as_echo "$as_me: error: libcups ${notice_platform}development files not found, CUPS won't be supported.
 +echo "$as_me: error: libcups ${notice_platform}development files not found, CUPS won't be supported.
  This is an error since --with-cups was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -15432,10 -16124,10 +15345,10 @@@ f
  
  if test "$ac_cv_header_jack_jack_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -ljack" >&5
 -$as_echo_n "checking for -ljack... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -ljack" >&5
 +echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_jack+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-ljack  $LIBS"
@@@ -15467,41 -16159,45 +15380,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack-*[0-9.]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack-*[0-9.]*\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack-*[0-9.]*\\.$LIBEXT" | sed -e "s/^.*\(libjack-*[0-9.]*\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_jack" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
 -$as_echo "$ac_cv_lib_soname_jack" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
@@@ -15514,10 -16210,10 +15427,10 @@@ f
  
  if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lfontconfig" >&5
 -$as_echo_n "checking for -lfontconfig... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lfontconfig" >&5
 +echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfontconfig  $LIBS"
@@@ -15549,41 -16245,45 +15462,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*\(libfontconfig\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
 -$as_echo "$ac_cv_lib_soname_fontconfig" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig"
@@@ -15600,20 -16300,21 +15513,20 @@@ the
  
  for ac_header in fontconfig/fontconfig.h
  do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -15629,32 -16330,33 +15542,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_header_compiler=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -15668,51 -16370,52 +15581,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then
    ac_header_preproc=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    ac_header_preproc=no
  fi
  
  rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
      ( cat <<\_ASBOX
  ## ------------------------------------ ##
  ## Report this to wine-devel at winehq.org ##
@@@ -15721,21 -16424,24 +15634,21 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -15747,10 -16453,10 +15660,10 @@@ don
      then
          FONTCONFIGINCL="$X_CFLAGS"
  
 -        { $as_echo "$as_me:$LINENO: checking for -lfontconfig" >&5
 -$as_echo_n "checking for -lfontconfig... " >&6; }
 +        { echo "$as_me:$LINENO: checking for -lfontconfig" >&5
 +echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfontconfig $X_LIBS $LIBS"
@@@ -15782,41 -16488,45 +15695,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*\(libfontconfig\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
 -$as_echo "$ac_cv_lib_soname_fontconfig" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig"
@@@ -15831,9 -16541,9 +15744,9 @@@ if test "x$ac_cv_lib_soname_fontconfig
    case "x$with_fontconfig" in
    x)   wine_notices="$wine_notices|fontconfig ${notice_platform}development files not found, fontconfig won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
  This is an error since --with-fontconfig was requested." >&5
 -$as_echo "$as_me: error: fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
 +echo "$as_me: error: fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
  This is an error since --with-fontconfig was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -15842,10 -16552,10 +15755,10 @@@ f
  
  if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lssl" >&5
 -$as_echo_n "checking for -lssl... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lssl" >&5
 +echo $ECHO_N "checking for -lssl... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_ssl+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lssl  $LIBS"
@@@ -15877,41 -16587,45 +15790,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libssl\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep "libssl\\.$LIBEXT" | sed -e "s/^.*\(libssl\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_ssl" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
 -$as_echo "$ac_cv_lib_soname_ssl" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_ssl" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBSSL "$ac_cv_lib_soname_ssl"
@@@ -15920,10 -16634,10 +15833,10 @@@ _ACEO
  
  fi
  
 -    { $as_echo "$as_me:$LINENO: checking for -lcrypto" >&5
 -$as_echo_n "checking for -lcrypto... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lcrypto" >&5
 +echo $ECHO_N "checking for -lcrypto... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_crypto+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcrypto  $LIBS"
@@@ -15955,41 -16669,45 +15868,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcrypto\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcrypto\\.$LIBEXT" | sed -e "s/^.*\(libcrypto\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_crypto" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
 -$as_echo "$ac_cv_lib_soname_crypto" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_crypto" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto"
@@@ -16003,9 -16721,9 +15916,9 @@@ if test "x$ac_cv_lib_soname_ssl" = "x" 
    case "x$with_openssl" in
    x)   wine_warnings="$wine_warnings|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: OpenSSL ${notice_platform}development files not found, SSL won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: OpenSSL ${notice_platform}development files not found, SSL won't be supported.
  This is an error since --with-openssl was requested." >&5
 -$as_echo "$as_me: error: OpenSSL ${notice_platform}development files not found, SSL won't be supported.
 +echo "$as_me: error: OpenSSL ${notice_platform}development files not found, SSL won't be supported.
  This is an error since --with-openssl was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -16014,10 -16732,10 +15927,10 @@@ f
  
  if test "$ac_cv_header_jpeglib_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -ljpeg" >&5
 -$as_echo_n "checking for -ljpeg... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -ljpeg" >&5
 +echo $ECHO_N "checking for -ljpeg... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_jpeg+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-ljpeg  $LIBS"
@@@ -16049,41 -16767,45 +15962,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_jpeg=`otool -L conftest$ac_exeext | grep "libjpeg\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjpeg\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_jpeg=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjpeg\\.$LIBEXT" | sed -e "s/^.*\(libjpeg\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_jpeg" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jpeg" >&5
 -$as_echo "$ac_cv_lib_soname_jpeg" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jpeg" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_jpeg" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBJPEG "$ac_cv_lib_soname_jpeg"
@@@ -16097,9 -16819,9 +16010,9 @@@ if test "x$ac_cv_lib_soname_jpeg" = "x"
    case "x$with_jpeg" in
    x)   wine_warnings="$wine_warnings|libjpeg ${notice_platform}development files not found, JPEG won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libjpeg ${notice_platform}development files not found, JPEG won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libjpeg ${notice_platform}development files not found, JPEG won't be supported.
  This is an error since --with-jpeg was requested." >&5
 -$as_echo "$as_me: error: libjpeg ${notice_platform}development files not found, JPEG won't be supported.
 +echo "$as_me: error: libjpeg ${notice_platform}development files not found, JPEG won't be supported.
  This is an error since --with-jpeg was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -16108,10 -16830,10 +16021,10 @@@ f
  
  if test "$ac_cv_header_png_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for -lpng" >&5
 -$as_echo_n "checking for -lpng... " >&6; }
 +    { echo "$as_me:$LINENO: checking for -lpng" >&5
 +echo $ECHO_N "checking for -lpng... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_png+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lpng -lm $LIBS"
@@@ -16143,41 -16865,45 +16056,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_png=`otool -L conftest$ac_exeext | grep "libpng[0-9]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libpng[0-9]*\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_png=`$ac_cv_path_LDD conftest$ac_exeext | grep "libpng[0-9]*\\.$LIBEXT" | sed -e "s/^.*\(libpng[0-9]*\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_png" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_png" >&5
 -$as_echo "$ac_cv_lib_soname_png" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_png" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_png" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBPNG "$ac_cv_lib_soname_png"
@@@ -16191,19 -16917,19 +16104,19 @@@ if test "x$ac_cv_lib_soname_png" = "x"
    case "x$with_png" in
    x)   wine_warnings="$wine_warnings|libpng ${notice_platform}development files not found, PNG won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libpng ${notice_platform}development files not found, PNG won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libpng ${notice_platform}development files not found, PNG won't be supported.
  This is an error since --with-png was requested." >&5
 -$as_echo "$as_me: error: libpng ${notice_platform}development files not found, PNG won't be supported.
 +echo "$as_me: error: libpng ${notice_platform}development files not found, PNG won't be supported.
  This is an error since --with-png was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for -lodbc" >&5
 -$as_echo_n "checking for -lodbc... " >&6; }
 +{ echo "$as_me:$LINENO: checking for -lodbc" >&5
 +echo $ECHO_N "checking for -lodbc... $ECHO_C" >&6; }
  if test "${ac_cv_lib_soname_odbc+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lodbc  $LIBS"
@@@ -16235,44 -16961,48 +16148,44 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_odbc=`otool -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libodbc\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*\(libodbc\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
  if test "x$ac_cv_lib_soname_odbc" = "x"; then
 -  { $as_echo "$as_me:$LINENO: result: not found" >&5
 -$as_echo "not found" >&6; }
 +  { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
         cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBODBC "libodbc.$LIBEXT"
  _ACEOF
  
  else
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5
 -$as_echo "$ac_cv_lib_soname_odbc" >&6; }
 +  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5
 +echo "${ECHO_T}$ac_cv_lib_soname_odbc" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBODBC "$ac_cv_lib_soname_odbc"
@@@ -16298,10 -17028,10 +16211,10 @@@ if test "x${GCC}" = "xyes
  then
    EXTRACFLAGS="-Wall -pipe"
  
 -    { $as_echo "$as_me:$LINENO: checking for gcc strength-reduce bug" >&5
 -$as_echo_n "checking for gcc strength-reduce bug... " >&6; }
 +    { echo "$as_me:$LINENO: checking for gcc strength-reduce bug" >&5
 +echo $ECHO_N "checking for gcc strength-reduce bug... $ECHO_C" >&6; }
  if test "${ac_cv_c_gcc_strength_bug+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$cross_compiling" = yes; then
    ac_cv_c_gcc_strength_bug="yes"
@@@ -16333,46 -17063,49 +16246,46 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    { (case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_gcc_strength_bug="no"
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
  ac_cv_c_gcc_strength_bug="yes"
  fi
 -rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_gcc_strength_bug" >&5
 -$as_echo "$ac_cv_c_gcc_strength_bug" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_gcc_strength_bug" >&5
 +echo "${ECHO_T}$ac_cv_c_gcc_strength_bug" >&6; }
    if test "$ac_cv_c_gcc_strength_bug" = "yes"
    then
      EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
    fi
  
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fshort-wchar" >&5
 -$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -fshort-wchar" >&5
 +echo $ECHO_N "checking whether the compiler supports -fshort-wchar... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fshort_wchar+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fshort-wchar"
@@@ -16397,32 -17130,36 +16310,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fshort_wchar=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fshort_wchar=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fshort_wchar" >&5
 -$as_echo "$ac_cv_cflags__fshort_wchar" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fshort_wchar" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fshort_wchar" >&6; }
  if test $ac_cv_cflags__fshort_wchar = yes; then
  
  cat >>confdefs.h <<\_ACEOF
@@@ -16431,10 -17168,10 +16344,10 @@@ _ACEO
  
  fi
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5
 -$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -fno-builtin" >&5
 +echo $ECHO_N "checking whether the compiler supports -fno-builtin... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fno_builtin+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fno-builtin"
@@@ -16459,41 -17196,45 +16372,41 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fno_builtin=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fno_builtin=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fno_builtin" >&5
 -$as_echo "$ac_cv_cflags__fno_builtin" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fno_builtin" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fno_builtin" >&6; }
  if test $ac_cv_cflags__fno_builtin = yes; then
    BUILTINFLAG="-fno-builtin"
  
  fi
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fno-strict-aliasing" >&5
 -$as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -fno-strict-aliasing" >&5
 +echo $ECHO_N "checking whether the compiler supports -fno-strict-aliasing... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__fno_strict_aliasing+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fno-strict-aliasing"
@@@ -16518,40 -17259,44 +16431,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__fno_strict_aliasing=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__fno_strict_aliasing=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__fno_strict_aliasing" >&5
 -$as_echo "$ac_cv_cflags__fno_strict_aliasing" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__fno_strict_aliasing" >&5
 +echo "${ECHO_T}$ac_cv_cflags__fno_strict_aliasing" >&6; }
  if test $ac_cv_cflags__fno_strict_aliasing = yes; then
    EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
  fi
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -Wdeclaration-after-statement" >&5
 -$as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -Wdeclaration-after-statement" >&5
 +echo $ECHO_N "checking whether the compiler supports -Wdeclaration-after-statement... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__Wdeclaration_after_statement+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wdeclaration-after-statement"
@@@ -16576,40 -17321,44 +16489,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__Wdeclaration_after_statement=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__Wdeclaration_after_statement=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__Wdeclaration_after_statement" >&5
 -$as_echo "$ac_cv_cflags__Wdeclaration_after_statement" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wdeclaration_after_statement" >&5
 +echo "${ECHO_T}$ac_cv_cflags__Wdeclaration_after_statement" >&6; }
  if test $ac_cv_cflags__Wdeclaration_after_statement = yes; then
    EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement"
  fi
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -Wwrite-strings" >&5
 -$as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -Wwrite-strings" >&5
 +echo $ECHO_N "checking whether the compiler supports -Wwrite-strings... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wwrite-strings"
@@@ -16634,40 -17383,44 +16547,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__Wwrite_strings=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__Wwrite_strings=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__Wwrite_strings" >&5
 -$as_echo "$ac_cv_cflags__Wwrite_strings" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wwrite_strings" >&5
 +echo "${ECHO_T}$ac_cv_cflags__Wwrite_strings" >&6; }
  if test $ac_cv_cflags__Wwrite_strings = yes; then
    EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
  fi
  
 -  { $as_echo "$as_me:$LINENO: checking whether the compiler supports -Wtype-limits" >&5
 -$as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; }
 +  { echo "$as_me:$LINENO: checking whether the compiler supports -Wtype-limits" >&5
 +echo $ECHO_N "checking whether the compiler supports -Wtype-limits... $ECHO_C" >&6; }
  if test "${ac_cv_cflags__Wtype_limits+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wtype-limits"
@@@ -16692,32 -17445,36 +16605,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_cflags__Wtype_limits=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_cflags__Wtype_limits=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS=$ac_wine_try_cflags_saved
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags__Wtype_limits" >&5
 -$as_echo "$ac_cv_cflags__Wtype_limits" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wtype_limits" >&5
 +echo "${ECHO_T}$ac_cv_cflags__Wtype_limits" >&6; }
  if test $ac_cv_cflags__Wtype_limits = yes; then
    EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits"
  fi
@@@ -16725,10 -17482,10 +16638,10 @@@
  
      saved_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -Wpointer-arith -Werror"
 -  { $as_echo "$as_me:$LINENO: checking for broken string.h that generates warnings" >&5
 -$as_echo_n "checking for broken string.h that generates warnings... " >&6; }
 +  { echo "$as_me:$LINENO: checking for broken string.h that generates warnings" >&5
 +echo $ECHO_N "checking for broken string.h that generates warnings... $ECHO_C" >&6; }
  if test "${ac_cv_c_string_h_warnings+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -16751,20 -17508,21 +16664,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_string_h_warnings=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_string_h_warnings=yes
@@@ -16772,8 -17530,8 +16685,8 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_string_h_warnings" >&5
 -$as_echo "$ac_cv_c_string_h_warnings" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_string_h_warnings" >&5
 +echo "${ECHO_T}$ac_cv_c_string_h_warnings" >&6; }
    CFLAGS="$saved_CFLAGS"
    if test "$ac_cv_c_string_h_warnings" = "no"
    then
@@@ -16782,10 -17540,10 +16695,10 @@@
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5
 -$as_echo_n "checking how to define a function in assembly code... " >&6; }
 +{ echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5
 +echo $ECHO_N "checking how to define a function in assembly code... $ECHO_C" >&6; }
  if test "${ac_cv_asm_func_def+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -16808,21 -17566,24 +16721,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_asm_func_def=".def"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -16846,21 -17607,24 +16759,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_asm_func_def=".type @function"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -16884,39 -17648,45 +16797,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_asm_func_def=".type 2"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_asm_func_def="unknown"
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_asm_func_def" >&5
 -$as_echo "$ac_cv_asm_func_def" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_asm_func_def" >&5
 +echo "${ECHO_T}$ac_cv_asm_func_def" >&6; }
  
  
  
@@@ -16944,10 -17714,10 +16857,10 @@@ _ACEO
  esac
  
  
 -{ $as_echo "$as_me:$LINENO: checking whether external symbols need an underscore prefix" >&5
 -$as_echo_n "checking whether external symbols need an underscore prefix... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether external symbols need an underscore prefix" >&5
 +echo $ECHO_N "checking whether external symbols need an underscore prefix... $ECHO_C" >&6; }
  if test "${ac_cv_c_extern_prefix+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -16970,31 -17740,35 +16883,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_c_extern_prefix="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_extern_prefix="no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5
 -$as_echo "$ac_cv_c_extern_prefix" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5
 +echo "${ECHO_T}$ac_cv_c_extern_prefix" >&6; }
  
  
  
@@@ -17201,11 -17975,11 +17114,11 @@@ for ac_func in 
  	waitpid \
  
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -17258,35 -18032,42 +17171,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -17295,10 -18076,10 +17208,10 @@@ don
  
  if test "$ac_cv_func_dlopen" = no
  then
 -    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 -$as_echo_n "checking for dlopen in -ldl... " >&6; }
 +    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
@@@ -17330,33 -18111,37 +17243,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_dl_dlopen=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dl_dlopen=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 +if test $ac_cv_lib_dl_dlopen = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_DLOPEN 1
  _ACEOF
@@@ -17370,11 -18155,11 +17283,11 @@@ LIBS="$LIBS $LIBDL
  
  for ac_func in dladdr
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -17427,35 -18212,42 +17340,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -17465,10 -18257,10 +17378,10 @@@ LIBS="$ac_wine_check_funcs_save_LIBS
  
  if test "$ac_cv_func_poll" = no
  then
 -    { $as_echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
 -$as_echo_n "checking for poll in -lpoll... " >&6; }
 +    { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
 +echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
  if test "${ac_cv_lib_poll_poll+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpoll  $LIBS"
@@@ -17500,33 -18292,37 +17413,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_poll_poll=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_poll_poll=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
 -$as_echo "$ac_cv_lib_poll_poll" >&6; }
 -if test "x$ac_cv_lib_poll_poll" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
 +echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
 +if test $ac_cv_lib_poll_poll = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_POLL 1
  _ACEOF
@@@ -17536,10 -18332,10 +17449,10 @@@ f
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
 -$as_echo_n "checking for library containing gethostbyname... " >&6; }
 +{ echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
 +echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
  if test "${ac_cv_search_gethostbyname+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -17577,26 -18373,30 +17490,26 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_search_gethostbyname=$ac_res
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_gethostbyname+set}" = set; then
@@@ -17611,8 -18411,8 +17524,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
 -$as_echo "$ac_cv_search_gethostbyname" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
 +echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
  ac_res=$ac_cv_search_gethostbyname
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -17620,10 -18420,10 +17533,10 @@@
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5
 -$as_echo_n "checking for library containing connect... " >&6; }
 +{ echo "$as_me:$LINENO: checking for library containing connect" >&5
 +echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; }
  if test "${ac_cv_search_connect+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -17661,26 -18461,30 +17574,26 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_search_connect=$ac_res
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_connect+set}" = set; then
@@@ -17695,8 -18499,8 +17608,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
 -$as_echo "$ac_cv_search_connect" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
 +echo "${ECHO_T}$ac_cv_search_connect" >&6; }
  ac_res=$ac_cv_search_connect
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -17704,10 -18508,10 +17617,10 @@@
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
 -$as_echo_n "checking for library containing inet_aton... " >&6; }
 +{ echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
 +echo $ECHO_N "checking for library containing inet_aton... $ECHO_C" >&6; }
  if test "${ac_cv_search_inet_aton+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -17745,26 -18549,30 +17658,26 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_search_inet_aton=$ac_res
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_inet_aton+set}" = set; then
@@@ -17779,8 -18587,8 +17692,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
 -$as_echo "$ac_cv_search_inet_aton" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
 +echo "${ECHO_T}$ac_cv_search_inet_aton" >&6; }
  ac_res=$ac_cv_search_inet_aton
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -17807,11 -18615,11 +17720,11 @@@ for ac_func in 
  	sendmsg \
  
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -17864,35 -18672,42 +17777,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -17903,11 -18718,47 +17816,11 @@@ LDAPLIBS="
  
  if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
  then
 -    { $as_echo "$as_me:$LINENO: checking for LDAPSortKey" >&5
 -$as_echo_n "checking for LDAPSortKey... " >&6; }
 +    { echo "$as_me:$LINENO: checking for LDAPSortKey" >&5
 +echo $ECHO_N "checking for LDAPSortKey... $ECHO_C" >&6; }
  if test "${ac_cv_type_LDAPSortKey+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_LDAPSortKey=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <ldap.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (LDAPSortKey))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -17916,14 -18767,11 +17829,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  /* end confdefs.h.  */
  #include <ldap.h>
  
 +typedef LDAPSortKey ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((LDAPSortKey)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -17934,34 -18782,43 +17847,34 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_LDAPSortKey=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_LDAPSortKey=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_LDAPSortKey=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_LDAPSortKey" >&5
 -$as_echo "$ac_cv_type_LDAPSortKey" >&6; }
 -if test "x$ac_cv_type_LDAPSortKey" = x""yes; then
 -  { $as_echo "$as_me:$LINENO: checking for ldap_initialize in -lldap_r" >&5
 -$as_echo_n "checking for ldap_initialize in -lldap_r... " >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_LDAPSortKey" >&5
 +echo "${ECHO_T}$ac_cv_type_LDAPSortKey" >&6; }
 +if test $ac_cv_type_LDAPSortKey = yes; then
 +  { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap_r" >&5
 +echo $ECHO_N "checking for ldap_initialize in -lldap_r... $ECHO_C" >&6; }
  if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lldap_r $LIBPTHREAD $LIBS"
@@@ -17993,37 -18850,41 +17906,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_ldap_r_ldap_initialize=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_ldap_r_ldap_initialize=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5
 -$as_echo "$ac_cv_lib_ldap_r_ldap_initialize" >&6; }
 -if test "x$ac_cv_lib_ldap_r_ldap_initialize" = x""yes; then
 -  { $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
 -$as_echo_n "checking for ber_init in -llber... " >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5
 +echo "${ECHO_T}$ac_cv_lib_ldap_r_ldap_initialize" >&6; }
 +if test $ac_cv_lib_ldap_r_ldap_initialize = yes; then
 +  { echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
 +echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6; }
  if test "${ac_cv_lib_lber_ber_init+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-llber $LIBPTHREAD $LIBS"
@@@ -18055,33 -18916,37 +17968,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_lib_lber_ber_init=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_lber_ber_init=no
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5
 -$as_echo "$ac_cv_lib_lber_ber_init" >&6; }
 -if test "x$ac_cv_lib_lber_ber_init" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_lber_ber_init" >&6; }
 +if test $ac_cv_lib_lber_ber_init = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LDAP 1
@@@ -18114,11 -18979,11 +18027,11 @@@ for ac_func in 
  	ldap_parse_vlv_control \
  	ldap_parse_vlvresponse_control
  do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -18171,35 -19036,42 +18084,35 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    eval "$as_ac_var=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_var=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -18211,9 -19083,9 +18124,9 @@@ if test "x$LDAPLIBS" = "x"; the
    case "x$with_ldap" in
    x)   wine_notices="$wine_notices|libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported." ;;
    xno) ;;
 -  *)   { { $as_echo "$as_me:$LINENO: error: libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
 +  *)   { { echo "$as_me:$LINENO: error: libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
  This is an error since --with-ldap was requested." >&5
 -$as_echo "$as_me: error: libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
 +echo "$as_me: error: libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
  This is an error since --with-ldap was requested." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
@@@ -18221,10 -19093,10 +18134,10 @@@ f
  
  
  
 -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
  if test "${ac_cv_c_const+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -18296,20 -19168,21 +18209,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_const=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_const=no
@@@ -18317,20 -19190,20 +18230,20 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 -$as_echo "$ac_cv_c_const" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 +echo "${ECHO_T}$ac_cv_c_const" >&6; }
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
 -#define const /**/
 +#define const
  _ACEOF
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
 -$as_echo_n "checking for inline... " >&6; }
 +{ echo "$as_me:$LINENO: checking for inline" >&5
 +echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
  if test "${ac_cv_c_inline+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
@@@ -18353,20 -19226,21 +18266,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_inline=$ac_kw
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -18377,8 -19251,8 +18290,8 @@@ rm -f core conftest.err conftest.$ac_ob
  done
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 -$as_echo "$ac_cv_c_inline" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 +echo "${ECHO_T}$ac_cv_c_inline" >&6; }
  
  
  case $ac_cv_c_inline in
@@@ -18396,11 -19270,46 +18309,11 @@@ _ACEO
      ;;
  esac
  
 -{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
 -$as_echo_n "checking for mode_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for mode_t" >&5
 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_mode_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_mode_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (mode_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18408,14 -19317,11 +18321,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef mode_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((mode_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18426,30 -19332,39 +18339,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_mode_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_mode_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_mode_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 -$as_echo "$ac_cv_type_mode_t" >&6; }
 -if test "x$ac_cv_type_mode_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
 +if test $ac_cv_type_mode_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_MODE_T 1
@@@ -18457,11 -19372,46 +18370,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
 -$as_echo_n "checking for off_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for off_t" >&5
 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_off_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_off_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (off_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18469,14 -19419,11 +18382,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef off_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((off_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18487,30 -19434,39 +18400,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_off_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_off_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_off_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
 -$as_echo "$ac_cv_type_off_t" >&6; }
 -if test "x$ac_cv_type_off_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
 +echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
 +if test $ac_cv_type_off_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_OFF_T 1
@@@ -18518,11 -19474,46 +18431,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
 -$as_echo_n "checking for pid_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for pid_t" >&5
 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_pid_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_pid_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (pid_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18530,14 -19521,11 +18443,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef pid_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((pid_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18548,30 -19536,39 +18461,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 +  ac_cv_type_pid_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_pid_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
 +	ac_cv_type_pid_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 -$as_echo "$ac_cv_type_pid_t" >&6; }
 -if test "x$ac_cv_type_pid_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
 +if test $ac_cv_type_pid_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_PID_T 1
@@@ -18579,11 -19576,46 +18492,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
 -$as_echo_n "checking for size_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for size_t" >&5
 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_size_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_size_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (size_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18591,14 -19623,11 +18504,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef size_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((size_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18609,30 -19638,39 +18522,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_size_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_size_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_size_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 -$as_echo "$ac_cv_type_size_t" >&6; }
 -if test "x$ac_cv_type_size_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 +if test $ac_cv_type_size_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIZE_T 1
@@@ -18640,11 -19678,46 +18553,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
 -$as_echo_n "checking for ssize_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for ssize_t" >&5
 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_ssize_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_ssize_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (ssize_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18652,14 -19725,11 +18565,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef ssize_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((ssize_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18670,30 -19740,39 +18583,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_ssize_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_ssize_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_ssize_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 -$as_echo "$ac_cv_type_ssize_t" >&6; }
 -if test "x$ac_cv_type_ssize_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
 +if test $ac_cv_type_ssize_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SSIZE_T 1
@@@ -18701,11 -19780,46 +18614,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for long long" >&5
 -$as_echo_n "checking for long long... " >&6; }
 +{ echo "$as_me:$LINENO: checking for long long" >&5
 +echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
  if test "${ac_cv_type_long_long+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_long_long=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (long long))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18713,14 -19827,11 +18626,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef long long ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((long long)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18731,30 -19842,39 +18644,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_long_long=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_long_long=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_long_long=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 -$as_echo "$ac_cv_type_long_long" >&6; }
 -if test "x$ac_cv_type_long_long" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 +echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
 +if test $ac_cv_type_long_long = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_LONG_LONG 1
@@@ -18762,11 -19882,46 +18675,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for fsblkcnt_t" >&5
 -$as_echo_n "checking for fsblkcnt_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for fsblkcnt_t" >&5
 +echo $ECHO_N "checking for fsblkcnt_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_fsblkcnt_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_fsblkcnt_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (fsblkcnt_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18774,14 -19929,11 +18687,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef fsblkcnt_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((fsblkcnt_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18792,30 -19944,39 +18705,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_fsblkcnt_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_fsblkcnt_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_fsblkcnt_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_fsblkcnt_t" >&5
 -$as_echo "$ac_cv_type_fsblkcnt_t" >&6; }
 -if test "x$ac_cv_type_fsblkcnt_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_fsblkcnt_t" >&5
 +echo "${ECHO_T}$ac_cv_type_fsblkcnt_t" >&6; }
 +if test $ac_cv_type_fsblkcnt_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FSBLKCNT_T 1
@@@ -18823,11 -19984,46 +18736,11 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for fsfilcnt_t" >&5
 -$as_echo_n "checking for fsfilcnt_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for fsfilcnt_t" >&5
 +echo $ECHO_N "checking for fsfilcnt_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_fsfilcnt_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_fsfilcnt_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if (sizeof (fsfilcnt_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18835,14 -20031,11 +18748,14 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 +typedef fsfilcnt_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((fsfilcnt_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18853,30 -20046,39 +18766,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_fsfilcnt_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_fsfilcnt_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_fsfilcnt_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_fsfilcnt_t" >&5
 -$as_echo "$ac_cv_type_fsfilcnt_t" >&6; }
 -if test "x$ac_cv_type_fsfilcnt_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_fsfilcnt_t" >&5
 +echo "${ECHO_T}$ac_cv_type_fsfilcnt_t" >&6; }
 +if test $ac_cv_type_fsfilcnt_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FSFILCNT_T 1
@@@ -18885,11 -20087,48 +18798,11 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for sigset_t" >&5
 -$as_echo_n "checking for sigset_t... " >&6; }
 +{ echo "$as_me:$LINENO: checking for sigset_t" >&5
 +echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_sigset_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_sigset_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -#include <signal.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (sigset_t))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18899,14 -20138,11 +18812,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  #include <sys/types.h>
  #include <signal.h>
  
 +typedef sigset_t ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((sigset_t)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18917,30 -20153,39 +18830,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_sigset_t=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_sigset_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_sigset_t=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sigset_t" >&5
 -$as_echo "$ac_cv_type_sigset_t" >&6; }
 -if test "x$ac_cv_type_sigset_t" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_sigset_t" >&5
 +echo "${ECHO_T}$ac_cv_type_sigset_t" >&6; }
 +if test $ac_cv_type_sigset_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGSET_T 1
@@@ -18949,11 -20194,47 +18862,11 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for request_sense" >&5
 -$as_echo_n "checking for request_sense... " >&6; }
 +{ echo "$as_me:$LINENO: checking for request_sense" >&5
 +echo $ECHO_N "checking for request_sense... $ECHO_C" >&6; }
  if test "${ac_cv_type_request_sense+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_cv_type_request_sense=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <linux/cdrom.h>
 -
 -int
 -main ()
 -{
 -if (sizeof (request_sense))
 -       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -18962,14 -20243,11 +18875,14 @@@ cat >>conftest.$ac_ext <<_ACEO
  /* end confdefs.h.  */
  #include <linux/cdrom.h>
  
 +typedef request_sense ac__type_new_;
  int
  main ()
  {
 -if (sizeof ((request_sense)))
 -	  return 0;
 +if ((ac__type_new_ *) 0)
 +  return 0;
 +if (sizeof (ac__type_new_))
 +  return 0;
    ;
    return 0;
  }
@@@ -18980,30 -20258,39 +18893,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  :
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_request_sense=yes
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_request_sense=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -
 +	ac_cv_type_request_sense=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_request_sense" >&5
 -$as_echo "$ac_cv_type_request_sense" >&6; }
 -if test "x$ac_cv_type_request_sense" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_type_request_sense" >&5
 +echo "${ECHO_T}$ac_cv_type_request_sense" >&6; }
 +if test $ac_cv_type_request_sense = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_REQUEST_SENSE 1
@@@ -19013,10 -20300,10 +18926,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct ff_effect.direction" >&5
 -$as_echo_n "checking for struct ff_effect.direction... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct ff_effect.direction" >&5
 +echo $ECHO_N "checking for struct ff_effect.direction... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_ff_effect_direction+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19044,20 -20331,21 +18957,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_ff_effect_direction=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19086,20 -20374,21 +18999,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_ff_effect_direction=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_ff_effect_direction=no
@@@ -19110,9 -20399,9 +19023,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ff_effect_direction" >&5
 -$as_echo "$ac_cv_member_struct_ff_effect_direction" >&6; }
 -if test "x$ac_cv_member_struct_ff_effect_direction" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ff_effect_direction" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_ff_effect_direction" >&6; }
 +if test $ac_cv_member_struct_ff_effect_direction = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_FF_EFFECT_DIRECTION 1
@@@ -19122,10 -20411,10 +19035,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for sigaddset" >&5
 -$as_echo_n "checking for sigaddset... " >&6; }
 +{ echo "$as_me:$LINENO: checking for sigaddset" >&5
 +echo $ECHO_N "checking for sigaddset... $ECHO_C" >&6; }
  if test "${wine_cv_have_sigaddset+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19148,31 -20437,35 +19061,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    wine_cv_have_sigaddset=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	wine_cv_have_sigaddset=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $wine_cv_have_sigaddset" >&5
 -$as_echo "$wine_cv_have_sigaddset" >&6; }
 +{ echo "$as_me:$LINENO: result: $wine_cv_have_sigaddset" >&5
 +echo "${ECHO_T}$wine_cv_have_sigaddset" >&6; }
  if test "$wine_cv_have_sigaddset" = "yes"
  then
  
@@@ -19183,10 -20476,10 +19096,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking whether we can use re-entrant gethostbyname_r Linux style" >&5
 -$as_echo_n "checking whether we can use re-entrant gethostbyname_r Linux style... " >&6; }
 +{ echo "$as_me:$LINENO: checking whether we can use re-entrant gethostbyname_r Linux style" >&5
 +echo $ECHO_N "checking whether we can use re-entrant gethostbyname_r Linux style... $ECHO_C" >&6; }
  if test "${wine_cv_linux_gethostbyname_r_6+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19221,33 -20514,37 +19134,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    wine_cv_linux_gethostbyname_r_6=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	wine_cv_linux_gethostbyname_r_6=no
  
  fi
  
 -rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $wine_cv_linux_gethostbyname_r_6" >&5
 -$as_echo "$wine_cv_linux_gethostbyname_r_6" >&6; }
 +{ echo "$as_me:$LINENO: result: $wine_cv_linux_gethostbyname_r_6" >&5
 +echo "${ECHO_T}$wine_cv_linux_gethostbyname_r_6" >&6; }
     if test "$wine_cv_linux_gethostbyname_r_6" = "yes"
     then
  
@@@ -19259,10 -20556,10 +19172,10 @@@ _ACEO
  
  if test "$ac_cv_header_linux_joystick_h" = "yes"
  then
 -   { $as_echo "$as_me:$LINENO: checking whether linux/joystick.h uses the Linux 2.2+ API" >&5
 -$as_echo_n "checking whether linux/joystick.h uses the Linux 2.2+ API... " >&6; }
 +   { echo "$as_me:$LINENO: checking whether linux/joystick.h uses the Linux 2.2+ API" >&5
 +echo $ECHO_N "checking whether linux/joystick.h uses the Linux 2.2+ API... $ECHO_C" >&6; }
  if test "${wine_cv_linux_joystick_22_api+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19294,20 -20591,21 +19207,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    wine_cv_linux_joystick_22_api=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	wine_cv_linux_joystick_22_api=no
@@@ -19316,8 -20614,8 +19229,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $wine_cv_linux_joystick_22_api" >&5
 -$as_echo "$wine_cv_linux_joystick_22_api" >&6; }
 +{ echo "$as_me:$LINENO: result: $wine_cv_linux_joystick_22_api" >&5
 +echo "${ECHO_T}$wine_cv_linux_joystick_22_api" >&6; }
     if test "$wine_cv_linux_joystick_22_api" = "yes"
     then
  
@@@ -19329,10 -20627,10 +19242,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_bfree" >&5
 -$as_echo_n "checking for struct statfs.f_bfree... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_bfree" >&5
 +echo $ECHO_N "checking for struct statfs.f_bfree... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_bfree+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19370,20 -20668,21 +19283,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_bfree=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19422,20 -20721,21 +19335,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_bfree=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_bfree=no
@@@ -19446,9 -20746,9 +19359,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_bfree" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_bfree" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_bfree" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_bfree" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_bfree" >&6; }
 +if test $ac_cv_member_struct_statfs_f_bfree = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_BFREE 1
@@@ -19456,10 -20756,10 +19369,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_bavail" >&5
 -$as_echo_n "checking for struct statfs.f_bavail... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_bavail" >&5
 +echo $ECHO_N "checking for struct statfs.f_bavail... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_bavail+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19497,20 -20797,21 +19410,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_bavail=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19549,20 -20850,21 +19462,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_bavail=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_bavail=no
@@@ -19573,9 -20875,9 +19486,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_bavail" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_bavail" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_bavail" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_bavail" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_bavail" >&6; }
 +if test $ac_cv_member_struct_statfs_f_bavail = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_BAVAIL 1
@@@ -19583,10 -20885,10 +19496,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_frsize" >&5
 -$as_echo_n "checking for struct statfs.f_frsize... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_frsize" >&5
 +echo $ECHO_N "checking for struct statfs.f_frsize... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_frsize+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19624,20 -20926,21 +19537,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_frsize=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19676,20 -20979,21 +19589,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_frsize=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_frsize=no
@@@ -19700,9 -21004,9 +19613,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_frsize" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_frsize" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_frsize" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_frsize" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_frsize" >&6; }
 +if test $ac_cv_member_struct_statfs_f_frsize = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FRSIZE 1
@@@ -19710,10 -21014,10 +19623,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_ffree" >&5
 -$as_echo_n "checking for struct statfs.f_ffree... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_ffree" >&5
 +echo $ECHO_N "checking for struct statfs.f_ffree... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_ffree+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19751,20 -21055,21 +19664,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_ffree=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19803,20 -21108,21 +19716,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_ffree=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_ffree=no
@@@ -19827,9 -21133,9 +19740,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_ffree" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_ffree" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_ffree" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_ffree" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_ffree" >&6; }
 +if test $ac_cv_member_struct_statfs_f_ffree = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FFREE 1
@@@ -19837,10 -21143,10 +19750,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_favail" >&5
 -$as_echo_n "checking for struct statfs.f_favail... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_favail" >&5
 +echo $ECHO_N "checking for struct statfs.f_favail... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_favail+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19878,20 -21184,21 +19791,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_favail=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19930,20 -21237,21 +19843,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_favail=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_favail=no
@@@ -19954,9 -21262,9 +19867,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_favail" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_favail" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_favail" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_favail" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_favail" >&6; }
 +if test $ac_cv_member_struct_statfs_f_favail = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FAVAIL 1
@@@ -19964,10 -21272,10 +19877,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct statfs.f_namelen" >&5
 -$as_echo_n "checking for struct statfs.f_namelen... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statfs.f_namelen" >&5
 +echo $ECHO_N "checking for struct statfs.f_namelen... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statfs_f_namelen+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20005,20 -21313,21 +19918,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_namelen=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20057,20 -21366,21 +19970,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statfs_f_namelen=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statfs_f_namelen=no
@@@ -20081,9 -21391,9 +19994,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_namelen" >&5
 -$as_echo "$ac_cv_member_struct_statfs_f_namelen" >&6; }
 -if test "x$ac_cv_member_struct_statfs_f_namelen" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_namelen" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statfs_f_namelen" >&6; }
 +if test $ac_cv_member_struct_statfs_f_namelen = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_NAMELEN 1
@@@ -20093,10 -21403,10 +20006,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct statvfs.f_blocks" >&5
 -$as_echo_n "checking for struct statvfs.f_blocks... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct statvfs.f_blocks" >&5
 +echo $ECHO_N "checking for struct statvfs.f_blocks... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_statvfs_f_blocks+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20124,20 -21434,21 +20037,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statvfs_f_blocks=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20166,20 -21477,21 +20079,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_statvfs_f_blocks=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_statvfs_f_blocks=no
@@@ -20190,9 -21502,9 +20103,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_blocks" >&5
 -$as_echo "$ac_cv_member_struct_statvfs_f_blocks" >&6; }
 -if test "x$ac_cv_member_struct_statvfs_f_blocks" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_blocks" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_statvfs_f_blocks" >&6; }
 +if test $ac_cv_member_struct_statvfs_f_blocks = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATVFS_F_BLOCKS 1
@@@ -20202,10 -21514,10 +20115,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct msghdr.msg_accrights" >&5
 -$as_echo_n "checking for struct msghdr.msg_accrights... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct msghdr.msg_accrights" >&5
 +echo $ECHO_N "checking for struct msghdr.msg_accrights... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_msghdr_msg_accrights+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20237,20 -21549,21 +20150,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_msghdr_msg_accrights=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20283,20 -21596,21 +20196,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_msghdr_msg_accrights=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_msghdr_msg_accrights=no
@@@ -20307,9 -21621,9 +20220,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_msghdr_msg_accrights" >&5
 -$as_echo "$ac_cv_member_struct_msghdr_msg_accrights" >&6; }
 -if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_msghdr_msg_accrights" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_msghdr_msg_accrights" >&6; }
 +if test $ac_cv_member_struct_msghdr_msg_accrights = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1
@@@ -20317,10 -21631,10 +20230,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
 -$as_echo_n "checking for struct sockaddr.sa_len... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
 +echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20352,20 -21666,21 +20265,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_sa_len=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20398,20 -21713,21 +20311,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_sa_len=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_sockaddr_sa_len=no
@@@ -20422,9 -21738,9 +20335,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
 -$as_echo "$ac_cv_member_struct_sockaddr_sa_len" >&6; }
 -if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
 +if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
@@@ -20432,10 -21748,10 +20345,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5
 -$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5
 +echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20467,20 -21783,21 +20380,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_un_sun_len=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20513,20 -21830,21 +20426,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_un_sun_len=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_sockaddr_un_sun_len=no
@@@ -20537,9 -21855,9 +20450,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5
 -$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; }
 -if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; }
 +if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
@@@ -20549,10 -21867,10 +20462,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for scsireq_t.cmd" >&5
 -$as_echo_n "checking for scsireq_t.cmd... " >&6; }
 +{ echo "$as_me:$LINENO: checking for scsireq_t.cmd" >&5
 +echo $ECHO_N "checking for scsireq_t.cmd... $ECHO_C" >&6; }
  if test "${ac_cv_member_scsireq_t_cmd+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20581,20 -21899,21 +20494,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_scsireq_t_cmd=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20624,20 -21943,21 +20537,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_scsireq_t_cmd=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_scsireq_t_cmd=no
@@@ -20648,9 -21968,9 +20561,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_scsireq_t_cmd" >&5
 -$as_echo "$ac_cv_member_scsireq_t_cmd" >&6; }
 -if test "x$ac_cv_member_scsireq_t_cmd" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_scsireq_t_cmd" >&5
 +echo "${ECHO_T}$ac_cv_member_scsireq_t_cmd" >&6; }
 +if test $ac_cv_member_scsireq_t_cmd = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SCSIREQ_T_CMD 1
@@@ -20658,10 -21978,10 +20571,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for sg_io_hdr_t.interface_id" >&5
 -$as_echo_n "checking for sg_io_hdr_t.interface_id... " >&6; }
 +{ echo "$as_me:$LINENO: checking for sg_io_hdr_t.interface_id" >&5
 +echo $ECHO_N "checking for sg_io_hdr_t.interface_id... $ECHO_C" >&6; }
  if test "${ac_cv_member_sg_io_hdr_t_interface_id+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20690,20 -22010,21 +20603,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_sg_io_hdr_t_interface_id=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20733,20 -22054,21 +20646,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_sg_io_hdr_t_interface_id=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_sg_io_hdr_t_interface_id=no
@@@ -20757,9 -22079,9 +20670,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_sg_io_hdr_t_interface_id" >&5
 -$as_echo "$ac_cv_member_sg_io_hdr_t_interface_id" >&6; }
 -if test "x$ac_cv_member_sg_io_hdr_t_interface_id" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_sg_io_hdr_t_interface_id" >&5
 +echo "${ECHO_T}$ac_cv_member_sg_io_hdr_t_interface_id" >&6; }
 +if test $ac_cv_member_sg_io_hdr_t_interface_id = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SG_IO_HDR_T_INTERFACE_ID 1
@@@ -20769,10 -22091,10 +20682,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for siginfo_t.si_fd" >&5
 -$as_echo_n "checking for siginfo_t.si_fd... " >&6; }
 +{ echo "$as_me:$LINENO: checking for siginfo_t.si_fd" >&5
 +echo $ECHO_N "checking for siginfo_t.si_fd... $ECHO_C" >&6; }
  if test "${ac_cv_member_siginfo_t_si_fd+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20798,20 -22120,21 +20711,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_siginfo_t_si_fd=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20838,20 -22161,21 +20751,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_siginfo_t_si_fd=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_siginfo_t_si_fd=no
@@@ -20862,9 -22186,9 +20775,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_siginfo_t_si_fd" >&5
 -$as_echo "$ac_cv_member_siginfo_t_si_fd" >&6; }
 -if test "x$ac_cv_member_siginfo_t_si_fd" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_siginfo_t_si_fd" >&5
 +echo "${ECHO_T}$ac_cv_member_siginfo_t_si_fd" >&6; }
 +if test $ac_cv_member_siginfo_t_si_fd = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGINFO_T_SI_FD 1
@@@ -20874,10 -22198,10 +20787,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct mtget.mt_blksiz" >&5
 -$as_echo_n "checking for struct mtget.mt_blksiz... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct mtget.mt_blksiz" >&5
 +echo $ECHO_N "checking for struct mtget.mt_blksiz... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_mtget_mt_blksiz+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20906,20 -22230,21 +20819,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_blksiz=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -20949,20 -22274,21 +20862,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_blksiz=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_mtget_mt_blksiz=no
@@@ -20973,9 -22299,9 +20886,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blksiz" >&5
 -$as_echo "$ac_cv_member_struct_mtget_mt_blksiz" >&6; }
 -if test "x$ac_cv_member_struct_mtget_mt_blksiz" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blksiz" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_blksiz" >&6; }
 +if test $ac_cv_member_struct_mtget_mt_blksiz = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_BLKSIZ 1
@@@ -20983,10 -22309,10 +20896,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct mtget.mt_gstat" >&5
 -$as_echo_n "checking for struct mtget.mt_gstat... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct mtget.mt_gstat" >&5
 +echo $ECHO_N "checking for struct mtget.mt_gstat... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_mtget_mt_gstat+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21015,20 -22341,21 +20928,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_gstat=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21058,20 -22385,21 +20971,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_gstat=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_mtget_mt_gstat=no
@@@ -21082,9 -22410,9 +20995,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_gstat" >&5
 -$as_echo "$ac_cv_member_struct_mtget_mt_gstat" >&6; }
 -if test "x$ac_cv_member_struct_mtget_mt_gstat" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_gstat" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_gstat" >&6; }
 +if test $ac_cv_member_struct_mtget_mt_gstat = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_GSTAT 1
@@@ -21092,10 -22420,10 +21005,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct mtget.mt_blkno" >&5
 -$as_echo_n "checking for struct mtget.mt_blkno... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct mtget.mt_blkno" >&5
 +echo $ECHO_N "checking for struct mtget.mt_blkno... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_mtget_mt_blkno+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21124,20 -22452,21 +21037,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_blkno=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21167,20 -22496,21 +21080,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_mtget_mt_blkno=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_mtget_mt_blkno=no
@@@ -21191,9 -22521,9 +21104,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blkno" >&5
 -$as_echo "$ac_cv_member_struct_mtget_mt_blkno" >&6; }
 -if test "x$ac_cv_member_struct_mtget_mt_blkno" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blkno" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_blkno" >&6; }
 +if test $ac_cv_member_struct_mtget_mt_blkno = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_BLKNO 1
@@@ -21203,10 -22533,10 +21116,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct option.name" >&5
 -$as_echo_n "checking for struct option.name... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct option.name" >&5
 +echo $ECHO_N "checking for struct option.name... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_option_name+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21234,20 -22564,21 +21147,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_option_name=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21276,20 -22607,21 +21189,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_option_name=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_option_name=no
@@@ -21300,9 -22632,9 +21213,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_option_name" >&5
 -$as_echo "$ac_cv_member_struct_option_name" >&6; }
 -if test "x$ac_cv_member_struct_option_name" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_option_name" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_option_name" >&6; }
 +if test $ac_cv_member_struct_option_name = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_OPTION_NAME 1
@@@ -21312,10 -22644,10 +21225,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
 -$as_echo_n "checking for struct stat.st_blocks... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
 +echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21340,20 -22672,21 +21253,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_blocks=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21379,20 -22712,21 +21292,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_blocks=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_blocks=no
@@@ -21403,9 -22737,9 +21316,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_blocks" >&6; }
 -if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
 +if test $ac_cv_member_struct_stat_st_blocks = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
@@@ -21413,10 -22747,10 +21326,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
 -$as_echo_n "checking for struct stat.st_mtim... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
 +echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21441,20 -22775,21 +21354,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_mtim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21480,20 -22815,21 +21393,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_mtim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_mtim=no
@@@ -21504,9 -22840,9 +21417,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_mtim" >&6; }
 -if test "x$ac_cv_member_struct_stat_st_mtim" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
 +if test $ac_cv_member_struct_stat_st_mtim = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_MTIM 1
@@@ -21514,10 -22850,10 +21427,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctim" >&5
 -$as_echo_n "checking for struct stat.st_ctim... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct stat.st_ctim" >&5
 +echo $ECHO_N "checking for struct stat.st_ctim... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_ctim+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21542,20 -22878,21 +21455,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_ctim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21581,20 -22918,21 +21494,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_ctim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_ctim=no
@@@ -21605,9 -22943,9 +21518,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_ctim" >&6; }
 -if test "x$ac_cv_member_struct_stat_st_ctim" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctim" >&6; }
 +if test $ac_cv_member_struct_stat_st_ctim = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_CTIM 1
@@@ -21615,10 -22953,10 +21528,10 @@@ _ACEO
  
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_atim" >&5
 -$as_echo_n "checking for struct stat.st_atim... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct stat.st_atim" >&5
 +echo $ECHO_N "checking for struct stat.st_atim... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_atim+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21643,20 -22981,21 +21556,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_atim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21682,20 -23021,21 +21595,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_stat_st_atim=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_atim=no
@@@ -21706,9 -23046,9 +21619,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_atim" >&6; }
 -if test "x$ac_cv_member_struct_stat_st_atim" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_atim" >&6; }
 +if test $ac_cv_member_struct_stat_st_atim = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_ATIM 1
@@@ -21718,10 -23058,10 +21631,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
 -$as_echo_n "checking for struct sockaddr_in6.sin6_scope_id... " >&6; }
 +{ echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
 +echo $ECHO_N "checking for struct sockaddr_in6.sin6_scope_id... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21752,20 -23092,21 +21665,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21797,20 -23138,21 +21710,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
@@@ -21821,9 -23163,9 +21734,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
 -$as_echo "$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
 -if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
 +if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
@@@ -21833,10 -23175,10 +21746,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for ns_msg._msg_ptr" >&5
 -$as_echo_n "checking for ns_msg._msg_ptr... " >&6; }
 +{ echo "$as_me:$LINENO: checking for ns_msg._msg_ptr" >&5
 +echo $ECHO_N "checking for ns_msg._msg_ptr... $ECHO_C" >&6; }
  if test "${ac_cv_member_ns_msg__msg_ptr+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21870,20 -23212,21 +21783,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_ns_msg__msg_ptr=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21918,20 -23261,21 +21831,20 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_member_ns_msg__msg_ptr=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_ns_msg__msg_ptr=no
@@@ -21942,9 -23286,9 +21855,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_ns_msg__msg_ptr" >&5
 -$as_echo "$ac_cv_member_ns_msg__msg_ptr" >&6; }
 -if test "x$ac_cv_member_ns_msg__msg_ptr" = x""yes; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_member_ns_msg__msg_ptr" >&5
 +echo "${ECHO_T}$ac_cv_member_ns_msg__msg_ptr" >&6; }
 +if test $ac_cv_member_ns_msg__msg_ptr = yes; then
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_NS_MSG__MSG_PTR 1
@@@ -21954,10 -23298,10 +21867,10 @@@ _ACEO
  fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking for timezone variable" >&5
 -$as_echo_n "checking for timezone variable... " >&6; }
 +{ echo "$as_me:$LINENO: checking for timezone variable" >&5
 +echo $ECHO_N "checking for timezone variable... $ECHO_C" >&6; }
  if test "${ac_cv_have_timezone+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21980,31 -23324,35 +21893,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_have_timezone="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_timezone="no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_timezone" >&5
 -$as_echo "$ac_cv_have_timezone" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_timezone" >&5
 +echo "${ECHO_T}$ac_cv_have_timezone" >&6; }
  if test "$ac_cv_have_timezone" = "yes"
  then
  
@@@ -22013,10 -23361,10 +21926,10 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
  fi
 -{ $as_echo "$as_me:$LINENO: checking for daylight variable" >&5
 -$as_echo_n "checking for daylight variable... " >&6; }
 +{ echo "$as_me:$LINENO: checking for daylight variable" >&5
 +echo $ECHO_N "checking for daylight variable... $ECHO_C" >&6; }
  if test "${ac_cv_have_daylight+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22039,31 -23387,35 +21952,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_have_daylight="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_daylight="no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_daylight" >&5
 -$as_echo "$ac_cv_have_daylight" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_daylight" >&5
 +echo "${ECHO_T}$ac_cv_have_daylight" >&6; }
  if test "$ac_cv_have_daylight" = "yes"
  then
  
@@@ -22073,10 -23425,10 +21986,10 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for isinf" >&5
 -$as_echo_n "checking for isinf... " >&6; }
 +{ echo "$as_me:$LINENO: checking for isinf" >&5
 +echo $ECHO_N "checking for isinf... $ECHO_C" >&6; }
  if test "${ac_cv_have_isinf+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22099,31 -23451,35 +22012,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_have_isinf="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_isinf="no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_isinf" >&5
 -$as_echo "$ac_cv_have_isinf" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_isinf" >&5
 +echo "${ECHO_T}$ac_cv_have_isinf" >&6; }
  if test "$ac_cv_have_isinf" = "yes"
  then
  
@@@ -22133,10 -23489,10 +22046,10 @@@ _ACEO
  
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for isnan" >&5
 -$as_echo_n "checking for isnan... " >&6; }
 +{ echo "$as_me:$LINENO: checking for isnan" >&5
 +echo $ECHO_N "checking for isnan... $ECHO_C" >&6; }
  if test "${ac_cv_have_isnan+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22159,31 -23515,35 +22072,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    (eval "$ac_link") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext && {
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
    ac_cv_have_isnan="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 +  echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_isnan="no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_isnan" >&5
 -$as_echo "$ac_cv_have_isnan" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_have_isnan" >&5
 +echo "${ECHO_T}$ac_cv_have_isnan" >&6; }
  if test "$ac_cv_have_isnan" = "yes"
  then
  
@@@ -22195,10 -23555,10 +22108,10 @@@ f
  
  
  case $host_cpu in
 -  *i[3456789]86*) { $as_echo "$as_me:$LINENO: checking whether we need to define __i386__" >&5
 -$as_echo_n "checking whether we need to define __i386__... " >&6; }
 +  *i[3456789]86*) { echo "$as_me:$LINENO: checking whether we need to define __i386__" >&5
 +echo $ECHO_N "checking whether we need to define __i386__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___i386__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22219,17 -23579,17 +22132,17 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___i386__" >&5
 -$as_echo "$ac_cv_cpp_def___i386__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___i386__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___i386__" >&6; }
  if test $ac_cv_cpp_def___i386__ = yes; then
    CFLAGS="$CFLAGS -D__i386__"
    LINTFLAGS="$LINTFLAGS -D__i386__"
  fi
   ;;
 -  *x86_64*)         { $as_echo "$as_me:$LINENO: checking whether we need to define __x86_64__" >&5
 -$as_echo_n "checking whether we need to define __x86_64__... " >&6; }
 +  *x86_64*)         { echo "$as_me:$LINENO: checking whether we need to define __x86_64__" >&5
 +echo $ECHO_N "checking whether we need to define __x86_64__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___x86_64__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22250,17 -23610,17 +22163,17 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___x86_64__" >&5
 -$as_echo "$ac_cv_cpp_def___x86_64__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___x86_64__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___x86_64__" >&6; }
  if test $ac_cv_cpp_def___x86_64__ = yes; then
    CFLAGS="$CFLAGS -D__x86_64__"
    LINTFLAGS="$LINTFLAGS -D__x86_64__"
  fi
   ;;
 -  *alpha*)          { $as_echo "$as_me:$LINENO: checking whether we need to define __ALPHA__" >&5
 -$as_echo_n "checking whether we need to define __ALPHA__... " >&6; }
 +  *alpha*)          { echo "$as_me:$LINENO: checking whether we need to define __ALPHA__" >&5
 +echo $ECHO_N "checking whether we need to define __ALPHA__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___ALPHA__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22281,17 -23641,17 +22194,17 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___ALPHA__" >&5
 -$as_echo "$ac_cv_cpp_def___ALPHA__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___ALPHA__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___ALPHA__" >&6; }
  if test $ac_cv_cpp_def___ALPHA__ = yes; then
    CFLAGS="$CFLAGS -D__ALPHA__"
    LINTFLAGS="$LINTFLAGS -D__ALPHA__"
  fi
   ;;
 -  *sparc*)          { $as_echo "$as_me:$LINENO: checking whether we need to define __sparc__" >&5
 -$as_echo_n "checking whether we need to define __sparc__... " >&6; }
 +  *sparc*)          { echo "$as_me:$LINENO: checking whether we need to define __sparc__" >&5
 +echo $ECHO_N "checking whether we need to define __sparc__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___sparc__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22312,17 -23672,17 +22225,17 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sparc__" >&5
 -$as_echo "$ac_cv_cpp_def___sparc__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sparc__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___sparc__" >&6; }
  if test $ac_cv_cpp_def___sparc__ = yes; then
    CFLAGS="$CFLAGS -D__sparc__"
    LINTFLAGS="$LINTFLAGS -D__sparc__"
  fi
   ;;
 -  *powerpc*)        { $as_echo "$as_me:$LINENO: checking whether we need to define __powerpc__" >&5
 -$as_echo_n "checking whether we need to define __powerpc__... " >&6; }
 +  *powerpc*)        { echo "$as_me:$LINENO: checking whether we need to define __powerpc__" >&5
 +echo $ECHO_N "checking whether we need to define __powerpc__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___powerpc__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22343,8 -23703,8 +22256,8 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___powerpc__" >&5
 -$as_echo "$ac_cv_cpp_def___powerpc__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___powerpc__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___powerpc__" >&6; }
  if test $ac_cv_cpp_def___powerpc__ = yes; then
    CFLAGS="$CFLAGS -D__powerpc__"
    LINTFLAGS="$LINTFLAGS -D__powerpc__"
@@@ -22353,10 -23713,10 +22266,10 @@@ f
  esac
  
  case $host_vendor in
 -  *sun*) { $as_echo "$as_me:$LINENO: checking whether we need to define __sun__" >&5
 -$as_echo_n "checking whether we need to define __sun__... " >&6; }
 +  *sun*) { echo "$as_me:$LINENO: checking whether we need to define __sun__" >&5
 +echo $ECHO_N "checking whether we need to define __sun__... $ECHO_C" >&6; }
  if test "${ac_cv_cpp_def___sun__+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22377,8 -23737,8 +22290,8 @@@ f
  rm -f conftest*
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sun__" >&5
 -$as_echo "$ac_cv_cpp_def___sun__" >&6; }
 +{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sun__" >&5
 +echo "${ECHO_T}$ac_cv_cpp_def___sun__" >&6; }
  if test $ac_cv_cpp_def___sun__ = yes; then
    CFLAGS="$CFLAGS -D__sun__"
    LINTFLAGS="$LINTFLAGS -D__sun__"
@@@ -22534,7 -23894,7 +22447,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/advapi32/tests/Makefile"
- test "x$enable_advapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	advapi32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules"
@@@ -22550,7 -23910,7 +22463,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/advpack/tests/Makefile"
- test "x$enable_advpack_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	advpack/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/advpack/tests/Makefile: dlls/advpack/tests/Makefile.in dlls/Maketest.rules"
@@@ -22606,7 -23966,7 +22519,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/browseui/tests/Makefile"
- test "x$enable_browseui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	browseui/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/browseui/tests/Makefile: dlls/browseui/tests/Makefile.in dlls/Maketest.rules"
@@@ -22622,7 -23982,7 +22535,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/cabinet/tests/Makefile"
- test "x$enable_cabinet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	cabinet/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/cabinet/tests/Makefile: dlls/cabinet/tests/Makefile.in dlls/Maketest.rules"
@@@ -22670,7 -24030,7 +22583,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/comcat/tests/Makefile"
- test "x$enable_comcat_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	comcat/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/comcat/tests/Makefile: dlls/comcat/tests/Makefile.in dlls/Maketest.rules"
@@@ -22686,7 -24046,7 +22599,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/comctl32/tests/Makefile"
- test "x$enable_comctl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	comctl32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/comctl32/tests/Makefile: dlls/comctl32/tests/Makefile.in dlls/Maketest.rules"
@@@ -22702,7 -24062,7 +22615,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/comdlg32/tests/Makefile"
- test "x$enable_comdlg32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	comdlg32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rules"
@@@ -22726,7 -24086,7 +22639,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/credui/tests/Makefile"
- test "x$enable_credui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	credui/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules"
@@@ -22750,7 -24110,7 +22663,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/crypt32/tests/Makefile"
- test "x$enable_crypt32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	crypt32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules"
@@@ -22782,7 -24142,7 +22695,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/cryptnet/tests/Makefile"
- test "x$enable_cryptnet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	cryptnet/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules"
@@@ -22798,7 -24158,7 +22711,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/cryptui/tests/Makefile"
- test "x$enable_cryptui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	cryptui/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/cryptui/tests/Makefile: dlls/cryptui/tests/Makefile.in dlls/Maketest.rules"
@@@ -22830,13 -24190,29 +22743,29 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3d10/tests/Makefile"
- test "x$enable_d3d10_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3d10/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3d10/tests/Makefile: dlls/d3d10/tests/Makefile.in dlls/Maketest.rules"
  ac_config_files="$ac_config_files dlls/d3d10/tests/Makefile"
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/d3d10core/Makefile"
+ test "x$enable_d3d10core" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ 	d3d10core"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/d3d10core/Makefile: dlls/d3d10core/Makefile.in dlls/Makedll.rules"
+ ac_config_files="$ac_config_files dlls/d3d10core/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/d3d10core/tests/Makefile"
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ 	d3d10core/tests"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/d3d10core/tests/Makefile: dlls/d3d10core/tests/Makefile.in dlls/Maketest.rules"
+ ac_config_files="$ac_config_files dlls/d3d10core/tests/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3d8/Makefile"
  test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
  	d3d8"
@@@ -22846,7 -24222,7 +22775,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3d8/tests/Makefile"
- test "x$enable_d3d8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3d8/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3d8/tests/Makefile: dlls/d3d8/tests/Makefile.in dlls/Maketest.rules"
@@@ -22862,7 -24238,7 +22791,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3d9/tests/Makefile"
- test "x$enable_d3d9_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3d9/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3d9/tests/Makefile: dlls/d3d9/tests/Makefile.in dlls/Maketest.rules"
@@@ -22886,7 -24262,7 +22815,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3drm/tests/Makefile"
- test "x$enable_d3drm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3drm/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules"
@@@ -22902,7 -24278,7 +22831,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3dx8/tests/Makefile"
- test "x$enable_d3dx8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3dx8/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3dx8/tests/Makefile: dlls/d3dx8/tests/Makefile.in dlls/Maketest.rules"
@@@ -23014,7 -24390,7 +22943,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3dx9_36/tests/Makefile"
- test "x$enable_d3dx9_36_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3dx9_36/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3dx9_36/tests/Makefile: dlls/d3dx9_36/tests/Makefile.in dlls/Maketest.rules"
@@@ -23038,7 -24414,7 +22967,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/d3dxof/tests/Makefile"
- test "x$enable_d3dxof_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	d3dxof/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/d3dxof/tests/Makefile: dlls/d3dxof/tests/Makefile.in dlls/Maketest.rules"
@@@ -23070,7 -24446,7 +22999,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ddraw/tests/Makefile"
- test "x$enable_ddraw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ddraw/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ddraw/tests/Makefile: dlls/ddraw/tests/Makefile.in dlls/Maketest.rules"
@@@ -23102,7 -24478,7 +23031,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/dinput/tests/Makefile"
- test "x$enable_dinput_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	dinput/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/dinput/tests/Makefile: dlls/dinput/tests/Makefile.in dlls/Maketest.rules"
@@@ -23198,7 -24574,7 +23127,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/dnsapi/tests/Makefile"
- test "x$enable_dnsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	dnsapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -23222,7 -24598,7 +23151,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/dplayx/tests/Makefile"
- test "x$enable_dplayx_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	dplayx/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules"
@@@ -23278,7 -24654,7 +23207,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/dsound/tests/Makefile"
- test "x$enable_dsound_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	dsound/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules"
@@@ -23341,6 -24717,14 +23270,14 @@@ dlls/dxgi/Makefile: dlls/dxgi/Makefile.
  ac_config_files="$ac_config_files dlls/dxgi/Makefile"
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/dxgi/tests/Makefile"
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ 	dxgi/tests"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/dxgi/tests/Makefile: dlls/dxgi/tests/Makefile.in dlls/Maketest.rules"
+ ac_config_files="$ac_config_files dlls/dxgi/tests/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/dxguid/Makefile"
  test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
  	dxguid"
@@@ -23366,7 -24750,7 +23303,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/fusion/tests/Makefile"
- test "x$enable_fusion_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	fusion/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/fusion/tests/Makefile: dlls/fusion/tests/Makefile.in dlls/Maketest.rules"
@@@ -23382,7 -24766,7 +23319,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/gdi32/tests/Makefile"
- test "x$enable_gdi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	gdi32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23398,7 -24782,7 +23335,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/gdiplus/tests/Makefile"
- test "x$enable_gdiplus_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	gdiplus/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules"
@@@ -23462,7 -24846,7 +23399,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/hlink/tests/Makefile"
- test "x$enable_hlink_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	hlink/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/hlink/tests/Makefile: dlls/hlink/tests/Makefile.in dlls/Maketest.rules"
@@@ -23526,7 -24910,7 +23463,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/imm32/tests/Makefile"
- test "x$enable_imm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	imm32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23542,7 -24926,7 +23479,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/inetcomm/tests/Makefile"
- test "x$enable_inetcomm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	inetcomm/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules"
@@@ -23558,7 -24942,7 +23495,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/inetmib1/tests/Makefile"
- test "x$enable_inetmib1_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	inetmib1/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/inetmib1/tests/Makefile: dlls/inetmib1/tests/Makefile.in dlls/Maketest.rules"
@@@ -23574,7 -24958,7 +23511,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/infosoft/tests/Makefile"
- test "x$enable_infosoft_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	infosoft/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules"
@@@ -23614,7 -24998,7 +23551,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/iphlpapi/tests/Makefile"
- test "x$enable_iphlpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	iphlpapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -23638,7 -25022,7 +23575,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/itss/tests/Makefile"
- test "x$enable_itss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	itss/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules"
@@@ -23654,7 -25038,7 +23591,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/jscript/tests/Makefile"
- test "x$enable_jscript_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	jscript/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/jscript/tests/Makefile: dlls/jscript/tests/Makefile.in dlls/Maketest.rules"
@@@ -23670,7 -25054,7 +23607,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/kernel32/tests/Makefile"
- test "x$enable_kernel32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	kernel32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23686,7 -25070,7 +23623,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/localspl/tests/Makefile"
- test "x$enable_localspl_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	localspl/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules"
@@@ -23702,7 -25086,7 +23639,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/localui/tests/Makefile"
- test "x$enable_localui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	localui/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/localui/tests/Makefile: dlls/localui/tests/Makefile.in dlls/Maketest.rules"
@@@ -23718,7 -25102,7 +23655,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/lz32/tests/Makefile"
- test "x$enable_lz32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	lz32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23734,7 -25118,7 +23671,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/mapi32/tests/Makefile"
- test "x$enable_mapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	mapi32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/mapi32/tests/Makefile: dlls/mapi32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23790,7 -25174,7 +23727,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/mlang/tests/Makefile"
- test "x$enable_mlang_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	mlang/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules"
@@@ -23854,7 -25238,7 +23791,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/msacm32/tests/Makefile"
- test "x$enable_msacm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	msacm32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/msacm32/tests/Makefile: dlls/msacm32/tests/Makefile.in dlls/Maketest.rules"
@@@ -23886,7 -25270,7 +23823,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/mscms/tests/Makefile"
- test "x$enable_mscms_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	mscms/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/mscms/tests/Makefile: dlls/mscms/tests/Makefile.in dlls/Maketest.rules"
@@@ -23942,7 -25326,7 +23879,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/mshtml/tests/Makefile"
- test "x$enable_mshtml_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	mshtml/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules"
@@@ -23958,7 -25342,7 +23895,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/msi/tests/Makefile"
- test "x$enable_msi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	msi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24030,7 -25414,7 +23967,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/mstask/tests/Makefile"
- test "x$enable_mstask_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	mstask/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/mstask/tests/Makefile: dlls/mstask/tests/Makefile.in dlls/Maketest.rules"
@@@ -24062,7 -25446,7 +23999,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/msvcrt/tests/Makefile"
- test "x$enable_msvcrt_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	msvcrt/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/msvcrt/tests/Makefile: dlls/msvcrt/tests/Makefile.in dlls/Maketest.rules"
@@@ -24094,7 -25478,7 +24031,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/msvcrtd/tests/Makefile"
- test "x$enable_msvcrtd_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	msvcrtd/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/msvcrtd/tests/Makefile: dlls/msvcrtd/tests/Makefile.in dlls/Maketest.rules"
@@@ -24134,7 -25518,7 +24071,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/msxml3/tests/Makefile"
- test "x$enable_msxml3_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	msxml3/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/msxml3/tests/Makefile: dlls/msxml3/tests/Makefile.in dlls/Maketest.rules"
@@@ -24158,7 -25542,7 +24095,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/netapi32/tests/Makefile"
- test "x$enable_netapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	netapi32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/netapi32/tests/Makefile: dlls/netapi32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24182,7 -25566,7 +24119,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ntdll/tests/Makefile"
- test "x$enable_ntdll_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ntdll/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules"
@@@ -24198,7 -25582,7 +24135,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ntdsapi/tests/Makefile"
- test "x$enable_ntdsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ntdsapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ntdsapi/tests/Makefile: dlls/ntdsapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24222,7 -25606,7 +24159,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ntprint/tests/Makefile"
- test "x$enable_ntprint_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ntprint/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ntprint/tests/Makefile: dlls/ntprint/tests/Makefile.in dlls/Maketest.rules"
@@@ -24254,7 -25638,7 +24191,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/odbccp32/tests/Makefile"
- test "x$enable_odbccp32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	odbccp32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24270,7 -25654,7 +24207,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ole32/tests/Makefile"
- test "x$enable_ole32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ole32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ole32/tests/Makefile: dlls/ole32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24286,7 -25670,7 +24223,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/oleacc/tests/Makefile"
- test "x$enable_oleacc_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	oleacc/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/oleacc/tests/Makefile: dlls/oleacc/tests/Makefile.in dlls/Maketest.rules"
@@@ -24302,7 -25686,7 +24239,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/oleaut32/tests/Makefile"
- test "x$enable_oleaut32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	oleaut32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/oleaut32/tests/Makefile: dlls/oleaut32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24358,7 -25742,7 +24295,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/opengl32/tests/Makefile"
- test "x$enable_opengl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	opengl32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/opengl32/tests/Makefile: dlls/opengl32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24374,7 -25758,7 +24311,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/pdh/tests/Makefile"
- test "x$enable_pdh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	pdh/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/pdh/tests/Makefile: dlls/pdh/tests/Makefile.in dlls/Maketest.rules"
@@@ -24414,7 -25798,7 +24351,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/psapi/tests/Makefile"
- test "x$enable_psapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	psapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24446,7 -25830,7 +24383,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/qedit/tests/Makefile"
- test "x$enable_qedit_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	qedit/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules"
@@@ -24462,7 -25846,7 +24399,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/qmgr/tests/Makefile"
- test "x$enable_qmgr_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	qmgr/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/qmgr/tests/Makefile: dlls/qmgr/tests/Makefile.in dlls/Maketest.rules"
@@@ -24486,7 -25870,7 +24423,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/quartz/tests/Makefile"
- test "x$enable_quartz_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	quartz/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules"
@@@ -24510,7 -25894,7 +24447,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/rasapi32/tests/Makefile"
- test "x$enable_rasapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	rasapi32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24534,7 -25918,7 +24471,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/riched20/tests/Makefile"
- test "x$enable_riched20_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	riched20/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/riched20/tests/Makefile: dlls/riched20/tests/Makefile.in dlls/Maketest.rules"
@@@ -24550,7 -25934,7 +24487,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/riched32/tests/Makefile"
- test "x$enable_riched32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	riched32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24566,7 -25950,7 +24503,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/rpcrt4/tests/Makefile"
- test "x$enable_rpcrt4_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	rpcrt4/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules"
@@@ -24590,7 -25974,7 +24527,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/rsaenh/tests/Makefile"
- test "x$enable_rsaenh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	rsaenh/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules"
@@@ -24622,7 -26006,7 +24559,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/schannel/tests/Makefile"
- test "x$enable_schannel_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	schannel/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/schannel/tests/Makefile: dlls/schannel/tests/Makefile.in dlls/Maketest.rules"
@@@ -24638,7 -26022,7 +24575,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/secur32/tests/Makefile"
- test "x$enable_secur32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	secur32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24670,7 -26054,7 +24607,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/serialui/tests/Makefile"
- test "x$enable_serialui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	serialui/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/serialui/tests/Makefile: dlls/serialui/tests/Makefile.in dlls/Maketest.rules"
@@@ -24686,7 -26070,7 +24623,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/setupapi/tests/Makefile"
- test "x$enable_setupapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	setupapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24726,7 -26110,7 +24663,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/shdocvw/tests/Makefile"
- test "x$enable_shdocvw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	shdocvw/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules"
@@@ -24742,7 -26126,7 +24679,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/shell32/tests/Makefile"
- test "x$enable_shell32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	shell32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/shell32/tests/Makefile: dlls/shell32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24766,7 -26150,7 +24703,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/shlwapi/tests/Makefile"
- test "x$enable_shlwapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	shlwapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24798,7 -26182,7 +24735,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/snmpapi/tests/Makefile"
- test "x$enable_snmpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	snmpapi/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules"
@@@ -24822,7 -26206,7 +24759,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/spoolss/tests/Makefile"
- test "x$enable_spoolss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	spoolss/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules"
@@@ -24918,7 -26302,7 +24855,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/urlmon/tests/Makefile"
- test "x$enable_urlmon_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	urlmon/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules"
@@@ -24934,7 -26318,7 +24871,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/user32/tests/Makefile"
- test "x$enable_user32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	user32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules"
@@@ -24950,7 -26334,7 +24887,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/userenv/tests/Makefile"
- test "x$enable_userenv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	userenv/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules"
@@@ -24966,7 -26350,7 +24903,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/usp10/tests/Makefile"
- test "x$enable_usp10_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	usp10/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules"
@@@ -24990,7 -26374,7 +24927,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/uxtheme/tests/Makefile"
- test "x$enable_uxtheme_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	uxtheme/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/uxtheme/tests/Makefile: dlls/uxtheme/tests/Makefile.in dlls/Maketest.rules"
@@@ -25022,7 -26406,7 +24959,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/version/tests/Makefile"
- test "x$enable_version_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	version/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/version/tests/Makefile: dlls/version/tests/Makefile.in dlls/Maketest.rules"
@@@ -25214,7 -26598,7 +25151,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/winhttp/tests/Makefile"
- test "x$enable_winhttp_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	winhttp/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules"
@@@ -25230,7 -26614,7 +25167,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/wininet/tests/Makefile"
- test "x$enable_wininet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	wininet/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules"
@@@ -25246,7 -26630,7 +25183,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/winmm/tests/Makefile"
- test "x$enable_winmm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	winmm/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules"
@@@ -25278,7 -26662,7 +25215,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/winspool.drv/tests/Makefile"
- test "x$enable_winspool_drv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	winspool.drv/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules"
@@@ -25302,7 -26686,7 +25239,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/wintrust/tests/Makefile"
- test "x$enable_wintrust_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	wintrust/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/wintrust/tests/Makefile: dlls/wintrust/tests/Makefile.in dlls/Maketest.rules"
@@@ -25318,7 -26702,7 +25255,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/wldap32/tests/Makefile"
- test "x$enable_wldap32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	wldap32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/wldap32/tests/Makefile: dlls/wldap32/tests/Makefile.in dlls/Maketest.rules"
@@@ -25358,7 -26742,7 +25295,7 @@@ ac_config_files="$ac_config_files dlls/
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
  	dlls/ws2_32/tests/Makefile"
- test "x$enable_ws2_32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
  	ws2_32/tests"
  ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
  dlls/ws2_32/tests/Makefile: dlls/ws2_32/tests/Makefile.in dlls/Maketest.rules"
@@@ -25381,6 -26765,46 +25318,46 @@@ dlls/wtsapi32/Makefile: dlls/wtsapi32/M
  ac_config_files="$ac_config_files dlls/wtsapi32/Makefile"
  
  ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/xinput1_1/Makefile"
+ test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ 	xinput1_1"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/xinput1_1/Makefile: dlls/xinput1_1/Makefile.in dlls/Makedll.rules"
+ ac_config_files="$ac_config_files dlls/xinput1_1/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/xinput1_2/Makefile"
+ test "x$enable_xinput1_2" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ 	xinput1_2"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/xinput1_2/Makefile: dlls/xinput1_2/Makefile.in dlls/Makedll.rules"
+ ac_config_files="$ac_config_files dlls/xinput1_2/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/xinput1_3/Makefile"
+ test "x$enable_xinput1_3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ 	xinput1_3"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/xinput1_3/Makefile: dlls/xinput1_3/Makefile.in dlls/Makedll.rules"
+ ac_config_files="$ac_config_files dlls/xinput1_3/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/xinput1_3/tests/Makefile"
+ test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+ 	xinput1_3/tests"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/xinput1_3/tests/Makefile: dlls/xinput1_3/tests/Makefile.in dlls/Maketest.rules"
+ ac_config_files="$ac_config_files dlls/xinput1_3/tests/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
+ 	dlls/xinput9_1_0/Makefile"
+ test "x$enable_xinput9_1_0" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+ 	xinput9_1_0"
+ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+ dlls/xinput9_1_0/Makefile: dlls/xinput9_1_0/Makefile.in dlls/Makedll.rules"
+ ac_config_files="$ac_config_files dlls/xinput9_1_0/Makefile"
+ 
+ ALL_MAKEFILES="$ALL_MAKEFILES \\
  	documentation/Makefile"
  test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
  	documentation"
@@@ -25965,11 -27389,12 +25942,11 @@@ _ACEO
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
 -      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
 -      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
        *) $as_unset $ac_var ;;
        esac ;;
      esac
@@@ -26002,12 -27427,12 +25979,12 @@@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
 -      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
 -$as_echo "$as_me: updating cache $cache_file" >&6;}
 +      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
 +echo "$as_me: updating cache $cache_file" >&6;}
      cat confcache >$cache_file
    else
 -    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 +    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 +echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
  rm -f confcache
@@@ -26023,7 -27448,7 +26000,7 @@@ ac_ltlibobjs
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 -  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
 +  ac_i=`echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
    ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@@ -26036,11 -27461,12 +26013,11 @@@ LTLIBOBJS=$ac_ltlibobj
  
  
  : ${CONFIG_STATUS=./config.status}
 -ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 +echo "$as_me: creating $CONFIG_STATUS" >&6;}
 +cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
@@@ -26053,7 -27479,7 +26030,7 @@@ ac_cs_silent=fals
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@@ -26063,7 -27489,7 +26040,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
@@@ -26085,17 -27511,45 +26062,17 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
 -as_nl='
 -'
 -export as_nl
 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
 -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 -  as_echo='printf %s\n'
 -  as_echo_n='printf %s'
 -else
 -  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 -    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 -    as_echo_n='/usr/ucb/echo -n'
 -  else
 -    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 -    as_echo_n_body='eval
 -      arg=$1;
 -      case $arg in
 -      *"$as_nl"*)
 -	expr "X$arg" : "X\\(.*\\)$as_nl";
 -	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 -      esac;
 -      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 -    '
 -    export as_echo_n_body
 -    as_echo_n='sh -c $as_echo_n_body as_echo'
 -  fi
 -  export as_echo_body
 -  as_echo='sh -c $as_echo_body as_echo'
 -fi
 -
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
 -  PATH_SEPARATOR=:
 -  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 -    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 -      PATH_SEPARATOR=';'
 -  }
 +  echo "#! /bin/sh" >conf$$.sh
 +  echo  "exit 0"   >>conf$$.sh
 +  chmod +x conf$$.sh
 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 +    PATH_SEPARATOR=';'
 +  else
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
  fi
  
  # Support unset when possible.
@@@ -26111,8 -27565,6 +26088,8 @@@ f
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
 +as_nl='
 +'
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@@ -26135,7 -27587,7 +26112,7 @@@ if test "x$as_myself" = x; the
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
 -  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 +  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    { (exit 1); exit 1; }
  fi
  
@@@ -26148,17 -27600,10 +26125,17 @@@ PS2='> 
  PS4='+ '
  
  # NLS nuisances.
 -LC_ALL=C
 -export LC_ALL
 -LANGUAGE=C
 -export LANGUAGE
 +for as_var in \
 +  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 +  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 +  LC_TELEPHONE LC_TIME
 +do
 +  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 +    eval $as_var=C; export $as_var
 +  else
 +    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +  fi
 +done
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -26180,7 -27625,7 +26157,7 @@@ as_me=`$as_basename -- "$0" |
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 -$as_echo X/"$0" |
 +echo X/"$0" |
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
@@@ -26231,7 -27676,7 +26208,7 @@@ $as_unset CDPAT
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
 -    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 +    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
@@@ -26259,7 -27704,6 +26236,7 @@@ case `echo -n x` i
  *)
    ECHO_N='-n';;
  esac
 +
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@@ -26272,19 -27716,22 +26249,19 @@@ if test -d conf$$.dir; the
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
 -  mkdir conf$$.dir 2>/dev/null
 -fi
 -if (echo >conf$$.file) 2>/dev/null; then
 -  if ln -s conf$$.file conf$$ 2>/dev/null; then
 -    as_ln_s='ln -s'
 -    # ... but there are two gotchas:
 -    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 -    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 -    # In both cases, we have to default to `cp -p'.
 -    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 -      as_ln_s='cp -p'
 -  elif ln conf$$.file conf$$ 2>/dev/null; then
 -    as_ln_s=ln
 -  else
 +  mkdir conf$$.dir
 +fi
 +echo >conf$$.file
 +if ln -s conf$$.file conf$$ 2>/dev/null; then
 +  as_ln_s='ln -s'
 +  # ... but there are two gotchas:
 +  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +  # In both cases, we have to default to `cp -p'.
 +  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
      as_ln_s='cp -p'
 -  fi
 +elif ln conf$$.file conf$$ 2>/dev/null; then
 +  as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
@@@ -26309,10 -27756,10 +26286,10 @@@ els
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
 -	test -d "$1/.";
 +        test -d "$1/.";
        else
  	case $1 in
 -	-*)set "./$1";;
 +        -*)set "./$1";;
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
@@@ -26334,8 -27781,8 +26311,8 @@@ exec 6>&
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by Wine $as_me 1.1.8, which was
+ This file was extended by Wine $as_me 1.1.9, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -26348,7 -27795,16 +26325,7 @@@ on `(hostname || uname -n) 2>/dev/null 
  
  _ACEOF
  
 -case $ac_config_files in *"
 -"*) set x $ac_config_files; shift; ac_config_files=$*;;
 -esac
 -
 -case $ac_config_headers in *"
 -"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
 -esac
 -
 -
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<_ACEOF
  # Files that config.status was made for.
  config_files="$ac_config_files"
  config_headers="$ac_config_headers"
@@@ -26356,22 -27812,23 +26333,22 @@@ config_commands="$ac_config_commands
  
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
 -Usage: $0 [OPTION]... [FILE]...
 +Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
 -  -q, --quiet, --silent
 -                   do not print progress messages
 +  -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
 -      --file=FILE[:TEMPLATE]
 -                   instantiate the configuration file FILE
 -      --header=FILE[:TEMPLATE]
 -                   instantiate the configuration header FILE
 +  --file=FILE[:TEMPLATE]
 +		   instantiate the configuration file FILE
 +  --header=FILE[:TEMPLATE]
 +		   instantiate the configuration header FILE
  
  Configuration files:
  $config_files
@@@ -26385,24 -27842,24 +26362,24 @@@ $config_command
  Report bugs to <bug-autoconf at gnu.org>."
  
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- Wine config.status 1.1.8
+ Wine config.status 1.1.9
 -configured by $0, generated by GNU Autoconf 2.63,
 -  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 +configured by $0, generated by GNU Autoconf 2.61,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2008 Free Software Foundation, Inc.
 +Copyright (C) 2006 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
  ac_pwd='$ac_pwd'
  srcdir='$srcdir'
  INSTALL='$INSTALL'
 -test -n "\$AWK" || AWK=awk
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -# The default lists apply if the user does not specify any file.
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +# If no file are specified by the user, then we need to provide default
 +# value.  By we need to know if files were specified by the user.
  ac_need_defaults=:
  while test $# != 0
  do
@@@ -26424,30 -27881,36 +26401,30 @@@
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 -    $as_echo "$ac_cs_version"; exit ;;
 +    echo "$ac_cs_version"; exit ;;
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
 -    case $ac_optarg in
 -    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 -    esac
 -    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
 +    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
      ac_need_defaults=false;;
    --header | --heade | --head | --hea )
      $ac_shift
 -    case $ac_optarg in
 -    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 -    esac
 -    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
 +    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
    --he | --h)
      # Conflict between --help and --header
 -    { $as_echo "$as_me: error: ambiguous option: $1
 +    { echo "$as_me: error: ambiguous option: $1
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; };;
    --help | --hel | -h )
 -    $as_echo "$ac_cs_usage"; exit ;;
 +    echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
  
    # This is an error.
 -  -*) { $as_echo "$as_me: error: unrecognized option: $1
 +  -*) { echo "$as_me: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
  
@@@ -26466,30 -27929,32 +26443,30 @@@ if $ac_cs_silent; the
  fi
  
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
 -  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 -  shift
 -  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 -  CONFIG_SHELL='$SHELL'
 +  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 +  CONFIG_SHELL=$SHELL
    export CONFIG_SHELL
 -  exec "\$@"
 +  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  fi
  
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  exec 5>>config.log
  {
    echo
    sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
  ## Running $as_me. ##
  _ASBOX
 -  $as_echo "$ac_log"
 +  echo "$ac_log"
  } >&5
  
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<_ACEOF
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  
  # Handling of arguments.
  for ac_config_target in $ac_config_targets
@@@ -26553,6 -28018,8 +26530,8 @@@ d
      "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;;
      "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;;
      "dlls/d3d10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/tests/Makefile" ;;
+     "dlls/d3d10core/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/Makefile" ;;
+     "dlls/d3d10core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/tests/Makefile" ;;
      "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;;
      "dlls/d3d8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/tests/Makefile" ;;
      "dlls/d3d9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/Makefile" ;;
@@@ -26616,6 -28083,7 +26595,7 @@@
      "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;;
      "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;;
      "dlls/dxgi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/Makefile" ;;
+     "dlls/dxgi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/tests/Makefile" ;;
      "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;;
      "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;;
      "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;;
@@@ -26871,6 -28339,11 +26851,11 @@@
      "dlls/ws2_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/tests/Makefile" ;;
      "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;;
      "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;;
+     "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;;
+     "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;;
+     "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;;
+     "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;;
+     "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;;
      "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;;
      "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
      "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
@@@ -26934,8 -28407,8 +26919,8 @@@
      "tools/wmc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;;
      "tools/wrc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
  
 -  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 +  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
  done
@@@ -26976,300 -28449,179 +26961,299 @@@ $debug |
    (umask 077 && mkdir "$tmp")
  } ||
  {
 -   $as_echo "$as_me: cannot create a temporary directory in ." >&2
 +   echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
  
 -# Set up the scripts for CONFIG_FILES section.
 -# No need to generate them if there are no CONFIG_FILES.
 -# This happens for instance with `./config.status config.h'.
 -if test -n "$CONFIG_FILES"; then
 +#
 +# Set up the sed scripts for CONFIG_FILES section.
 +#
  
 -if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
 -  ac_cs_awk_getline=:
 -  ac_cs_awk_pipe_init=
 -  ac_cs_awk_read_file='
 -      while ((getline aline < (F[key])) > 0)
 -	print(aline)
 -      close(F[key])'
 -  ac_cs_awk_pipe_fini=
 -else
 -  ac_cs_awk_getline=false
 -  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
 -  ac_cs_awk_read_file='
 -      print "|#_!!_#|"
 -      print "cat " F[key] " &&"
 -      '$ac_cs_awk_pipe_init
 -  # The final `:' finishes the AND list.
 -  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
 -fi
 -ac_cr='
'
 -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
 -  ac_cs_awk_cr='\\r'
 -else
 -  ac_cs_awk_cr=$ac_cr
 -fi
 +# No need to generate the scripts if there are no CONFIG_FILES.
 +# This happens for instance when ./config.status config.h
 +if test -n "$CONFIG_FILES"; then
  
 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
  
 -# Create commands to substitute file output variables.
 -{
 -  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
 -  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
 -  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
 -  echo "_ACAWK" &&
 -  echo "_ACEOF"
 -} >conf$$files.sh &&
 -. ./conf$$files.sh ||
 -  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 -   { (exit 1); exit 1; }; }
 -rm -f conf$$files.sh
 +# Create sed commands to just substitute file output variables.
 +
 +# Remaining file output variables are in a fragment that also has non-file
 +# output varibles.
 +
 +
  
 -{
 -  echo "cat >conf$$subs.awk <<_ACEOF" &&
 -  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
 -  echo "_ACEOF"
 -} >conf$$subs.sh ||
 -  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 -   { (exit 1); exit 1; }; }
 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
 -  . ./conf$$subs.sh ||
 -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 -   { (exit 1); exit 1; }; }
 -
 -  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 -  if test $ac_delim_n = $ac_delim_num; then
 +  cat >conf$$subs.sed <<_ACEOF
 +SHELL!$SHELL$ac_delim
 +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
 +PACKAGE_NAME!$PACKAGE_NAME$ac_delim
 +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
 +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
 +PACKAGE_STRING!$PACKAGE_STRING$ac_delim
 +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
 +exec_prefix!$exec_prefix$ac_delim
 +prefix!$prefix$ac_delim
 +program_transform_name!$program_transform_name$ac_delim
 +bindir!$bindir$ac_delim
 +sbindir!$sbindir$ac_delim
 +libexecdir!$libexecdir$ac_delim
 +datarootdir!$datarootdir$ac_delim
 +datadir!$datadir$ac_delim
 +sysconfdir!$sysconfdir$ac_delim
 +sharedstatedir!$sharedstatedir$ac_delim
 +localstatedir!$localstatedir$ac_delim
 +includedir!$includedir$ac_delim
 +oldincludedir!$oldincludedir$ac_delim
 +docdir!$docdir$ac_delim
 +infodir!$infodir$ac_delim
 +htmldir!$htmldir$ac_delim
 +dvidir!$dvidir$ac_delim
 +pdfdir!$pdfdir$ac_delim
 +psdir!$psdir$ac_delim
 +libdir!$libdir$ac_delim
 +localedir!$localedir$ac_delim
 +mandir!$mandir$ac_delim
 +DEFS!$DEFS$ac_delim
 +ECHO_C!$ECHO_C$ac_delim
 +ECHO_N!$ECHO_N$ac_delim
 +ECHO_T!$ECHO_T$ac_delim
 +LIBS!$LIBS$ac_delim
 +build_alias!$build_alias$ac_delim
 +host_alias!$host_alias$ac_delim
 +target_alias!$target_alias$ac_delim
 +MAINTAINER_MODE!$MAINTAINER_MODE$ac_delim
 +build!$build$ac_delim
 +build_cpu!$build_cpu$ac_delim
 +build_vendor!$build_vendor$ac_delim
 +build_os!$build_os$ac_delim
 +host!$host$ac_delim
 +host_cpu!$host_cpu$ac_delim
 +host_vendor!$host_vendor$ac_delim
 +host_os!$host_os$ac_delim
 +WIN16_FILES!$WIN16_FILES$ac_delim
 +WIN16_INSTALL!$WIN16_INSTALL$ac_delim
 +SET_MAKE!$SET_MAKE$ac_delim
 +CC!$CC$ac_delim
 +CFLAGS!$CFLAGS$ac_delim
 +LDFLAGS!$LDFLAGS$ac_delim
 +CPPFLAGS!$CPPFLAGS$ac_delim
 +ac_ct_CC!$ac_ct_CC$ac_delim
 +EXEEXT!$EXEEXT$ac_delim
 +OBJEXT!$OBJEXT$ac_delim
 +CXX!$CXX$ac_delim
 +CXXFLAGS!$CXXFLAGS$ac_delim
 +ac_ct_CXX!$ac_ct_CXX$ac_delim
 +CPPBIN!$CPPBIN$ac_delim
 +TOOLSDIR!$TOOLSDIR$ac_delim
 +XMKMF!$XMKMF$ac_delim
 +CPP!$CPP$ac_delim
 +X_CFLAGS!$X_CFLAGS$ac_delim
 +X_PRE_LIBS!$X_PRE_LIBS$ac_delim
 +X_LIBS!$X_LIBS$ac_delim
 +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
 +FLEX!$FLEX$ac_delim
 +BISON!$BISON$ac_delim
 +AS!$AS$ac_delim
 +ac_ct_AS!$ac_ct_AS$ac_delim
 +LD!$LD$ac_delim
 +ac_ct_LD!$ac_ct_LD$ac_delim
 +NM!$NM$ac_delim
 +ac_ct_NM!$ac_ct_NM$ac_delim
 +AR!$AR$ac_delim
 +ac_ct_AR!$ac_ct_AR$ac_delim
 +ARFLAGS!$ARFLAGS$ac_delim
 +RANLIB!$RANLIB$ac_delim
 +STRIP!$STRIP$ac_delim
 +WINDRES!$WINDRES$ac_delim
 +LN_S!$LN_S$ac_delim
 +_ACEOF
 +
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
      break
    elif $ac_last_try; then
 -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
  done
 -rm -f conf$$subs.sh
 -
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 -_ACEOF
 -sed -n '
 -h
 -s/^/S["/; s/!.*/"]=/
 -p
 -g
 -s/^[^!]*!//
 -:repl
 -t repl
 -s/'"$ac_delim"'$//
 -t delim
 -:nl
 -h
 -s/\(.\{148\}\).*/\1/
 -t more1
 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 -p
 -n
 -b repl
 -:more1
 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 -p
 -g
 -s/.\{148\}//
 -t nl
 -:delim
 -h
 -s/\(.\{148\}\).*/\1/
 -t more2
 -s/["\\]/\\&/g; s/^/"/; s/$/"/
 -p
 -b
 -:more2
 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 -p
 -g
 -s/.\{148\}//
 -t delim
 -' <conf$$subs.awk | sed '
 -/^[^""]/{
 -  N
 -  s/\n//
 +
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 +  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 +/^[	 ]*@MAKE_RULES@[	 ]*$/{
 +r $MAKE_RULES
 +d
  }
 -' >>$CONFIG_STATUS || ac_write_fail=1
 -rm -f conf$$subs.awk
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 -_ACAWK
 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
 -  for (key in S) S_is_set[key] = 1
 -  FS = ""
 -  \$ac_cs_awk_pipe_init
 +/^[	 ]*@MAKE_DLL_RULES@[	 ]*$/{
 +r $MAKE_DLL_RULES
 +d
  }
 -{
 -  line = $ 0
 -  nfields = split(line, field, "@")
 -  substed = 0
 -  len = length(field[1])
 -  for (i = 2; i < nfields; i++) {
 -    key = field[i]
 -    keylen = length(key)
 -    if (S_is_set[key]) {
 -      value = S[key]
 -      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
 -      len += length(value) + length(field[++i])
 -      substed = 1
 -    } else
 -      len += 1 + keylen
 -  }
 -  if (nfields == 3 && !substed) {
 -    key = field[2]
 -    if (F[key] != "" && line ~ /^[	 ]*@.*@[	 ]*$/) {
 -      \$ac_cs_awk_read_file
 -      next
 -    }
 -  }
 -  print line
 +/^[	 ]*@MAKE_IMPLIB_RULES@[	 ]*$/{
 +r $MAKE_IMPLIB_RULES
 +d
 +}
 +/^[	 ]*@MAKE_TEST_RULES@[	 ]*$/{
 +r $MAKE_TEST_RULES
 +d
 +}
 +/^[	 ]*@MAKE_PROG_RULES@[	 ]*$/{
 +r $MAKE_PROG_RULES
 +d
  }
 -\$ac_cs_awk_pipe_fini
 -_ACAWK
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 -  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 -else
 -  cat
 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
 -  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
 -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
 +:n
 +t n
 +s/'"$ac_delim"'$/,g/; t
 +s/$/\\/; p
 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 +' >>$CONFIG_STATUS <conf$$subs.sed
 +rm -f conf$$subs.sed
 +cat >>$CONFIG_STATUS <<_ACEOF
 +CEOF$ac_eof
 +_ACEOF
 +
 +
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
 +LN!$LN$ac_delim
 +GREP!$GREP$ac_delim
 +EGREP!$EGREP$ac_delim
 +LDCONFIG!$LDCONFIG$ac_delim
 +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 +INSTALL_DATA!$INSTALL_DATA$ac_delim
 +LINT!$LINT$ac_delim
 +LINTFLAGS!$LINTFLAGS$ac_delim
 +FONTFORGE!$FONTFORGE$ac_delim
 +PKG_CONFIG!$PKG_CONFIG$ac_delim
 +RSVG!$RSVG$ac_delim
 +ICOTOOL!$ICOTOOL$ac_delim
 +PRELINK!$PRELINK$ac_delim
 +LIBPTHREAD!$LIBPTHREAD$ac_delim
 +XLIB!$XLIB$ac_delim
 +OPENGL_LIBS!$OPENGL_LIBS$ac_delim
 +DLLEXT!$DLLEXT$ac_delim
 +DLLFLAGS!$DLLFLAGS$ac_delim
 +LDSHARED!$LDSHARED$ac_delim
 +LDDLLFLAGS!$LDDLLFLAGS$ac_delim
 +LIBEXT!$LIBEXT$ac_delim
 +IMPLIBEXT!$IMPLIBEXT$ac_delim
 +LDRPATH_INSTALL!$LDRPATH_INSTALL$ac_delim
 +LDRPATH_LOCAL!$LDRPATH_LOCAL$ac_delim
 +LDD!$LDD$ac_delim
 +DLLTOOL!$DLLTOOL$ac_delim
 +DLLWRAP!$DLLWRAP$ac_delim
 +MINGWAR!$MINGWAR$ac_delim
 +SECURITYLIB!$SECURITYLIB$ac_delim
 +COREFOUNDATIONLIB!$COREFOUNDATIONLIB$ac_delim
 +IOKITLIB!$IOKITLIB$ac_delim
 +LDEXECFLAGS!$LDEXECFLAGS$ac_delim
 +DISKARBITRATIONLIB!$DISKARBITRATIONLIB$ac_delim
 +COREAUDIO!$COREAUDIO$ac_delim
 +CARBONLIB!$CARBONLIB$ac_delim
 +CROSSCC!$CROSSCC$ac_delim
 +CROSSWINDRES!$CROSSWINDRES$ac_delim
 +CROSSTEST!$CROSSTEST$ac_delim
 +NASLIBS!$NASLIBS$ac_delim
 +XML2LIBS!$XML2LIBS$ac_delim
 +XML2INCL!$XML2INCL$ac_delim
- XSLTLIBS!$XSLTLIBS$ac_delim
 +XSLTINCL!$XSLTINCL$ac_delim
 +HALINCL!$HALINCL$ac_delim
 +GNUTLSINCL!$GNUTLSINCL$ac_delim
 +sane_devel!$sane_devel$ac_delim
 +SANEINCL!$SANEINCL$ac_delim
 +gphoto2_devel!$gphoto2_devel$ac_delim
 +gphoto2port_devel!$gphoto2port_devel$ac_delim
 +GPHOTO2LIBS!$GPHOTO2LIBS$ac_delim
 +GPHOTO2INCL!$GPHOTO2INCL$ac_delim
 +RESOLVLIBS!$RESOLVLIBS$ac_delim
 +LCMSLIBS!$LCMSLIBS$ac_delim
 +ft_devel!$ft_devel$ac_delim
 +FREETYPELIBS!$FREETYPELIBS$ac_delim
 +FREETYPEINCL!$FREETYPEINCL$ac_delim
 +ESDCONFIG!$ESDCONFIG$ac_delim
 +ESDINCL!$ESDINCL$ac_delim
 +ESDLIBS!$ESDLIBS$ac_delim
 +ALSALIBS!$ALSALIBS$ac_delim
 +AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim
 +CUPSINCL!$CUPSINCL$ac_delim
 +FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim
 +EXTRACFLAGS!$EXTRACFLAGS$ac_delim
 +BUILTINFLAG!$BUILTINFLAG$ac_delim
 +LDPATH!$LDPATH$ac_delim
 +CRTLIBS!$CRTLIBS$ac_delim
 +SOCKETLIBS!$SOCKETLIBS$ac_delim
 +MAIN_BINARY!$MAIN_BINARY$ac_delim
 +EXTRA_BINARIES!$EXTRA_BINARIES$ac_delim
 +LIBDL!$LIBDL$ac_delim
 +LIBPOLL!$LIBPOLL$ac_delim
 +LDAPLIBS!$LDAPLIBS$ac_delim
 +DEPENDENCIES!$DEPENDENCIES$ac_delim
 +ALL_MAKERULES!$ALL_MAKERULES$ac_delim
 +ALL_MAKEFILES!$ALL_MAKEFILES$ac_delim
 +ALL_MAKEFILE_DEPENDS!$ALL_MAKEFILE_DEPENDS$ac_delim
 +ALL_TOP_DIRS!$ALL_TOP_DIRS$ac_delim
 +ALL_DLL_DIRS!$ALL_DLL_DIRS$ac_delim
 +ALL_IMPLIB_DIRS!$ALL_IMPLIB_DIRS$ac_delim
 +ALL_TEST_DIRS!$ALL_TEST_DIRS$ac_delim
 +ALL_PROGRAM_DIRS!$ALL_PROGRAM_DIRS$ac_delim
 +ALL_PROGRAM_INSTALL_DIRS!$ALL_PROGRAM_INSTALL_DIRS$ac_delim
 +ALL_PROGRAM_BIN_INSTALL_DIRS!$ALL_PROGRAM_BIN_INSTALL_DIRS$ac_delim
 +ALL_WINETEST_DEPENDS!$ALL_WINETEST_DEPENDS$ac_delim
 +LIBOBJS!$LIBOBJS$ac_delim
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
 +_ACEOF
 +
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
 +  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
 +done
 +
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 +  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
  _ACEOF
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
 +:n
 +t n
 +s/'"$ac_delim"'$/,g/; t
 +s/$/\\/; p
 +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 +' >>$CONFIG_STATUS <conf$$subs.sed
 +rm -f conf$$subs.sed
 +cat >>$CONFIG_STATUS <<_ACEOF
 +:end
 +s/|#_!!_#|//g
 +CEOF$ac_eof
 +_ACEOF
 +
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@@ -27286,19 -28638,133 +27270,19 @@@ s/^[^=]*=[	 ]*$/
  }'
  fi
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  fi # test -n "$CONFIG_FILES"
  
 -# Set up the scripts for CONFIG_HEADERS section.
 -# No need to generate them if there are no CONFIG_HEADERS.
 -# This happens for instance with `./config.status Makefile'.
 -if test -n "$CONFIG_HEADERS"; then
 -cat >"$tmp/defines.awk" <<\_ACAWK ||
 -BEGIN {
 -_ACEOF
 -
 -# Transform confdefs.h into an awk script `defines.awk', embedded as
 -# here-document in config.status, that substitutes the proper values into
 -# config.h.in to produce config.h.
  
 -# Create a delimiter string that does not exist in confdefs.h, to ease
 -# handling of long lines.
 -ac_delim='%!_!# '
 -for ac_last_try in false false :; do
 -  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
 -  if test -z "$ac_t"; then
 -    break
 -  elif $ac_last_try; then
 -    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
 -   { (exit 1); exit 1; }; }
 -  else
 -    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 -  fi
 -done
 -
 -# For the awk script, D is an array of macro values keyed by name,
 -# likewise P contains macro parameters if any.  Preserve backslash
 -# newline sequences.
 -
 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
 -sed -n '
 -s/.\{148\}/&'"$ac_delim"'/g
 -t rset
 -:rset
 -s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
 -t def
 -d
 -:def
 -s/\\$//
 -t bsnl
 -s/["\\]/\\&/g
 -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 -D["\1"]=" \3"/p
 -s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
 -d
 -:bsnl
 -s/["\\]/\\&/g
 -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 -D["\1"]=" \3\\\\\\n"\\/p
 -t cont
 -s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
 -t cont
 -d
 -:cont
 -n
 -s/.\{148\}/&'"$ac_delim"'/g
 -t clear
 -:clear
 -s/\\$//
 -t bsnlc
 -s/["\\]/\\&/g; s/^/"/; s/$/"/p
 -d
 -:bsnlc
 -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 -b cont
 -' <confdefs.h | sed '
 -s/'"$ac_delim"'/"\\\
 -"/g' >>$CONFIG_STATUS || ac_write_fail=1
 -
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 -  for (key in D) D_is_set[key] = 1
 -  FS = ""
 -}
 -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
 -  line = \$ 0
 -  split(line, arg, " ")
 -  if (arg[1] == "#") {
 -    defundef = arg[2]
 -    mac1 = arg[3]
 -  } else {
 -    defundef = substr(arg[1], 2)
 -    mac1 = arg[2]
 -  }
 -  split(mac1, mac2, "(") #)
 -  macro = mac2[1]
 -  prefix = substr(line, 1, index(line, defundef) - 1)
 -  if (D_is_set[macro]) {
 -    # Preserve the white space surrounding the "#".
 -    print prefix "define", macro P[macro] D[macro]
 -    next
 -  } else {
 -    # Replace #undef with comments.  This is necessary, for example,
 -    # in the case of _POSIX_SOURCE, which is predefined and required
 -    # on some systems where configure will not decide to define it.
 -    if (defundef == "undef") {
 -      print "/*", prefix defundef, macro, "*/"
 -      next
 -    }
 -  }
 -}
 -{ print }
 -_ACAWK
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi # test -n "$CONFIG_HEADERS"
 -
 -
 -eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 -shift
 -for ac_tag
 +for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
  do
    case $ac_tag in
    :[FHLC]) ac_mode=$ac_tag; continue;;
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
 -  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 +  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
 +echo "$as_me: error: Invalid tag $ac_tag." >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@@ -27327,26 -28793,38 +27311,26 @@@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
 -	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 +	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
 +echo "$as_me: error: cannot find input file: $ac_f" >&2;}
     { (exit 1); exit 1; }; };;
        esac
 -      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 -      ac_file_inputs="$ac_file_inputs '$ac_f'"
 +      ac_file_inputs="$ac_file_inputs $ac_f"
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
      # use $as_me), people would be surprised to read:
      #    /* config.h.  Generated by config.status.  */
 -    configure_input='Generated from '`
 -	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 -	`' by configure.'
 +    configure_input="Generated from "`IFS=:
 +	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
 -      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
 -$as_echo "$as_me: creating $ac_file" >&6;}
 +      { echo "$as_me:$LINENO: creating $ac_file" >&5
 +echo "$as_me: creating $ac_file" >&6;}
      fi
 -    # Neutralize special characters interpreted by sed in replacement strings.
 -    case $configure_input in #(
 -    *\&* | *\|* | *\\* )
 -       ac_sed_conf_input=`$as_echo "$configure_input" |
 -       sed 's/[\\\\&|]/\\\\&/g'`;; #(
 -    *) ac_sed_conf_input=$configure_input;;
 -    esac
  
      case $ac_tag in
 -    *:-:* | *:-) cat >"$tmp/stdin" \
 -      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +    *:-:* | *:-) cat >"$tmp/stdin";;
      esac
      ;;
    esac
@@@ -27356,7 -28834,7 +27340,7 @@@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  	 X"$ac_file" : 'X\(//\)$' \| \
  	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 -$as_echo X"$ac_file" |
 +echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -27382,7 -28860,7 +27366,7 @@@
      as_dirs=
      while :; do
        case $as_dir in #(
 -      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 +      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
@@@ -27391,7 -28869,7 +27375,7 @@@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 -$as_echo X"$as_dir" |
 +echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -27412,17 -28890,17 +27396,17 @@@
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
 -  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 +  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
     { (exit 1); exit 1; }; }; }
    ac_builddir=.
  
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
 -  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
    # A ".." for each directory in $ac_dir_suffix.
 -  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -27462,12 -28940,13 +27446,12 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
    esac
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
  
 -ac_sed_dataroot='
 -/datarootdir/ {
 +case `sed -n '/datarootdir/ {
    p
    q
  }
@@@ -27476,13 -28955,14 +27460,13 @@@
  /@infodir@/p
  /@localedir@/p
  /@mandir@/p
 -'
 -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 +' $ac_file_inputs` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 -  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 +  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<_ACEOF
    ac_datarootdir_hack='
    s&@datadir@&$datadir&g
    s&@docdir@&$docdir&g
@@@ -27496,15 -28976,16 +27480,15 @@@ _ACEO
  # Neutralize VPATH when `$srcdir' = `.'.
  # Shell code in configure.ac might set extrasub.
  # FIXME: do we really want to maintain this feature?
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 -ac_sed_extra="$ac_vpsub
 +cat >>$CONFIG_STATUS <<_ACEOF
 +  sed "$ac_vpsub
  $extrasub
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 -s|@configure_input@|$ac_sed_conf_input|;t t
 +s&@configure_input@&$configure_input&;t t
  s&@top_builddir@&$ac_top_builddir_sub&;t t
 -s&@top_build_prefix@&$ac_top_build_prefix&;t t
  s&@srcdir@&$ac_srcdir&;t t
  s&@abs_srcdir@&$ac_abs_srcdir&;t t
  s&@top_srcdir@&$ac_top_srcdir&;t t
@@@ -27514,141 -28995,85 +27498,141 @@@ s&@abs_builddir@&$ac_abs_builddir&;t 
  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  s&@INSTALL@&$ac_INSTALL&;t t
  $ac_datarootdir_hack
 -"
 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
 -if $ac_cs_awk_getline; then
 -  $AWK -f "$tmp/subs.awk"
 -else
 -  $AWK -f "$tmp/subs.awk" | $SHELL
 -fi >$tmp/out \
 -  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
 -   { (exit 1); exit 1; }; }
 +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
  
  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
    { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 -  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&5
 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
  
    rm -f "$tmp/stdin"
    case $ac_file in
 -  -) cat "$tmp/out" && rm -f "$tmp/out";;
 -  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
 -  esac \
 -  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
 -   { (exit 1); exit 1; }; }
 +  -) cat "$tmp/out"; rm -f "$tmp/out";;
 +  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
 +  esac
   ;;
    :H)
    #
    # CONFIG_HEADER
    #
 +_ACEOF
 +
 +# Transform confdefs.h into a sed script `conftest.defines', that
 +# substitutes the proper values into config.h.in to produce config.h.
 +rm -f conftest.defines conftest.tail
 +# First, append a space to every undef/define line, to ease matching.
 +echo 's/$/ /' >conftest.defines
 +# Then, protect against being on the right side of a sed subst, or in
 +# an unquoted here document, in config.status.  If some macros were
 +# called several times there might be several #defines for the same
 +# symbol, which is useless.  But do not sort them, since the last
 +# AC_DEFINE must be honored.
 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
 +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
 +# NAME is the cpp macro being defined, VALUE is the value it is being given.
 +# PARAMS is the parameter list in the macro definition--in most cases, it's
 +# just an empty string.
 +ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
 +ac_dB='\\)[	 (].*,\\1define\\2'
 +ac_dC=' '
 +ac_dD=' ,'
 +
 +uniq confdefs.h |
 +  sed -n '
 +	t rset
 +	:rset
 +	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
 +	t ok
 +	d
 +	:ok
 +	s/[\\&,]/\\&/g
 +	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
 +	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
 +  ' >>conftest.defines
 +
 +# Remove the space that was appended to ease matching.
 +# Then replace #undef with comments.  This is necessary, for
 +# example, in the case of _POSIX_SOURCE, which is predefined and required
 +# on some systems where configure will not decide to define it.
 +# (The regexp can be short, since the line contains either #define or #undef.)
 +echo 's/ $//
 +s,^[	 #]*u.*,/* & */,' >>conftest.defines
 +
 +# Break up conftest.defines:
 +ac_max_sed_lines=50
 +
 +# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
 +# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
 +# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
 +# et cetera.
 +ac_in='$ac_file_inputs'
 +ac_out='"$tmp/out1"'
 +ac_nxt='"$tmp/out2"'
 +
 +while :
 +do
 +  # Write a here document:
 +    cat >>$CONFIG_STATUS <<_ACEOF
 +    # First, check the format of the line:
 +    cat >"\$tmp/defines.sed" <<\\CEOF
 +/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
 +/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
 +b
 +:def
 +_ACEOF
 +  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
 +  echo 'CEOF
 +    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
 +  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
 +  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
 +  grep . conftest.tail >/dev/null || break
 +  rm -f conftest.defines
 +  mv conftest.tail conftest.defines
 +done
 +rm -f conftest.defines conftest.tail
 +
 +echo "ac_result=$ac_in" >>$CONFIG_STATUS
 +cat >>$CONFIG_STATUS <<\_ACEOF
    if test x"$ac_file" != x-; then
 -    {
 -      $as_echo "/* $configure_input  */" \
 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
 -    } >"$tmp/config.h" \
 -      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
 -   { (exit 1); exit 1; }; }
 -    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
 -      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 -$as_echo "$as_me: $ac_file is unchanged" >&6;}
 +    echo "/* $configure_input  */" >"$tmp/config.h"
 +    cat "$ac_result" >>"$tmp/config.h"
 +    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
 +      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 +echo "$as_me: $ac_file is unchanged" >&6;}
      else
 -      rm -f "$ac_file"
 -      mv "$tmp/config.h" "$ac_file" \
 -	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
 -   { (exit 1); exit 1; }; }
 +      rm -f $ac_file
 +      mv "$tmp/config.h" $ac_file
      fi
    else
 -    $as_echo "/* $configure_input  */" \
 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
 -      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
 -$as_echo "$as_me: error: could not create -" >&2;}
 -   { (exit 1); exit 1; }; }
 +    echo "/* $configure_input  */"
 +    cat "$ac_result"
    fi
 +  rm -f "$tmp/out12"
   ;;
  
 -  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
 -$as_echo "$as_me: executing $ac_file commands" >&6;}
 +  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
 +echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
  
  
    case $ac_file$ac_mode in
      "include/stamp-h":C) echo timestamp > include/stamp-h ;;
 -    "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || ({ $as_echo "$as_me:$LINENO: creating dlls/gdi32/enhmfdrv" >&5
 -$as_echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;} && mkdir "dlls/gdi32/enhmfdrv") ;;
 -    "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || ({ $as_echo "$as_me:$LINENO: creating dlls/gdi32/mfdrv" >&5
 -$as_echo "$as_me: creating dlls/gdi32/mfdrv" >&6;} && mkdir "dlls/gdi32/mfdrv") ;;
 -    "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ $as_echo "$as_me:$LINENO: creating dlls/kernel32/nls" >&5
 -$as_echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;;
 -    "dlls/user32/resources":C) test -d "dlls/user32/resources" || ({ $as_echo "$as_me:$LINENO: creating dlls/user32/resources" >&5
 -$as_echo "$as_me: creating dlls/user32/resources" >&6;} && mkdir "dlls/user32/resources") ;;
 -    "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ $as_echo "$as_me:$LINENO: creating dlls/wineps.drv/data" >&5
 -$as_echo "$as_me: creating dlls/wineps.drv/data" >&6;} && mkdir "dlls/wineps.drv/data") ;;
 -    "include/wine":C) test -d "include/wine" || ({ $as_echo "$as_me:$LINENO: creating include/wine" >&5
 -$as_echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
 +    "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi32/enhmfdrv" >&5
 +echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;} && mkdir "dlls/gdi32/enhmfdrv") ;;
 +    "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi32/mfdrv" >&5
 +echo "$as_me: creating dlls/gdi32/mfdrv" >&6;} && mkdir "dlls/gdi32/mfdrv") ;;
 +    "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ echo "$as_me:$LINENO: creating dlls/kernel32/nls" >&5
 +echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;;
 +    "dlls/user32/resources":C) test -d "dlls/user32/resources" || ({ echo "$as_me:$LINENO: creating dlls/user32/resources" >&5
 +echo "$as_me: creating dlls/user32/resources" >&6;} && mkdir "dlls/user32/resources") ;;
 +    "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps.drv/data" >&5
 +echo "$as_me: creating dlls/wineps.drv/data" >&6;} && mkdir "dlls/wineps.drv/data") ;;
 +    "include/wine":C) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5
 +echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
  
    esac
  done # for ac_tag
@@@ -27659,6 -29084,11 +27643,6 @@@ _ACEO
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  
 -test $ac_write_fail = 0 ||
 -  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
 -   { (exit 1); exit 1; }; }
 -
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
@@@ -27680,6 -29110,10 +27664,6 @@@ if test "$no_create" != yes; the
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
 -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 -  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 -fi
  
  
  if test "$no_create" = "yes"
@@@ -27694,8 -29128,8 +27678,8 @@@ if test "x$wine_notices != "x; the
      for msg in $wine_notices; do
          IFS="$ac_save_IFS"
          if test -n "$msg"; then
 -            { $as_echo "$as_me:$LINENO: $msg" >&5
 -$as_echo "$as_me: $msg" >&6;}
 +            { echo "$as_me:$LINENO: $msg" >&5
 +echo "$as_me: $msg" >&6;}
          fi
      done
  fi
@@@ -27704,8 -29138,8 +27688,8 @@@ for msg in $wine_warnings; d
      IFS="$ac_save_IFS"
      if test -n "$msg"; then
          echo >&2
 -        { $as_echo "$as_me:$LINENO: WARNING: $msg" >&5
 -$as_echo "$as_me: WARNING: $msg" >&2;}
 +        { echo "$as_me:$LINENO: WARNING: $msg" >&5
 +echo "$as_me: WARNING: $msg" >&2;}
      fi
  done
  IFS="$ac_save_IFS"
diff --combined configure.ac
index c1eec2e,d2446f3..19bdbcc
--- a/configure.ac
+++ b/configure.ac
@@@ -15,6 -15,7 +15,7 @@@ dnl **** Command-line arguments ***
  
  AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
  AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
+ AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
  AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]),
                                 ,[AC_SUBST([MAINTAINER_MODE],[\#])])
  
@@@ -551,6 -552,13 +552,6 @@@ case $host_os i
        WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
                        [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
  
 -      WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
 -                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
 -          [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
 -                           [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
 -
        WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
                        [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
  
@@@ -826,7 -834,6 +827,6 @@@ dnl **** Check for libxml2 ***
  
  AC_SUBST(XML2LIBS,"")
  AC_SUBST(XML2INCL,"")
- AC_SUBST(XSLTLIBS,"")
  AC_SUBST(XSLTINCL,"")
  if test "x$with_xml" != "xno"
  then
@@@ -874,17 -881,11 +874,11 @@@ the
      CPPFLAGS="$ac_save_CPPFLAGS"
      if test "$ac_cv_header_libxslt_transform_h" = "yes"
      then
-         AC_CHECK_LIB(xslt, xsltCompilePattern,
-             [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
-              XSLTLIBS="$ac_xslt_libs"
-              XSLTINCL="$ac_xslt_cflags"
-              ac_save_LIBS="$LIBS"
-              LIBS="$LIBS $ac_xslt_libs"
-              AC_CHECK_FUNCS(xsltInit)
-              LIBS="$ac_save_LIBS"],,$ac_xslt_libs)
+         WINE_CHECK_SONAME(xslt,xsltCompilePattern,
+                          [XSLTINCL="$ac_xslt_cflags"],,[$ac_xslt_libs])
      fi
  fi
- WINE_WARNING_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"],
+ WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"],
                   [libxslt ${notice_platform}development files not found, xslt won't be supported.])
  
  dnl **** Check for libhal ****
@@@ -1731,53 -1732,55 +1725,55 @@@ WINE_CONFIG_MAKEFILE([dlls/activeds/Mak
  WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/adsiid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/advapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/capi2032/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/cards/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/cfgmgr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/clusapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/comcat/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/crtdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/crypt32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/cryptdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/cryptdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/cryptnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/cryptui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/cryptui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
+ WINE_CONFIG_MAKEFILE([dlls/d3d10core/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3d10core/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3dim/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3drm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3dx8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_24/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_25/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_26/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1791,18 -1794,18 +1787,18 @@@ WINE_CONFIG_MAKEFILE([dlls/d3dx9_33/Mak
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_34/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_35/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/d3dx9_37/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1814,17 -1817,17 +1810,17 @@@ WINE_CONFIG_MAKEFILE([dlls/dmsynth/Make
  WINE_CONFIG_MAKEFILE([dlls/dmusic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dmusic32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dnsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dplay/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dplayx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dpnaddr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1832,14 -1835,15 +1828,15 @@@ WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Make
  WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/dxgi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/dxgi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/glu32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/gphoto2.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/gpkcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1847,7 -1851,7 +1844,7 @@@ WINE_CONFIG_MAKEFILE([dlls/hal/Makefile
  WINE_CONFIG_MAKEFILE([dlls/hhctrl.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1855,40 -1859,40 +1852,40 @@@ WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/M
  WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/inetmib1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/infosoft/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/initpki/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/inkobj/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/inseng/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/iphlpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/itircl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/itss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1896,20 -1900,20 +1893,20 @@@ WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile
  WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mshtml.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mshtml/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msimg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msimtf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -1918,106 -1922,106 +1915,106 @@@ WINE_CONFIG_MAKEFILE([dlls/msnet32/Make
  WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msvcirt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msvcr71/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msvcrt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msvcrt20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/nddeapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/netapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/newdev/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/ntdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/ntdsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/ntoskrnl.exe/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/ntprint/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/oleacc/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/oleacc/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/psapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/pstorec/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/qcap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/qedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/qmgr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/riched32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/rpcrt4/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/secur32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/security/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/sensapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/shlwapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/slbcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -2029,20 -2033,20 +2026,20 @@@ WINE_CONFIG_MAKEFILE([dlls/twain_32/Mak
  WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/usp10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@@ -2066,27 -2070,32 +2063,32 @@@ WINE_CONFIG_MAKEFILE([dlls/winequartz.d
  WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/wldap32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/wldap32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
- WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
  WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
+ WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
  WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
  WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
  WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
diff --combined debian/changelog
index 03655d4,0000000..9ba52cf
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3564 -1,0 +1,3570 @@@
++wine (1.1.9-1) UNRELEASED; urgency=low
++
++  * UNRELEASED
++
++ -- Ove Kaaven <ovek at arcticnet.no>  Sun, 04 Jan 2009 04:44:32 +0100
++
 +wine (1.1.8-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.8, released Nov 7, 2008.
 +    - Substantial parts of inetcomm implemented (for Outlook).
 +    - Still better crypt32 support.
 +    - Memory management improvements.
 +    - Theming support for buttons.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 03 Jan 2009 14:14:41 +0100
 +
 +wine (1.1.7-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.7, released Oct 24, 2008.
 +    - Improved device management for DOS drives.
 +    - Many Richedit fixes.
 +    - Various installer fixes, particularly for IE 7.
 +    - First steps of Direct3D 10 implementation.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Fri, 02 Jan 2009 09:18:43 +0100
 +
 +wine (1.1.6-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.6, released Oct 10, 2008.
 +    - Beginnings of schannel implementation using GnuTLS.
 +    - Many fixes from various code analysis tools.
 +    - Support for X11 desktop work area.
 +    - Fixes for Richedit tables.
 +    - More complete JavaScript support.
 +    - Various bug fixes.
 +  * Added build-dependency alternatives libgl1-mesa-dev and libglu1-mesa-dev.
 +  * Removed fontforge from Build-Depends (for a while now, upstream has
 +    shipped pre-built fonts in the tarball, and they no longer build the
 +    fonts at compile time by default, in order to work around bugs in
 +    various fontforge versions).
 +  * Added libgnutls-dev to Build-Depends (why can't Wine settle with
 +    *either* OpenSSL *or* GnuTLS, instead of requiring both?)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Thu, 01 Jan 2009 10:31:39 +0100
 +
 +wine (1.1.5-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.5, released Sep 19, 2008.
 +    - Substantial JavaScript implementation.
 +    - Partial support for layered windows.
 +    - Support for Unicode file export in Regedit.
 +    - Proper exception handling in widl-generated code.
 +    - Asynchronous requests and cookies support in WinHTTP.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 01 Oct 2008 20:39:10 +0200
 +
 +wine (1.1.4-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.4, released Sep 5, 2008.
 +    - Substantial chunks of WinHTTP are implemented.
 +    - More JavaScript support.
 +    - Beginnings of shell AppBar implementation.
 +    - Several fixes for Google Chrome support.
 +    - Chinese translations.
 +    - Various bug fixes.
 +  * The make target for installing API manpages changed from install to
 +    install-man; updated debian/rules accordingly.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 01 Oct 2008 07:12:52 +0200
 +
 +wine (1.1.3-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.3, released Aug 22, 2008.
 +    - Beginnings of ddraw overlay support.
 +    - Many more crypt32 functions.
 +    - Improved support for tables in Richedit.
 +    - Support for NETWM window maximization.
 +    - Many installer fixes.
 +    - Tweaks for better PulseAudio support.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 01 Oct 2008 01:48:17 +0200
 +
 +wine (1.1.2-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.2, released Jul 25, 2008.
 +    - Control panel improvements and new appwiz panel.
 +    - Restructurations of state handling in Direct3D.
 +    - Support for timer queue functions.
 +    - Many MSXML improvements.
 +    - Several fixes to Solaris support.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 30 Sep 2008 00:10:30 +0200
 +
 +wine (1.1.1-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.1, released Jul 11, 2008.
 +    - Fixes for Photoshop CS3 and Office 2007 installers.
 +    - More progress on gdiplus.
 +    - Support for Unicode files in regedit.
 +    - Improved video playback.
 +    - Many Richedit fixes and improvements.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 29 Sep 2008 05:06:27 +0200
 +
 +wine (1.1.0-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.0, released Jun 27, 2008.
 +    - Many more gdiplus functions implemented.
 +    - Improved graphics tablet support.
 +    - Many Richedit fixes and improvements.
 +    - Support for HWND_MESSAGE windows.
 +    - A lot of new MSHTML functions.
 +    - Many fixes in MSI registry handling.
 +    - Initial implementation of the inetmib1 DLL.
 +    - Improvements to the quartz renderers.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 29 Sep 2008 02:49:02 +0200
 +
 +wine (1.0.0-1) unstable; urgency=high
 +
 +  * New upstream release 1.0, released Jun 17, 2008.
 +  * Setting urgency high for this milestone upload.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 17 Jun 2008 17:54:38 +0200
 +
 +wine (1.0-rc5-1) unstable; urgency=low
 +
 +  * New upstream release 1.0-rc5, released Jun 13, 2008.
 +    - Bug fixes only, we are in code freeze.
 +  * Updated dependencies to use the new CUPS package names.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 14 Jun 2008 16:14:03 +0200
 +
 +wine (1.0-rc4-1) unstable; urgency=low
 +
 +  * New upstream release 1.0-rc4, released Jun 6, 2008.
 +    - Bug fixes only, we are in code freeze.
 +  * Moved hh.exe from wine-utils to wine-bin.
 +  * There's no longer an official upstream changelog file. It's possible
 +    to automatically generate one from their git repository, but
 +    probably not very important to do at this time. For now, I've
 +    removed all upstream changelogs from the packages.
 +  * Major update of README.Debian. Obsolete information has been
 +    removed, and what remains has been updated and expanded.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 11 Jun 2008 16:04:35 +0200
 +
 +wine (1.0-rc3-1) unstable; urgency=low
 +
 +  * New upstream release 1.0-rc3, released May 30, 2008.
 +    - Bug fixes only, we are in code freeze.
 +
 + -- Arthur Loiret <arthur.loiret at gmail.com>  Sat, 07 Jun 2008 02:01:18 +0000
 +
 +wine (1.0-rc2-1) unstable; urgency=low
 +
 +  * New upstream release 1.0-rc2, released May 23, 2008.
 +    - Bug fixes only, we are in code freeze.
 +
 +  [ Ove Kaaven ]
 +  * winhelp has been renamed to winhlp32, updated debian/wine-bin.install
 +    accordingly.
 +  * Reverted Debian modifications to tools/wineinstall, they won't be
 +    needed anymore.
 +  * Made libwine-oss depend on oss-compat.
 +  * debian/rules clean now depends unconditionally on clean-arch32 and
 +    clean-arch64. This should allow the clean rule to do its job even
 +    outside of a chroot.
 +  * Deleted debian/wine-utils.undocumented.
 +  * On amd64, symlink in libraries from ia32-libs for Wine to link
 +    against, to work around ia32-libs not providing the necessary
 +    symlinks itself. (Based on list of libraries provided by Arthur
 +    Loiret.)
 +  * Disable the old amd64 hack in favor of the new ia32-libs symlink
 +    hack.
 +
 +  [ Arthur Loiret ]
 +  * Add myself to Uploaders.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 25 May 2008 03:15:23 +0200
 +
 +wine (1.0-rc1-1) unstable; urgency=low
 +
 +  * New upstream release 1.0-rc1, released May 9, 2008.
 +    - Bug fixes only, we are in code freeze.
 +  * Made the pkg-wine-party mailing list the official maintainer of the
 +    Wine packages, and myself a mere uploader.
 +  * Moved libwine's Recommends on libwine-print and libwine-gl to a
 +    Suggests in wine-bin instead, since I've gotten reports from people
 +    not desiring of either component.
 +  * Fixed watch file for Wine "rc" release versions.
 +  * Reverted patch to mark stack executable. It hasn't been doing
 +    anything for a while (the functional part of it probably got lost in
 +    a merge conflict), and nobody has complained, so it's probably not
 +    needed anymore.
 +  * Did some fixes to the debian/maint/* scripts.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 10 May 2008 10:14:53 +0200
 +
 +wine (0.9.61-2) unstable; urgency=low
 +
 +  * Seems ia32-libs is not in shape yet after all. Re-enabled amd64
 +    hack.
 +  * Made debian/diff-amd64.sh handle the new SHA checksums.
 +  * Improved debian/maint/build-final's generation of changelogs for
 +    Debian revisions.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 06 May 2008 07:13:23 +0200
 +
 +wine (0.9.61-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.61, released May 2, 2008.
 +    - Automatic updating of the WINEPREFIX directory.
 +    - Winhelp now uses Richedit as display engine.
 +    - Many RichEdit fixes.
 +    - More improvements to IME support.
 +    - More quartz fixes.
 +    - Implementation for many more Gdiplus functions.
 +    - Lots of bug fixes.
 +  * Added Vcs-* fields to debian/control, pointing at the new Git
 +    repository for the Debian Wine packages.
 +  * Fix diff-amd64.sh to work if building out of the Git repository.
 +  * Allow clean rule to succeed if invoked more than once with
 +    DEB_SAVEBUILD set.
 +  * Added scripts to import new upstream releases and build packages
 +    using the pkg-wine Git repository.
 +  * Added debian/watch file.
 +  * With ia32-libs version 2.4, it's finally possible to build Wine
 +    properly on amd64, so I'll now finally disable the amd64 hack.
 +    (Closes: #381341.)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 03 May 2008 07:46:16 +0200
 +
 +wine (0.9.60-4) unstable; urgency=medium
 +
 +  * Added the lpr virtual package as an alternative dependency for
 +    cupsys-bsd in the libwine-print package. I probably should have
 +    done that in the first place, but wasn't sure it made sense...
 +    Closes: #478053.
 +  * Changed debian/rules to make building and using amd64.tar.lzma.uu
 +    a bit more tweakable (and possible to turn off easily). I'm not
 +    totally sure how I should handle backports, given that ia32-libs
 +    in etch probably lacks a lot of stuff, but there's now commented-out
 +    code to automatically delete amd64.tar.lzma.uu if building on stable.
 +    Perhaps the opposite makes more sense?
 +  * Set urgency to medium, as all the bugfixes in 0.9.60 are eagerly
 +    awaited by many testing users, and all these debian revisions
 +    have stalled migration long enough, I guess.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 26 Apr 2008 18:31:20 +0200
 +
 +wine (0.9.60-3) unstable; urgency=low
 +
 +  * Just noticed that I broke the amd64 build (again) by trying
 +    to install the new winelauncher into a directory that was only
 +    created by a regular build, not by the amd64 hack.
 +    Added a mkdir to hopefully fix it again.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 23 Apr 2008 02:53:56 +0200
 +
 +wine (0.9.60-2) unstable; urgency=low
 +
 +  * Made libwine-print depend on cupsys-bsd. Closes: #475138.
 +  * Made debian/winelauncher use dpkg --print-architecture instead
 +    of uname -m.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 22 Apr 2008 13:33:13 +0200
 +
 +wine (0.9.60-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.60.
 +    - Better support for Windows IMEs.
 +    - Option for Windows-style window decorations.
 +    - Improved system tray behavior.
 +    - Window management fixes.
 +    - Improved quartz audio support.
 +    - Better support for launching apps from Unix file managers.
 +    - Lots of bug fixes.
 +  * This version was released Apr 18, 2008.
 +  * The winelauncher is removed upstream, so its flaws won't be
 +    bothering anyone anymore. Closes: #464166, #321470.
 +  * However, I've been too lazy to change the way I do wine-safe
 +    and wine-auto, so I took the code I used to patch the old
 +    winelauncher with, and put it into debian/winelauncher. So
 +    there's still a wrapper script, but it doesn't do any of the
 +    old winelauncher magic. It just does two things now:
 +    * if Wine is launched from mailcap, it asks for confirmation,
 +      like before.
 +    * plus, I made it check if it's running on amd64, and if so,
 +      check if the user has a broken libnss-mdns configuration.
 +      If so, it tells them to fix it.
 +  * The bug_report.pl script is also removed upstream, so it's
 +    also no longer in the wine-bin package.
 +  * Removed the --ignore-missing-info again.
 +  * Added a couple of hooks for reportbug, so the libwine dependencies
 +    are included if people file bugs on wine or wine-bin.
 +  * Renamed font_convert.sh in wine-utils to wine-font-convert,
 +    to comply with new Policy 3.7.0 guideline of not including
 +    script extension.
 +  * Upgraded Standards-Version to 3.7.3.
 +  * Added dh_desktop call to debian/rules.
 +  * Added a couple of lintian overrides for libwine. The package isn't
 +    lintian clean, I just added what I'm sure should be overridden.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 20 Apr 2008 20:43:19 +0200
 +
 +wine (0.9.59-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.59.
 +    - Improved support for the .NET framework.
 +    - Better services handling through a separate services.exe process.
 +    - Support for ATI fragment shader.
 +    - Better support for http proxies.
 +    - Window management fixes.
 +    - Pre-compiled fonts are now available in the source tree.
 +    - Lots of bug fixes.
 +  * This version was released Apr 4, 2008.
 +  * Installed reg.exe.so and services.exe.so into wine-bin.
 +  * Made libwine-capi priority extra, since the package it depends on,
 +    libcapi20, is also priority extra.
 +  * Re-added #DEBHELPER# token to libwine.postinst and wine.postinst
 +    (probably got lost when I tried to get rid of the debconf templates).
 +  * Removed empty directory /usr/share/applications from wine-utils.
 +  * Removed empty directory /usr/lib/wine from dummy package libwine-twain.
 +  * Changed the architectures of the libasound2-dev build-dependency to
 +    match the architectures of the libwine-alsa package.
 +  * Changed the architectures of the libcapi20-dev build-dependency to
 +    match the architectures of the libwine-capi package.
 +  * Only build-depend on prelink on i386 and amd64. It's not available on
 +    most architectures, after all. Hopefully no big deal for the rest.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 07 Apr 2008 23:00:23 +0200
 +
 +wine (0.9.58-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.58.
 +    - The default version is now Windows XP.
 +    - Many Richedit improvements.
 +    - Beginning of jscript dll support.
 +    - Shell folders now respect XDG directory configuration.
 +    - Many translation updates.
 +    - Lots of bug fixes.
 +  * This version was released Mar 21, 2008.
 +  * Fixed the install-arch*-stamp rules which I added to debian/rules
 +    in my previous upload, so they now work on more than my own machine.
 +    Closes: #472650.
 +  * Added --ignore-missing-info to the dh_shlibdeps in debian/rules,
 +    to see if it might work around the broken ia32-libs package that
 +    the Debian amd64 port is currently suffering from. (Suggested by
 +    Robert Millan.)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 26 Mar 2008 11:33:08 +0100
 +
 +wine (0.9.57-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.57.
 +    - Support for multiple OpenGL pixel formats.
 +    - Improved support for color profiles.
 +    - Many window management fixes.
 +    - Better fullscreen support.
 +    - Lots of bug fixes.
 +  * This version was released Mar 7, 2008.
 +  * Added --list-missing option to the dh_install invocation.
 +  * Installed the translated wine and wineserver man pages.
 +  * Installed *.mod16 and *.sys.so (i.e., winoldap.mod16 and mountmgr.sys.so)
 +    into libwine.
 +  * Installed secedit.exe, svchost.exe, and write.exe into wine-bin.
 +  * Delete marlett.ttf~ (a backup file created by the workaround I currently
 +    use for a fontforge bug)
 +  * Removed empty directories /etc and /usr/share/man/man5 from wine-bin.
 +  * The install-arch* rules (in debian/rules) now uses install-arch*-stamp
 +    to remember if they're already complete, so binary-arch can be rerun
 +    (for testing purposes) without having to wait for install-arch.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Thu, 13 Mar 2008 21:01:52 +0100
 +
 +wine (0.9.56-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.56.
 +    - Proper handling of OpenGL/Direct3D windows with menu bars.
 +    - Stubs for all the d3dx9_xx dlls.
 +    - Several graphics optimizations.
 +    - Many installer fixes.
 +    - Improved MIME message support.
 +    - Lots of bug fixes.
 +  * This version was released Feb 22, 2008.
 +  * Added kfreebsd-amd64 to Architecture fields in debian/control.
 +  * On amd64 architectures, libwine-dev now also depends on libc6-dev-i386.
 +  * Force libwine to depend on libhal, libssl, libXcursor, libXi, libXrandr,
 +    and libXinerama.
 +    While the upstream Wine developers probably don't like the way I handle
 +    dependencies much, I believe that my dependency system might be quite
 +    useful on amd64 in the future, when users won't necessarily have the
 +    necessary 32-bit libraries installed even when the regular 64-bit
 +    libraries are installed and configured. And then they would be like,
 +    "why doesn't ALSA sound work in Wine?!?!!111one1", "why can't I
 +    print???", or "why won't it load SSL? I've installed it!"
 +  * Force libwine-gl to depend on libXcomposite.
 +    Technically, Xcomposite is loaded from x11drv, which is in libwine,
 +    not libwine-gl, but I believe Xcomposite is only actually used for
 +    offscreen rendering surfaces for 3D applications, so it seems
 +    appropriate that libwine-gl pulls it in.
 +  * Force wine-bin to depend on ncurses.
 +    I'm not sure how useful this is. It's only used by wineconsole if
 +    you specifically request ncurses-mode, and ncurses-mode is currently
 +    broken. But then again, why not? It's just ncurses. Everybody has it.
 +  * Added --noinhibit-exec linker option to debian/gendeps.sh, just in
 +    case. Should hopefully ensure that even if not all build dependencies
 +    are available at build time, at least information about those that
 +    are will get into the built binary packages.
 +  * Moved the d3dx9 dlls to libwine-gl.
 +  * Added Homepage field to debian/control.
 +  * Added libwine-oss to package list in README.Debian, and slightly
 +    clarified what the metapackage does.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 03 Mar 2008 03:06:55 +0100
 +
 +wine (0.9.55-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.55.
 +    - Direct3D improvements, including driver version emulation.
 +    - Beginnings of support for OLE objects in Richedit.
 +    - Several fixes to the animation control.
 +    - A bunch of fixes for regression test failures.
 +    - Lots of bug fixes.
 +  * This version was released Feb 8, 2008.
 +  * Added lib32z1-dev build-dependency for amd64. This is not strictly
 +    correct, since Wine does not itself depend on zlib. However, some
 +    libraries in ia32-libs (such as freetype) do, and since there's no
 +    ia32-libs-dev package which might be able to depend on -dev packages,
 +    there's not really any other place to work around this for now.
 +    Hopefully they'll fix that soon...
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 23 Feb 2008 11:54:39 +0100
 +
 +wine (0.9.54-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.54.
 +    - Photoshop CS/CS2 should now work, please help us testing it.
 +      See http://wiki.winehq.org/AdobePhotoshop for details.
 +    - A number of RPC fixes.
 +    - Various improvements to the debugger support.
 +    - Lots of bug fixes.
 +  * This version was released Jan 25, 2008.
 +  * Added unixodbc-dev to Build-Depends. Along with the new upstream
 +    check for libodbc soname from Wine 0.9.53, this should make
 +    Wine able to find unixodbc without the need for symlinks or
 +    environment variables. Closes: #259710.
 +  * Removed libungif4-dev from Build-Depends. In Wine 0.9.21, they
 +    copied the ungif source files they needed into the Wine source code
 +    itself, so an external ungif isn't needed anymore.
 +  * Installed README.Debian into wine-bin and libwine.
 +  * Fixed spelling error in wine-safe message (intented => intended).
 +  * Patched winelauncher to allow the user to override WINEDLLPATH
 +    WINESERVER, and WINELOADER. Closes: #323198.
 +  * Patched winelauncher to only redirect stderr to the debug log,
 +    not stdout. This should allow stdout to be independently
 +    redirected by the user even while capturing a log. (This was
 +    accomplished with bashisms, so winelauncher's interpreter is
 +    no longer /bin/sh, it's now explicitly /bin/bash.)
 +  * Commented out the echo "Wine exited with a successful status"
 +    line in winelauncher. It was a bit annoying and unnecessary...
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 16 Feb 2008 04:47:59 +0100
 +
 +wine (0.9.53-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.53.
 +    - RunOnce and Run entries now executed on startup.
 +    - Beginnings of support for emulated disk devices.
 +    - Many Richedit improvements.
 +    - Nicer looking color dialog.
 +    - Lots of bug fixes.
 +  * This version was released Jan 11, 2008.
 +  * Moved wined3d.dll.so from libwine-gl to libwine, since it no
 +    longer depends on OpenGL, and now implements DirectDraw 2D operations.
 +    Closes: #458804.
 +  * Removed libwine's Conflicts/Replaces of libwine0.0.971116, that's
 +    clearly very, very, old.
 +  * The wine metapackage now Suggests winbind. Closes: #452617.
 +  * Made debian/rules run a Mensis script to correct wrong codepage ranges
 +    embedded in marlett.ttf, to work around fontforge bug #458234, so
 +    Debian users without msttcorefonts installed can get legible text
 +    (in most cases).
 +  * Re-added some debconf stuff (dh_installdebconf, load debconf in postinst,
 +    a few *.config files), so that users will be able to purge out old
 +    debconf templates. Although debconf does not provide a reasonable way
 +    to clean out old templates after a package has been reorganized, I put
 +    db_purge into all the relevant postinsts, at least; let's hope that it
 +    works good enough for an upgrade from etch, and that it allows me to
 +    remove debconf permanently after lenny or so. Closes: #443429.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 12 Jan 2008 02:52:06 +0100
 +
 +wine (0.9.52-2) unstable; urgency=low
 +
 +  * Applied patch to Wine package descriptions from
 +    debian-l10n-english team. Closes: #442952.
 +  * Create /usr/share/doc/wine-bin instead of /usr/share/doc/wine
 +    in the wine-bin package. Closes: #458171.
 +  * Make wine-bin depend on x11-utils as an alternative to the obsolete
 +    xbase-clients. Closes: #458341.
 +  * Upgraded debhelper compatibility level to 5.
 +    Also meant I had to remove some /usr/lib/* cruft from debian/*.install,
 +    since there aren't many files not in /usr/lib/wine these days...
 +  * Changed the -l argument of dh_shlibdeps to point to the "installed"
 +    libraries in debian/libwine/usr/lib, rather than pointing into the
 +    build tree.
 +  * Depend on dh_shlibdeps to generate the correct libwine dependencies
 +    instead of specifying them manually in debian/control; this eliminates
 +    duplicate dependencies. To get the proper versioned dependencies I want,
 +    I call dh_makeshlibs twice, once before dh_shlibdeps (with an
 +    exact-versioned dependency), and once after, with a more relaxed
 +    dependency, for everyone else that might be using libwine.
 +    Closes: #381301.
 +  * Created libwine-dbg package, using dh_strip's --dbg-package feature.
 +    Since the objcopy used for this barfs on the loader binaries
 +    (wine-kthread, wine-pthread), causing dh_strip to abort the build,
 +    I have to exclude these binaries from being stripped, unfortunately.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 31 Dec 2007 04:22:29 +0100
 +
 +wine (0.9.52-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.52.
 +    - Improved graphics tablet support.
 +    - Support for RPC context handles.
 +    - Fixes for some longstanding screen depth issues.
 +    - Implementation of "My Network Places" shell folder.
 +    - Lots of bug fixes.
 +  * This version was released Dec 28, 2007.
 +  * Add build-dependency alternative for gcc-multilib for backports.
 +    Closes: #458011.
 +  * No longer build-depend on old flex versions, I think they fixed
 +    the incompatibilities with new flex versions a while ago.
 +  * Applied tools/c2man.pl patch from Roderich Schupp so that perl 5.10
 +    doesn't barf on it. Closes: #457943. (Should probably be propagated
 +    upstream, but I'm a little lazy. Someone already submitted a patch
 +    to them long ago anyway, not my fault they didn't apply it already.
 +    They'll get around to it once they upgrade their distros, I guess...)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Fri, 28 Dec 2007 18:24:31 +0100
 +
 +wine (0.9.51-2) unstable; urgency=low
 +
 +  * On amd64, Build-Depend on gcc-multilib instead of libc6-dev-i386.
 +    Closes: #457557.
 +  * Changed debian/gendeps.sh and debian/cleandeps.sh to always
 +    return success, so the package will build even if not all
 +    the expected dependencies are available to link against
 +    (typically the case on amd64).
 +  * debian/gendeps.sh is now able to build for 32-bit or 64-bit,
 +    as specified on its command line; debian/rules now invokes it
 +    as appropriate for the target architecture.
 +  * The build-indep rule no longer depends on a configure rule. There's
 +    currently no architecture-independent stuff to build, after all.
 +  * Removed dh_undocumented from debian/rules, and a few other
 +    minor cleanups.
 +  * Removed unnecessary whitespace from ifeq/ifneq conditions in
 +    debian/rules, in case it matters on some systems.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 25 Dec 2007 15:55:24 +0100
 +
 +wine (0.9.51-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.51.
 +    - A bunch of WinHelp improvements.
 +    - Better Japanese font support.
 +    - A ton of rpcrt4 fixes.
 +    - Several Alsa capture fixes.
 +    - Improved support for screen resolution changes.
 +    - Lots of bug fixes.
 +  * This version was released Dec 14, 2007.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 22 Dec 2007 11:51:35 +0100
 +
 +wine (0.9.50-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.50.
 +    - Completed I/O completion.
 +    - Improved user credentials management, including Mac Keychain support.
 +    - More Valgrinding.
 +    - Lots of bug fixes.
 +  * This version was released Nov 30, 2007.
 +  * Apparently I'd put winecfg.desktop into wine-utils by mistake.
 +    Moved it to wine-bin.
 +  * Also moved cmd, iexplore, net, uninstaller, winepath, winhelp, and
 +    xcopy from wine-utils to wine-bin. There are three types of Wine
 +    programs: "essential", "useful to most", and "not useful to most".
 +    Where clearly the first category should go in