[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.27-1-446-gaf4a3bb

Ove Kaaven ovek at arcticnet.no
Sat Aug 22 18:39:30 UTC 2009


The following commit has been merged in the master branch:
commit f332348140b35983ac3955dc800ca9e9c26cf6ba
Merge: 54f39179275c5ff138ab4c465a3cd659815bcf91 f6f458a1eb162adeec83c2241a746b7214a8e843
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Fri Aug 21 19:48:20 2009 +0200

    New upstream release 1.1.28, released Aug 21, 2009.
    - Support for IRDA protocol.
    - Faster initial wineprefix creation.
    - Axis remapping with evdev joysticks.
    - More image formats in WindowsCodecs.
    - Various bug fixes.

diff --combined configure
index b3dc1c1,ab0e97a..0513513
--- a/configure
+++ b/configure
@@@ -1,20 -1,22 +1,22 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for Wine 1.1.27.
+ # Generated by GNU Autoconf 2.64 for Wine 1.1.28.
  #
  # 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, 2007, 2008, 2009 Free Software
+ # Foundation, Inc.
+ #
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
  
  # Be more Bourne compatible
  DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ 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
@@@ -22,23 -24,15 +24,15 @@@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
+   case `(set -o) 2>/dev/null` in #(
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
  esac
  fi
  
  
- 
- 
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
  as_nl='
  '
  export as_nl
@@@ -46,7 -40,13 +40,13 @@@
  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
+ # Prefer a ksh shell builtin over an external printf program on Solaris,
+ # but without wasting forks for bash or zsh.
+ if test -z "$BASH_VERSION$ZSH_VERSION" \
+     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='print -r --'
+   as_echo_n='print -rn --'
+ elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
@@@ -57,7 -57,7 +57,7 @@@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@@ -80,13 -80,6 +80,6 @@@ if test "${PATH_SEPARATOR+set}" != set
    }
  fi
  
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
- 
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
@@@ -96,15 -89,15 +89,15 @@@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+   done
  IFS=$as_save_IFS
  
       ;;
@@@ -116,12 -109,16 +109,16 @@@ if test "x$as_myself" = x; the
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
  
- # Work around bugs in pre-3.0 UWIN ksh.
- for as_var in ENV MAIL MAILPATH
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # Unset variables that we do not need and which cause bugs (e.g. in
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+ # suppresses any "Segmentation fault" message there.  '((' could
+ # trigger a bug in pdksh 5.2.14.
+ for as_var in BASH_ENV ENV MAIL MAILPATH
+ do eval test x\${$as_var+set} = xset \
+   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
  done
  PS1='$ '
  PS2='> '
@@@ -133,330 -130,300 +130,300 @@@ export LC_AL
  LANGUAGE=C
  export LANGUAGE
  
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
- fi
- 
- 
- # Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
- 	  }
- 	  /^X\/\(\/\/\)$/{
- 	    s//\1/
- 	    q
- 	  }
- 	  /^X\/\(\/\).*/{
- 	    s//\1/
- 	    q
- 	  }
- 	  s/.*/./; q'`
- 
  # CDPATH.
- $as_unset CDPATH
- 
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  if test "x$CONFIG_SHELL" = x; then
-   if (eval ":") 2>/dev/null; then
-   as_have_required=yes
+   as_bourne_compatible="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
+   # is contrary to our usage.  Disable this feature.
+   alias -g '\${1+\"\$@\"}'='\"\$@\"'
+   setopt NO_GLOB_SUBST
  else
-   as_have_required=no
+   case \`(set -o) 2>/dev/null\` in #(
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
+ esac
  fi
- 
-   if test $as_have_required = yes &&	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
+ "
+   as_required="as_fn_return () { (exit \$1); }
+ as_fn_success () { as_fn_return 0; }
+ as_fn_failure () { as_fn_return 1; }
+ as_fn_ret_success () { return 0; }
+ as_fn_ret_failure () { return 1; }
  
  exitcode=0
- if as_func_success; then
-   :
- else
-   exitcode=1
-   echo as_func_success failed.
- fi
- 
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
- fi
- 
- if as_func_ret_success; then
-   :
- else
-   exitcode=1
-   echo as_func_ret_success failed.
- fi
- 
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
- fi
- 
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-   :
+ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+ as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+ 
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+ test x\$exitcode = x0 || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+ test \$(( 1 + 1 )) = 2 || exit 1"
+   if (eval "$as_required") 2>/dev/null; then :
+   as_have_required=yes
  else
-   exitcode=1
-   echo positional parameters were not saved.
+   as_have_required=no
  fi
+   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
  
- test \$exitcode = 0) || { (exit 1); exit 1; }
- 
- (
-   as_lineno_1=\$LINENO
-   as_lineno_2=\$LINENO
-   test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-   test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
- ") 2> /dev/null; then
-   :
  else
-   as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_found=false
  for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   case $as_dir in
+   as_found=:
+   case $as_dir in #(
  	 /*)
  	   for as_base in sh bash ksh sh5; do
- 	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ 	     # Try only shells that exist, to save several forks.
+ 	     as_shell=$as_dir/$as_base
+ 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ 		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+   CONFIG_SHELL=$as_shell as_have_required=yes
+ 		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+   break 2
+ fi
+ fi
  	   done;;
         esac
+   as_found=false
  done
+ $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ 	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+   CONFIG_SHELL=$SHELL as_have_required=yes
+ fi; }
  IFS=$as_save_IFS
  
  
-       for as_shell in $as_candidate_shells $SHELL; do
- 	 # Try only shells that exist, to save several forks.
- 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
- 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
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
- esac
- 
- fi
- 
- 
- :
- _ASEOF
- }; then
-   CONFIG_SHELL=$as_shell
- 	       as_have_required=yes
- 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
- 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
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
- esac
- 
- fi
- 
- 
- :
- (as_func_return () {
-   (exit $1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
- 
- exitcode=0
- if as_func_success; then
-   :
- else
-   exitcode=1
-   echo as_func_success failed.
- fi
- 
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
- fi
- 
- if as_func_ret_success; then
-   :
- else
-   exitcode=1
-   echo as_func_ret_success failed.
- fi
- 
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
- fi
- 
- if ( set x; as_func_ret_success y && test x = "$1" ); then
-   :
- else
-   exitcode=1
-   echo positional parameters were not saved.
- fi
- 
- test $exitcode = 0) || { (exit 1); exit 1; }
- 
- (
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
- 
- _ASEOF
- }; then
-   break
- fi
- 
- fi
- 
-       done
- 
-       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
+       if test "x$CONFIG_SHELL" != x; then :
+   # We cannot yet assume a decent shell, so we have to provide a
+ 	# neutralization value for shells without unset; and this also
+ 	# works around shells that cannot unset nonexistent variables.
+ 	BASH_ENV=/dev/null
+ 	ENV=/dev/null
+ 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  	export CONFIG_SHELL
  	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  fi
  
- 
-     if test $as_have_required = no; then
-   echo This script requires a shell more modern than all the
-       echo shells that I found on your system.  Please install a
-       echo modern shell, or manually run the script under such a
-       echo shell if you do have one.
-       { (exit 1); exit 1; }
+     if test x$as_have_required = xno; then :
+   $as_echo "$0: This script requires a shell more modern than all"
+   $as_echo "$0: the shells that I found on your system."
+   if test x${ZSH_VERSION+set} = xset ; then
+     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+   else
+     $as_echo "$0: Please tell bug-autoconf at gnu.org and
+ $0: wine-devel at winehq.org about your system, including any
+ $0: error possibly output before this message. Then install
+ $0: a modern shell, or manually run the script under such a
+ $0: shell if you do have one."
+   fi
+   exit 1
  fi
- 
- 
  fi
- 
  fi
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+ unset CLICOLOR_FORCE GREP_OPTIONS
  
+ ## --------------------- ##
+ ## M4sh Shell Functions. ##
+ ## --------------------- ##
+ # as_fn_unset VAR
+ # ---------------
+ # Portably unset VAR.
+ as_fn_unset ()
+ {
+   { eval $1=; unset $1;}
+ }
+ as_unset=as_fn_unset
  
+ # as_fn_set_status STATUS
+ # -----------------------
+ # Set $? to STATUS, without forking.
+ as_fn_set_status ()
+ {
+   return $1
+ } # as_fn_set_status
  
- (eval "as_func_return () {
-   (exit \$1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
+ # as_fn_exit STATUS
+ # -----------------
+ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+ as_fn_exit ()
+ {
+   set +e
+   as_fn_set_status $1
+   exit $1
+ } # as_fn_exit
+ 
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
+ as_fn_mkdir_p ()
+ {
  
- exitcode=0
- if as_func_success; then
-   :
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+   test -d "$as_dir" || eval $as_mkdir_p || {
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+       as_dir=`$as_dirname -- "$as_dir" ||
+ $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" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\/\)[^/].*/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\/\)$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\).*/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+ # advantage of any shell optimizations that allow amortized linear growth over
+ # repeated appends, instead of the typical quadratic growth present in naive
+ # implementations.
+ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+   eval 'as_fn_append ()
+   {
+     eval $1+=\$2
+   }'
  else
-   exitcode=1
-   echo as_func_success failed.
- fi
+   as_fn_append ()
+   {
+     eval $1=\$$1\$2
+   }
+ fi # as_fn_append
+ 
+ # as_fn_arith ARG...
+ # ------------------
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+     as_val=$(( $* ))
+   }'
+ else
+   as_fn_arith ()
+   {
+     as_val=`expr "$@" || test $? -eq 1`
+   }
+ fi # as_fn_arith
  
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
- fi
  
- if as_func_ret_success; then
-   :
+ # as_fn_error ERROR [LINENO LOG_FD]
+ # ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+ # script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+   as_status=$?; test $as_status -eq 0 && as_status=1
+   if test "$3"; then
+     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+   fi
+   $as_echo "$as_me: error: $1" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
  else
-   exitcode=1
-   echo as_func_ret_success failed.
+   as_expr=false
  fi
  
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
+ if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
  fi
  
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-   :
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+   as_dirname=dirname
  else
-   exitcode=1
-   echo positional parameters were not saved.
+   as_dirname=false
  fi
  
- 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.
- }
- 
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\/\(\/\/\)$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\/\(\/\).*/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
  
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
  
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
-   # line-number line after each line using $LINENO; the second 'sed'
-   # does the real work.  The second script uses 'N' to pair each
-   # line-number line with the line containing $LINENO, and appends
-   # trailing '-' during substitution so that $LINENO is not a special
-   # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-   # scripts with optimization help from Paolo Bonzini.  Blame Lee
-   # E. McMahon (1931-1989) for sed's syntax.  :-)
+   as_lineno_1=$LINENO as_lineno_1a=$LINENO
+   as_lineno_2=$LINENO as_lineno_2a=$LINENO
+   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
    sed -n '
      p
      /[$]LINENO/=
@@@ -473,8 -440,7 +440,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
-    { (exit 1); exit 1; }; }
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
@@@ -484,29 -450,18 +450,18 @@@
    exit
  }
  
- 
- if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   as_dirname=dirname
- else
-   as_dirname=false
- fi
- 
  ECHO_C= ECHO_N= ECHO_T=
- case `echo -n x` in
+ case `echo -n x` in #(((((
  -n*)
-   case `echo 'x\c'` in
+   case `echo 'xy\c'` in
    *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-   *)   ECHO_C='\c';;
+   xy)  ECHO_C='\c';;
+   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+        ECHO_T='	';;
    esac;;
  *)
    ECHO_N='-n';;
  esac
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
@@@ -536,7 -491,7 +491,7 @@@ rm -f conf$$ conf$$.exe conf$$.dir/conf
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
@@@ -555,10 -510,10 +510,10 @@@ els
        if test -d "$1"; then
  	test -d "$1/.";
        else
- 	case $1 in
+ 	case $1 in #(
  	-*)set "./$1";;
  	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
@@@ -572,7 -527,6 +527,6 @@@ as_tr_cpp="eval sed 'y%*$as_cr_letters%
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
- 
  exec 7<&0 </dev/null 6>&1
  
  # Name of the host.
@@@ -591,14 -545,14 +545,14 @@@ cross_compiling=n
  subdirs=
  MFLAGS=
  MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
  
  # Identity of this package.
  PACKAGE_NAME='Wine'
  PACKAGE_TARNAME='wine'
- PACKAGE_VERSION='1.1.27'
- PACKAGE_STRING='Wine 1.1.27'
+ PACKAGE_VERSION='1.1.28'
+ PACKAGE_STRING='Wine 1.1.28'
  PACKAGE_BUGREPORT='wine-devel at winehq.org'
+ PACKAGE_URL='http://www.winehq.org'
  
  ac_unique_file="server/atom.c"
  # Factoring default headers for most tests.
@@@ -655,6 -609,7 +609,7 @@@ LDAPLIB
  LIBPOLL
  LIBDL
  EXTRA_BINARIES
+ MAIN_BINARY
  SOCKETLIBS
  CRTLIBS
  LDPATH
@@@ -741,6 -696,7 +696,7 @@@ A
  BISON
  FLEX
  TOOLSDIR
+ WOW64_DISABLE
  WIN16_INSTALL
  WIN16_FILES
  TARGETFLAGS
@@@ -795,6 -751,7 +751,7 @@@ bindi
  program_transform_name
  prefix
  exec_prefix
+ PACKAGE_URL
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
@@@ -826,7 -783,7 +783,7 @@@ with_freetyp
  with_gphoto
  with_glu
  with_gnutls
- with_libgsm
+ with_gsm
  with_hal
  with_jack
  with_jpeg
@@@ -850,6 -807,7 +807,7 @@@ with_xsh
  with_xslt
  with_xxf86vm
  with_wine_tools
+ with_wine64
  with_x
  '
        ac_precious_vars='build_alias
@@@ -973,8 -931,7 +931,7 @@@ d
      ac_useropt=`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
-    { (exit 1); exit 1; }; }
+       as_fn_error "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
@@@ -1000,8 -957,7 +957,7 @@@
      ac_useropt=`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
-    { (exit 1); exit 1; }; }
+       as_fn_error "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
@@@ -1205,8 -1161,7 +1161,7 @@@
      ac_useropt=`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
-    { (exit 1); exit 1; }; }
+       as_fn_error "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
@@@ -1222,8 -1177,7 +1177,7 @@@
      ac_useropt=`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
-    { (exit 1); exit 1; }; }
+       as_fn_error "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
@@@ -1253,17 -1207,17 +1207,17 @@@
    | --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
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; }
+   -*) as_fn_error "unrecognized option: \`$ac_option'
+ Try \`$0 --help' for more information."
      ;;
  
    *=*)
      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
-    { (exit 1); exit 1; }; }
+     case $ac_envvar in #(
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
+       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+     esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
@@@ -1280,15 -1234,13 +1234,13 @@@ 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
-    { (exit 1); exit 1; }; }
+   as_fn_error "missing argument to $ac_option"
  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; }; } ;;
+     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
@@@ -1311,8 -1263,7 +1263,7 @@@ d
      [\\/$]* | ?:[\\/]* )  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
-    { (exit 1); exit 1; }; }
+   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
@@@ -1342,11 -1293,9 +1293,9 @@@ 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
-    { (exit 1); exit 1; }; }
+   as_fn_error "working directory cannot be determined"
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-    { (exit 1); exit 1; }; }
+   as_fn_error "pwd does not report name of working directory"
  
  
  # Find the source files, if location was not specified.
@@@ -1385,13 -1334,11 +1334,11 @@@ 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
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  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
-    { (exit 1); exit 1; }; }
+ 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
@@@ -1417,7 -1364,7 +1364,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.27 to adapt to many kinds of systems.
+ \`configure' configures Wine 1.1.28 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@@ -1486,7 -1433,7 +1433,7 @@@ f
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of Wine 1.1.27:";;
+      short | recursive ) echo "Configuration of Wine 1.1.28:";;
     esac
    cat <<\_ACEOF
  
@@@ -1517,7 -1464,7 +1464,7 @@@ Optional Packages
    --without-gphoto        do not use gphoto (Digital Camera support)
    --without-glu           do not use the GLU library
    --without-gnutls        do not use GnuTLS (schannel support)
-   --without-libgsm        do not use libgsm (GSM 06.10 codec support)
+   --without-gsm           do not use libgsm (GSM 06.10 codec support)
    --without-hal           do not use HAL (dynamic device support)
    --without-jack          do not use the Jack sound support
    --without-jpeg          do not use JPEG
@@@ -1541,6 -1488,7 +1488,7 @@@
    --without-xslt          do not use XSLT
    --without-xxf86vm       do not use XFree video mode extension
    --with-wine-tools=DIR   use Wine tools from directory DIR
+   --with-wine64=DIR       use the 64-bit Wine in DIR for a Wow64 build
    --with-x                use the X Window System
  
  Some influential environment variables:
@@@ -1560,6 -1508,7 +1508,7 @@@ Use these variables to override the cho
  it to find libraries and programs with nonstandard names/locations.
  
  Report bugs to <wine-devel at winehq.org>.
+ Wine home page: <http://www.winehq.org>.
  _ACEOF
  ac_status=$?
  fi
@@@ -1622,22 -1571,528 +1571,528 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- Wine configure 1.1.27
- generated by GNU Autoconf 2.63
+ Wine configure 1.1.28
+ generated by GNU Autoconf 2.64
  
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
    exit
  fi
+ 
+ ## ------------------------ ##
+ ## Autoconf initialization. ##
+ ## ------------------------ ##
+ 
+ # ac_fn_c_try_compile LINENO
+ # --------------------------
+ # Try to compile conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   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:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   return $ac_retval
+ 
+ } # ac_fn_c_try_compile
+ 
+ # ac_fn_cxx_try_compile LINENO
+ # ----------------------------
+ # Try to compile conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_cxx_try_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   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:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && {
+ 	 test -z "$ac_cxx_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   return $ac_retval
+ 
+ } # ac_fn_cxx_try_compile
+ 
+ # ac_fn_c_try_link LINENO
+ # -----------------------
+ # Try to link conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_link ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   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:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && {
+ 	 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 :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   return $ac_retval
+ 
+ } # ac_fn_c_try_link
+ 
+ # ac_fn_c_try_cpp LINENO
+ # ----------------------
+ # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_cpp ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { { ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+     ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   return $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+ 
+ # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+ # -------------------------------------------------------
+ # Tests whether HEADER exists, giving a warning if it cannot be compiled using
+ # the include files in INCLUDES and setting the cache variable VAR
+ # accordingly.
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ else
+   # Is the header compilable?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+ $as_echo_n "checking $2 usability... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ #include <$2>
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_header_compiler=yes
+ else
+   ac_header_compiler=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+ $as_echo_n "checking $2 presence... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <$2>
+ _ACEOF
+ if ac_fn_c_try_cpp "$LINENO"; then :
+   ac_header_preproc=yes
+ else
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$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:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+ $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+     ;;
+   no:yes:* )
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+ $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+ $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ( cat <<\_ASBOX
+ ## ------------------------------------ ##
+ ## Report this to wine-devel at winehq.org ##
+ ## ------------------------------------ ##
+ _ASBOX
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_header_mongrel
+ 
+ # ac_fn_c_try_run LINENO
+ # ----------------------
+ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+ # that executables *can* be run.
+ ac_fn_c_try_run ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   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:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: program exited with status $ac_status" >&5
+        $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+   return $ac_retval
+ 
+ } # ac_fn_c_try_run
+ 
+ # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+ # -------------------------------------------------------
+ # Tests whether HEADER exists and can be compiled using the include files in
+ # INCLUDES, setting the cache variable VAR accordingly.
+ ac_fn_c_check_header_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ #include <$2>
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   eval "$3=yes"
+ else
+   eval "$3=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_header_compile
+ 
+ # ac_fn_c_check_func LINENO FUNC VAR
+ # ----------------------------------
+ # Tests whether FUNC exists, setting the cache variable VAR accordingly
+ ac_fn_c_check_func ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+ #define $2 innocuous_$2
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $2 (); 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 $2
+ 
+ /* 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 $2 ();
+ /* 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_$2 || defined __stub___$2
+ choke me
+ #endif
+ 
+ int
+ main ()
+ {
+ return $2 ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   eval "$3=yes"
+ else
+   eval "$3=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_func
+ 
+ # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+ # ----------------------------------------------------
+ # Tries to find if the field MEMBER exists in type AGGR, after including
+ # INCLUDES, setting cache variable VAR accordingly.
+ ac_fn_c_check_member ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+ if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $5
+ int
+ main ()
+ {
+ static $2 ac_aggr;
+ if (ac_aggr.$3)
+ return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   eval "$4=yes"
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $5
+ int
+ main ()
+ {
+ static $2 ac_aggr;
+ if (sizeof ac_aggr.$3)
+ return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   eval "$4=yes"
+ else
+   eval "$4=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ eval ac_res=\$$4
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_member
+ 
+ # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+ # -------------------------------------------
+ # Tests whether TYPE exists after having included INCLUDES, setting cache
+ # variable VAR accordingly.
+ ac_fn_c_check_type ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=no"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ if (sizeof ($2))
+ 	 return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ if (sizeof (($2)))
+ 	    return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ 
+ else
+   eval "$3=yes"
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+ } # ac_fn_c_check_type
  cat >config.log <<_ACEOF
  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.27, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ It was created by Wine $as_me 1.1.28, which was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
  
@@@ -1673,8 -2128,8 +2128,8 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   $as_echo "PATH: $as_dir"
- done
+     $as_echo "PATH: $as_dir"
+   done
  IFS=$as_save_IFS
  
  } >&5
@@@ -1711,9 -2166,9 +2166,9 @@@ d
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
      2)
-       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+       as_fn_append ac_configure_args1 " '$ac_arg'"
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
@@@ -1729,13 -2184,13 +2184,13 @@@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
-       ac_configure_args="$ac_configure_args '$ac_arg'"
+       as_fn_append ac_configure_args " '$ac_arg'"
        ;;
      esac
    done
  done
- $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
- $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ { ac_configure_args0=; unset ac_configure_args0;}
+ { ac_configure_args1=; unset ac_configure_args1;}
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
@@@ -1760,13 -2215,13 +2215,13 @@@ _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
+       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
  $as_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 ;;
+       *) { eval $ac_var=; unset $ac_var;} ;;
        esac ;;
      esac
    done
@@@ -1838,39 -2293,41 +2293,41 @@@ _ASBO
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
  done
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
  rm -f -r conftest* confdefs.h
  
+ $as_echo "/* confdefs.h */" > confdefs.h
+ 
  # Predefined preprocessor variables.
  
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
- 
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
  _ACEOF
  
- 
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_VERSION "$PACKAGE_VERSION"
  _ACEOF
  
- 
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_STRING "$PACKAGE_STRING"
  _ACEOF
  
- 
  cat >>confdefs.h <<_ACEOF
  #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
  _ACEOF
  
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_URL "$PACKAGE_URL"
+ _ACEOF
+ 
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
@@@ -1889,7 -2346,7 +2346,7 @@@ for ac_site_file in "$ac_site_file1" "$
  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:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
@@@ -1900,7 -2357,7 +2357,7 @@@ 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:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@@ -1908,7 -2365,7 +2365,7 @@@
      esac
    fi
  else
-   { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
@@@ -1923,11 -2380,11 +2380,11 @@@ 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:${as_lineno-$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;}
        ac_cache_corrupted=: ;;
      ,set)
-       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+       { $as_echo "$as_me:${as_lineno-$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;}
        ac_cache_corrupted=: ;;
      ,);;
@@@ -1937,17 -2394,17 +2394,17 @@@
  	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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
@@@ -1959,43 -2416,20 +2416,20 @@@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
      esac
    fi
  done
  if $ac_cache_corrupted; then
-   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  fi
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+ ## -------------------- ##
+ ## Main body of script. ##
+ ## -------------------- ##
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
@@@ -2009,24 -2443,16 +2443,16 @@@ ac_config_headers="$ac_config_headers i
  
  ac_aux_dir=
  for ac_dir in tools "$srcdir"/tools; do
-   if test -f "$ac_dir/install-sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install-sh -c"
-     break
-   elif test -f "$ac_dir/install.sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install.sh -c"
-     break
-   elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
+   for ac_t in install-sh install.sh shtool; do
+     if test -f "$ac_dir/$ac_t"; then
+       ac_aux_dir=$ac_dir
+       ac_install_sh="$ac_aux_dir/$ac_t -c"
+       break 2
+     fi
+   done
  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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot find install-sh, install.sh, or shtool in tools \"$srcdir\"/tools" "$LINENO" 5
  fi
  
  # These three variables are undocumented and unsupported,
@@@ -2041,22 -2467,22 +2467,22 @@@ ac_configure="$SHELL $ac_aux_dir/config
  
  
  # Check whether --enable-win16 was given.
- if test "${enable_win16+set}" = set; then
+ if test "${enable_win16+set}" = set; then :
    enableval=$enable_win16;
  fi
  
  # Check whether --enable-win64 was given.
- if test "${enable_win64+set}" = set; then
+ if test "${enable_win64+set}" = set; then :
    enableval=$enable_win64;
  fi
  
  # Check whether --enable-tests was given.
- if test "${enable_tests+set}" = set; then
+ 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
+ if test "${enable_maintainer_mode+set}" = set; then :
    enableval=$enable_maintainer_mode;
  else
    MAINTAINER_MODE=\#
@@@ -2066,259 -2492,257 +2492,257 @@@ f
  
  
  # Check whether --with-alsa was given.
- if test "${with_alsa+set}" = set; then
+ if test "${with_alsa+set}" = set; then :
    withval=$with_alsa; if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi
  fi
  
  
  # Check whether --with-audioio was given.
- if test "${with_audioio+set}" = set; then
+ if test "${with_audioio+set}" = set; then :
    withval=$with_audioio; if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi
  fi
  
  
  # Check whether --with-capi was given.
- if test "${with_capi+set}" = set; then
+ if test "${with_capi+set}" = set; then :
    withval=$with_capi; if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi
  fi
  
  
  # Check whether --with-cms was given.
- if test "${with_cms+set}" = set; then
+ if test "${with_cms+set}" = set; then :
    withval=$with_cms; if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi
  fi
  
  
  # Check whether --with-coreaudio was given.
- if test "${with_coreaudio+set}" = set; then
+ if test "${with_coreaudio+set}" = set; then :
    withval=$with_coreaudio; if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi
  fi
  
  
  # Check whether --with-cups was given.
- if test "${with_cups+set}" = set; then
+ if test "${with_cups+set}" = set; then :
    withval=$with_cups;
  fi
  
  
  # Check whether --with-curses was given.
- if test "${with_curses+set}" = set; then
+ if test "${with_curses+set}" = set; then :
    withval=$with_curses; if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi
  fi
  
  
  # Check whether --with-esd was given.
- if test "${with_esd+set}" = set; then
+ if test "${with_esd+set}" = set; then :
    withval=$with_esd;
  fi
  
  
  # Check whether --with-fontconfig was given.
- if test "${with_fontconfig+set}" = set; then
+ if test "${with_fontconfig+set}" = set; then :
    withval=$with_fontconfig; if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi
  fi
  
  
  # Check whether --with-freetype was given.
- if test "${with_freetype+set}" = set; then
+ if test "${with_freetype+set}" = set; then :
    withval=$with_freetype;
  fi
  
  
  # Check whether --with-gphoto was given.
- if test "${with_gphoto+set}" = set; then
+ if test "${with_gphoto+set}" = set; then :
    withval=$with_gphoto;
  fi
  
  
  # Check whether --with-glu was given.
- if test "${with_glu+set}" = set; then
+ if test "${with_glu+set}" = set; then :
    withval=$with_glu; if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi
  fi
  
  
  # Check whether --with-gnutls was given.
- if test "${with_gnutls+set}" = set; then
+ if test "${with_gnutls+set}" = set; then :
    withval=$with_gnutls;
  fi
  
  
- # Check whether --with-libgsm was given.
- if test "${with_libgsm+set}" = set; then
-   withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi
+ # Check whether --with-gsm was given.
+ if test "${with_gsm+set}" = set; then :
+   withval=$with_gsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi
  fi
  
  
  # Check whether --with-hal was given.
- if test "${with_hal+set}" = set; then
+ if test "${with_hal+set}" = set; then :
    withval=$with_hal;
  fi
  
  
  # Check whether --with-jack was given.
- if test "${with_jack+set}" = set; then
+ if test "${with_jack+set}" = set; then :
    withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi
  fi
  
  
  # Check whether --with-jpeg was given.
- if test "${with_jpeg+set}" = set; then
+ if test "${with_jpeg+set}" = set; then :
    withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi
  fi
  
  
  # Check whether --with-ldap was given.
- if test "${with_ldap+set}" = set; then
+ if test "${with_ldap+set}" = set; then :
    withval=$with_ldap; if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi
  fi
  
  
  # Check whether --with-nas was given.
- if test "${with_nas+set}" = set; then
+ if test "${with_nas+set}" = set; then :
    withval=$with_nas; if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi
  fi
  
  
  # Check whether --with-opengl was given.
- if test "${with_opengl+set}" = set; then
+ if test "${with_opengl+set}" = set; then :
    withval=$with_opengl;
  fi
  
  
  # Check whether --with-openssl was given.
- if test "${with_openssl+set}" = set; then
+ if test "${with_openssl+set}" = set; then :
    withval=$with_openssl; if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi
  fi
  
  
  # Check whether --with-oss was given.
- if test "${with_oss+set}" = set; then
+ if test "${with_oss+set}" = set; then :
    withval=$with_oss; if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi
  fi
  
  
  # Check whether --with-png was given.
- if test "${with_png+set}" = set; then
+ if test "${with_png+set}" = set; then :
    withval=$with_png; if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi
  fi
  
  
  # Check whether --with-pthread was given.
- if test "${with_pthread+set}" = set; then
+ if test "${with_pthread+set}" = set; then :
    withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi
  fi
  
  
  # Check whether --with-sane was given.
- if test "${with_sane+set}" = set; then
+ if test "${with_sane+set}" = set; then :
    withval=$with_sane;
  fi
  
  
  # Check whether --with-xcomposite was given.
- if test "${with_xcomposite+set}" = set; then
+ if test "${with_xcomposite+set}" = set; then :
    withval=$with_xcomposite; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi
  fi
  
  
  # Check whether --with-xcursor was given.
- if test "${with_xcursor+set}" = set; then
+ if test "${with_xcursor+set}" = set; then :
    withval=$with_xcursor; if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi
  fi
  
  
  # Check whether --with-xinerama was given.
- if test "${with_xinerama+set}" = set; then
+ if test "${with_xinerama+set}" = set; then :
    withval=$with_xinerama; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi
  fi
  
  
  # Check whether --with-xinput was given.
- if test "${with_xinput+set}" = set; then
+ if test "${with_xinput+set}" = set; then :
    withval=$with_xinput; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi
  fi
  
  
  # Check whether --with-xml was given.
- if test "${with_xml+set}" = set; then
+ if test "${with_xml+set}" = set; then :
    withval=$with_xml;
  fi
  
  
  # Check whether --with-xrandr was given.
- if test "${with_xrandr+set}" = set; then
+ if test "${with_xrandr+set}" = set; then :
    withval=$with_xrandr; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi
  fi
  
  
  # Check whether --with-xrender was given.
- if test "${with_xrender+set}" = set; then
+ if test "${with_xrender+set}" = set; then :
    withval=$with_xrender; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi
  fi
  
  
  # Check whether --with-xshape was given.
- if test "${with_xshape+set}" = set; then
+ if test "${with_xshape+set}" = set; then :
    withval=$with_xshape; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi
  fi
  
  
  # Check whether --with-xshm was given.
- if test "${with_xshm+set}" = set; then
+ if test "${with_xshm+set}" = set; then :
    withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi
  fi
  
  
  # Check whether --with-xslt was given.
- if test "${with_xslt+set}" = set; then
+ if test "${with_xslt+set}" = set; then :
    withval=$with_xslt;
  fi
  
  
  # Check whether --with-xxf86vm was given.
- if test "${with_xxf86vm+set}" = set; then
+ if test "${with_xxf86vm+set}" = set; then :
    withval=$with_xxf86vm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi
  fi
  
  
  
  # Check whether --with-wine-tools was given.
- if test "${with_wine_tools+set}" = set; then
+ if test "${with_wine_tools+set}" = set; then :
    withval=$with_wine_tools;
  fi
  
  
+ # Check whether --with-wine64 was given.
+ if test "${with_wine64+set}" = set; then :
+   withval=$with_wine64;
+ fi
+ 
+ 
  # 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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  
- { $as_echo "$as_me:$LINENO: checking build system type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
  $as_echo_n "checking build system type... " >&6; }
- if test "${ac_cv_build+set}" = set; then
+ if test "${ac_cv_build+set}" = set; then :
    $as_echo_n "(cached) " >&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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
  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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
  $as_echo "$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;}
-    { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
@@@ -2334,28 -2758,24 +2758,24 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
  $as_echo_n "checking host system type... " >&6; }
- if test "${ac_cv_host+set}" = set; then
+ if test "${ac_cv_host+set}" = set; then :
    $as_echo_n "(cached) " >&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;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
  fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
  $as_echo "$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;}
-    { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
@@@ -2375,20 -2795,17 +2795,17 @@@ case $host_os in *\ *) host_os=`echo "$
  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.
- 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.
- You need to run 'make distclean' in the source tree first." >&2;}
-    { (exit 1); exit 1; }; }
+       as_fn_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." "$LINENO" 5
      fi ;;
  esac
  
  
- { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ { $as_echo "$as_me:${as_lineno-$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'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
@@@ -2406,11 -2823,11 +2823,11 @@@ 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
    SET_MAKE=
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
@@@ -2423,9 -2840,9 +2840,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
@@@ -2436,24 -2853,24 +2853,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2463,9 -2880,9 +2880,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
@@@ -2476,24 -2893,24 +2893,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  $as_echo "$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2502,7 -2919,7 +2919,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -2516,9 -2933,9 +2933,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
@@@ -2529,24 -2946,24 +2946,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2556,9 -2973,9 +2973,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
@@@ -2570,18 -2987,18 +2987,18 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
       fi
      ac_cv_prog_CC="cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
@@@ -2600,10 -3017,10 +3017,10 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2615,9 -3032,9 +3032,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
+ if test "${ac_cv_prog_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
@@@ -2628,24 -3045,24 +3045,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
  $as_echo "$CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2659,9 -3076,9 +3076,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
@@@ -2672,24 -3089,24 +3089,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
  $as_echo "$ac_ct_CC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -2702,7 -3119,7 +3119,7 @@@ 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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -2713,73 -3130,55 +3130,55 @@@ f
  fi
  
  
- test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$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
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+ as_fn_error "no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." "$LINENO" 5; }
  
  # Provide some information about the compiler.
- $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  set X $ac_compile
  ac_compiler=$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 "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
+ for ac_option in --version -v -V -qversion; do
+   { { ac_try="$ac_compiler $ac_option >&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 "$ac_compiler -v >&5") 2>&5
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
-   $as_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 "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+   if test -s conftest.err; then
+     sed '10a\
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     rm -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
  
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
+ #include <stdio.h>
  int
  main ()
  {
+ FILE *f = fopen ("conftest.out", "w");
+  return ferror (f) || fclose (f) != 0;
  
    ;
    return 0;
  }
  _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.out.dSYM a.exe b.out conftest.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 "$as_me:${as_lineno-$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[^ ]*//'`
  
@@@ -2796,17 -3195,17 +3195,17 @@@ d
  done
  rm -f $ac_rmfiles
  
- if { (ac_try="$ac_link_default"
+ if { { ac_try="$ac_link_default"
  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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; 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'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@@ -2823,7 -3222,7 +3222,7 @@@ d
  	# certainly right.
  	break;;
      *.* )
-         if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ 	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
@@@ -2842,84 -3241,75 +3241,75 @@@ test "$ac_cv_exeext" = no && ac_cv_exee
  else
    ac_file=''
  fi
- 
- { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
  $as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then
+ if test -z "$ac_file"; then :
    $as_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:${as_lineno-$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
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }; }
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
  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 "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
  $as_echo_n "checking whether the C compiler works... " >&6; }
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
    if { ac_try='./$ac_file'
-   { (case "(($ac_try" in
+   { { 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; 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:${as_lineno-$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.
+ as_fn_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.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+ See \`config.log' for more details." "$LINENO" 5; }
      fi
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.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 "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  $as_echo "$cross_compiling" >&6; }
  
- { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
  $as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
+ 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then :
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
@@@ -2934,32 -3324,24 +3324,24 @@@ for ac_file in conftest.exe conftest co
    esac
  done
  else
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { { $as_echo "$as_me:${as_lineno-$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
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
  fi
- 
  rm -f conftest$ac_cv_exeext
- { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
+ if test "${ac_cv_objext+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -2971,17 -3353,17 +3353,17 @@@ main (
  }
  _ACEOF
  rm -f conftest.o conftest.obj
- if { (ac_try="$ac_compile"
+ 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then :
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
@@@ -2994,31 -3376,23 +3376,23 @@@ els
    $as_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:${as_lineno-$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
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+ as_fn_error "cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." "$LINENO" 5; }
  fi
- 
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3032,37 -3406,16 +3406,16 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_compiler_gnu=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
+   ac_compiler_gnu=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ { $as_echo "$as_me:${as_lineno-$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
@@@ -3071,20 -3424,16 +3424,16 @@@ els
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  $as_echo_n "checking whether $CC accepts -g... " >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
+ if test "${ac_cv_prog_cc_g+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
     ac_cv_prog_cc_g=no
     CFLAGS="-g"
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3095,35 -3444,11 +3444,11 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_prog_cc_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   CFLAGS=""
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3134,36 -3459,12 +3459,12 @@@ main (
    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
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_try_compile "$LINENO"; then :
  
- 	ac_c_werror_flag=$ac_save_c_werror_flag
+ else
+   ac_c_werror_flag=$ac_save_c_werror_flag
  	 CFLAGS="-g"
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3174,42 -3475,17 +3475,17 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_prog_cc_g=yes
- 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
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
@@@ -3226,18 -3502,14 +3502,14 @@@ els
      CFLAGS=
    fi
  fi
- { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
+ if test "${ac_cv_prog_cc_c89+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
@@@ -3294,32 -3566,9 +3566,9 @@@ for ac_arg in '' -qlanglvl=extc89 -qlan
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
-   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
+   if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_prog_cc_c89=$ac_arg
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
  fi
- 
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
@@@ -3330,17 -3579,19 +3579,19 @@@ f
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
-     { $as_echo "$as_me:$LINENO: result: none needed" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
  $as_echo "none needed" >&6; } ;;
    xno)
-     { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
  $as_echo "unsupported" >&6; } ;;
    *)
      CC="$CC $ac_cv_prog_cc_c89"
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
  $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
+ if test "x$ac_cv_prog_cc_c89" != xno; then :
  
+ fi
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
@@@ -3362,9 -3613,9 +3613,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
+ if test "${ac_cv_prog_CXX+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
@@@ -3375,24 -3626,24 +3626,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
-   { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
  $as_echo "$CXX" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -3406,9 -3657,9 +3657,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CXX"; then
@@@ -3419,24 -3670,24 +3670,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
  $as_echo "$ac_ct_CXX" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -3449,7 -3700,7 +3700,7 @@@ 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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -3460,53 -3711,36 +3711,36 @@@ f
    fi
  fi
  # Provide some information about the compiler.
- $as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
  set X $ac_compile
  ac_compiler=$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 "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
+ for ac_option in --version -v -V -qversion; do
+   { { ac_try="$ac_compiler $ac_option >&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 "$ac_compiler -v >&5") 2>&5
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
-   $as_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 "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+   if test -s conftest.err; then
+     sed '10a\
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     rm -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
  
- { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3520,37 -3754,16 +3754,16 @@@ main (
    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_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
+ if ac_fn_cxx_try_compile "$LINENO"; then :
    ac_compiler_gnu=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
+   ac_compiler_gnu=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+ { $as_echo "$as_me:${as_lineno-$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
@@@ -3559,20 -3772,16 +3772,16 @@@ els
  fi
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
- { $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
+ if test "${ac_cv_prog_cxx_g+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
     ac_cxx_werror_flag=yes
     ac_cv_prog_cxx_g=no
     CXXFLAGS="-g"
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3583,35 -3792,11 +3792,11 @@@ main (
    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_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
+ if ac_fn_cxx_try_compile "$LINENO"; then :
    ac_cv_prog_cxx_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CXXFLAGS=""
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   CXXFLAGS=""
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3622,36 -3807,12 +3807,12 @@@ main (
    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_cxx_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
+ if ac_fn_cxx_try_compile "$LINENO"; then :
  
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ else
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  	 CXXFLAGS="-g"
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3662,42 -3823,17 +3823,17 @@@ main (
    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_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
+ if ac_fn_cxx_try_compile "$LINENO"; then :
    ac_cv_prog_cxx_g=yes
- 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
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
  $as_echo "$ac_cv_prog_cxx_g" >&6; }
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
@@@ -3723,9 -3859,9 +3859,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CPPBIN+set}" = set; then
+ if test "${ac_cv_prog_CPPBIN+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CPPBIN"; then
@@@ -3736,24 -3872,24 +3872,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CPPBIN=$ac_cv_prog_CPPBIN
  if test -n "$CPPBIN"; then
-   { $as_echo "$as_me:$LINENO: result: $CPPBIN" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPBIN" >&5
  $as_echo "$CPPBIN" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -3763,9 -3899,9 +3899,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CPPBIN+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_CPPBIN+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CPPBIN"; then
@@@ -3776,24 -3912,24 +3912,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CPPBIN" >&5
  $as_echo "$ac_ct_CPPBIN" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -3802,7 -3938,7 +3938,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -3815,7 -3951,7 +3951,7 @@@ f
  
  case $host in
    *-darwin*)
-     if test "x$enable_win64" == "xyes"
+     if test "x$enable_win64" = "xyes"
      then
        CC="$CC -m64"
        CXX="$CXX -m64"
@@@ -3842,14 -3978,10 +3978,10 @@@
      then
        CC="$CC -m32"
        CXX="$CXX -m32"
-       { $as_echo "$as_me:$LINENO: checking whether $CC works" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5
  $as_echo_n "checking whether $CC works... " >&6; }
  
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -3860,43 -3992,16 +3992,16 @@@ 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
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                       { { $as_echo "$as_me:$LINENO: error: Cannot build a 32-bit program, you need to install 32-bit development libraries." >&5
- $as_echo "$as_me: error: Cannot build a 32-bit program, you need to install 32-bit development libraries." >&2;}
-    { (exit 1); exit 1; }; }
+                       as_fn_error "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
        LD="${LD:-ld} -m elf_i386"
        AS="${AS:-as} --32"
        host_cpu="i386"
@@@ -3907,13 -4012,9 +4012,9 @@@
      else
        if test "x${GCC}" = "xyes"
        then
-         { $as_echo "$as_me:$LINENO: checking whether $CC supports __builtin_ms_va_list" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5
  $as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; }
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdarg.h>
  int
@@@ -3924,37 -4025,14 +4025,14 @@@ void func(__builtin_ms_va_list *args)
    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
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                            { { $as_echo "$as_me:$LINENO: error: You need gcc >= 4.4 to build Wine as 64-bit." >&5
- $as_echo "$as_me: error: You need gcc >= 4.4 to build Wine as 64-bit." >&2;}
-    { (exit 1); exit 1; }; }
+                            as_fn_error "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
        fi
        TARGETFLAGS="-m64"
@@@ -3984,31 -4062,49 +4062,49 @@@ the
      enable_winevdm=${enable_winevdm:-no}
  fi
  
- { $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5
+ if test -n "$with_wine64"
+ then
+     if test "x$enable_win64" = "xyes"
+     then
+         as_fn_error "--enable-win64 and --with-wine64 are mutually exclusive.
+ --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
+     fi
+     WOW64_DISABLE=\#
+ 
+     enable_fonts=${enable_fonts:-no}
+     enable_include=${enable_include:-no}
+     enable_server=${enable_server:-no}
+     enable_tools=${enable_tools:-no}
+     enable_wineboot=${enable_wineboot:-no}
+     enable_winedbg=${enable_winedbg:-no}
+     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32"
+ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
  $as_echo_n "checking for the directory containing the Wine tools... " >&6; }
- if test "${wine_cv_toolsdir+set}" = set; then
+ if test "${wine_cv_toolsdir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   if test -z "$with_wine_tools"; then
+   wine_cv_toolsdir="$with_wine_tools"
+    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;}
-    { (exit 1); exit 1; }; }
-      else
-        wine_cv_toolsdir="\$(TOPOBJDIR)"
+        as_fn_error "you must use the --with-wine-tools option when cross-compiling." "$LINENO" 5
+      elif test -n "$with_wine64"; then
+        wine_cv_toolsdir="$with_wine64"
       fi
-    elif test -d "$with_wine_tools/tools/winebuild"; then
-      case $with_wine_tools in
-        /*) wine_cv_toolsdir="$with_wine_tools" ;;
-        *)  wine_cv_toolsdir="\$(TOPOBJDIR)/$with_wine_tools" ;;
+    fi
+    if test -z "$wine_cv_toolsdir"; then
+      wine_cv_toolsdir="\$(TOPOBJDIR)"
+    elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
+      case "$wine_cv_toolsdir" in
+        /*) ;;
+        *)  wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;;
       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;}
-    { (exit 1); exit 1; }; }
+      as_fn_error "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
     fi
  fi
- { $as_echo "$as_me:$LINENO: result: $wine_cv_toolsdir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5
  $as_echo "$wine_cv_toolsdir" >&6; }
  TOOLSDIR=$wine_cv_toolsdir
  
@@@ -4022,9 -4118,9 +4118,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_FLEX+set}" = set; then
+ if test "${ac_cv_prog_FLEX+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$FLEX"; then
@@@ -4035,24 -4131,24 +4131,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  FLEX=$ac_cv_prog_FLEX
  if test -n "$FLEX"; then
-   { $as_echo "$as_me:$LINENO: result: $FLEX" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
  $as_echo "$FLEX" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4063,18 -4159,16 +4159,16 @@@ 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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "no suitable flex found. Please install the 'flex' package." "$LINENO" 5
  fi
  
  for ac_prog in bison
  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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_BISON+set}" = set; then
+ if test "${ac_cv_prog_BISON+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$BISON"; then
@@@ -4085,24 -4179,24 +4179,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  BISON=$ac_cv_prog_BISON
  if test -n "$BISON"; then
-   { $as_echo "$as_me:$LINENO: result: $BISON" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
  $as_echo "$BISON" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4113,9 -4207,7 +4207,7 @@@ 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;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "no suitable bison found. Please install the 'bison' package." "$LINENO" 5
  fi
  
  if test -n "$ac_tool_prefix"; then
@@@ -4123,9 -4215,9 +4215,9 @@@
    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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
+ if test "${ac_cv_prog_AR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
@@@ -4136,24 -4228,24 +4228,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
-   { $as_echo "$as_me:$LINENO: result: $AR" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
  $as_echo "$AR" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4167,9 -4259,9 +4259,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
@@@ -4180,24 -4272,24 +4272,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
  $as_echo "$ac_ct_AR" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4210,7 -4302,7 +4302,7 @@@ 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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -4223,9 -4315,9 +4315,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
+ if test "${ac_cv_prog_RANLIB+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
@@@ -4236,24 -4328,24 +4328,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
-   { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
  $as_echo "$RANLIB" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4263,9 -4355,9 +4355,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
@@@ -4276,24 -4368,24 +4368,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
  $as_echo "$ac_ct_RANLIB" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4302,7 -4394,7 +4394,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -4315,9 -4407,9 +4407,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
+ if test "${ac_cv_prog_STRIP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
@@@ -4328,24 -4420,24 +4420,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
-   { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
  $as_echo "$STRIP" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4355,9 -4447,9 +4447,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
@@@ -4368,24 -4460,24 +4460,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
  $as_echo "$ac_ct_STRIP" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4394,7 -4486,7 +4486,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -4404,36 -4496,36 +4496,36 @@@ els
    STRIP="$ac_cv_prog_STRIP"
  fi
  
- { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
  $as_echo_n "checking whether ln -s works... " >&6; }
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
  $as_echo "no, using $LN_S" >&6; }
  fi
  
- { $as_echo "$as_me:$LINENO: checking whether ln works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5
  $as_echo_n "checking whether ln works... " >&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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
    LN="cp -p"
  
-   { $as_echo "$as_me:$LINENO: result: no, using $LN" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5
  $as_echo "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 "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
+ if test "${ac_cv_path_GREP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
@@@ -4444,7 -4536,7 +4536,7 @@@ for as_dir in $PATH$PATH_SEPARATOR/usr/
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in grep ggrep; do
+     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
@@@ -4464,7 -4556,7 +4556,7 @@@ case `"$ac_path_GREP" --version 2>&1` i
      $as_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`
+     as_fn_arith $ac_count + 1 && ac_count=$as_val
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
@@@ -4479,26 -4571,24 +4571,24 @@@ esa
        $ac_path_GREP_found && break 3
      done
    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;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_GREP=$GREP
  fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  $as_echo "$ac_cv_path_GREP" >&6; }
   GREP="$ac_cv_path_GREP"
  
  
- { $as_echo "$as_me:$LINENO: checking for egrep" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  $as_echo_n "checking for egrep... " >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
+ if test "${ac_cv_path_EGREP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@@ -4512,7 -4602,7 +4602,7 @@@ for as_dir in $PATH$PATH_SEPARATOR/usr/
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in egrep; do
+     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
@@@ -4532,7 -4622,7 +4622,7 @@@ case `"$ac_path_EGREP" --version 2>&1` 
      $as_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`
+     as_fn_arith $ac_count + 1 && ac_count=$as_val
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
@@@ -4547,12 -4637,10 +4637,10 @@@ esa
        $ac_path_EGREP_found && break 3
      done
    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;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_EGREP=$EGREP
@@@ -4560,16 -4648,16 +4648,16 @@@ f
  
     fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_LDCONFIG+set}" = set; then
+ if test "${ac_cv_path_LDCONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $LDCONFIG in
@@@ -4582,14 -4670,14 +4670,14 @@@ for as_dir in /sbin /usr/sbin $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG="true"
@@@ -4598,10 -4686,10 +4686,10 @@@ esa
  fi
  LDCONFIG=$ac_cv_path_LDCONFIG
  if test -n "$LDCONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $LDCONFIG" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
  $as_echo "$LDCONFIG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4620,10 -4708,10 +4708,10 @@@
  # 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 "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
+ if test "${ac_cv_path_install+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@@ -4631,11 -4719,11 +4719,11 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   # Account for people who put trailing slashes in PATH elements.
- case $as_dir/ in
-   ./ | .// | /cC/* | \
+     # Account for people who put trailing slashes in PATH elements.
+ case $as_dir/ in #((
+   ./ | .// | /[cC]/* | \
    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
@@@ -4672,7 -4760,7 +4760,7 @@@
      ;;
  esac
  
- done
+   done
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
@@@ -4688,7 -4776,7 +4776,7 @@@ f
      INSTALL=$ac_install_sh
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@@ -4708,9 -4796,9 +4796,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_LINT+set}" = set; then
+ if test "${ac_cv_prog_LINT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LINT"; then
@@@ -4721,24 -4809,24 +4809,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  LINT=$ac_cv_prog_LINT
  if test -n "$LINT"; then
-   { $as_echo "$as_me:$LINENO: result: $LINT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5
  $as_echo "$LINT" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4757,9 -4845,9 +4845,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_FONTFORGE+set}" = set; then
+ if test "${ac_cv_prog_FONTFORGE+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$FONTFORGE"; then
@@@ -4770,24 -4858,24 +4858,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  FONTFORGE=$ac_cv_prog_FONTFORGE
  if test -n "$FONTFORGE"; then
-   { $as_echo "$as_me:$LINENO: result: $FONTFORGE" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE" >&5
  $as_echo "$FONTFORGE" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4800,9 -4888,9 +4888,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+ if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$PKG_CONFIG"; then
@@@ -4813,24 -4901,24 +4901,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
  $as_echo "$PKG_CONFIG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4843,9 -4931,9 +4931,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_RSVG+set}" = set; then
+ if test "${ac_cv_prog_RSVG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RSVG"; then
@@@ -4856,24 -4944,24 +4944,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  RSVG=$ac_cv_prog_RSVG
  if test -n "$RSVG"; then
-   { $as_echo "$as_me:$LINENO: result: $RSVG" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSVG" >&5
  $as_echo "$RSVG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4886,9 -4974,9 +4974,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ICOTOOL+set}" = set; then
+ if test "${ac_cv_prog_ICOTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ICOTOOL"; then
@@@ -4899,24 -4987,24 +4987,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  ICOTOOL=$ac_cv_prog_ICOTOOL
  if test -n "$ICOTOOL"; then
-   { $as_echo "$as_me:$LINENO: result: $ICOTOOL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICOTOOL" >&5
  $as_echo "$ICOTOOL" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4937,9 -5025,9 +5025,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_PRELINK+set}" = set; then
+ if test "${ac_cv_path_PRELINK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $PRELINK in
@@@ -4952,14 -5040,14 +5040,14 @@@ for as_dir in /sbin /usr/sbin $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false"
@@@ -4968,10 -5056,10 +5056,10 @@@ esa
  fi
  PRELINK=$ac_cv_path_PRELINK
  if test -n "$PRELINK"; then
-   { $as_echo "$as_me:$LINENO: result: $PRELINK" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRELINK" >&5
  $as_echo "$PRELINK" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -4980,19 -5068,14 +5068,14 @@@
  esac
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386_set_ldt in -li386" >&5
  $as_echo_n "checking for i386_set_ldt in -li386... " >&6; }
- if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then
+ if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-li386  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -5010,43 -5093,18 +5093,18 @@@ return i386_set_ldt ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_i386_i386_set_ldt=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_i386_i386_set_ldt=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_i386_i386_set_ldt" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBI386 1
  _ACEOF
@@@ -5055,19 -5113,14 +5113,14 @@@
  
  fi
  
- 
- { $as_echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
  $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
- if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
+ if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lossaudio  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -5085,43 -5138,18 +5138,18 @@@ return _oss_ioctl ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ossaudio__oss_ioctl=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_ossaudio__oss_ioctl=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBOSSAUDIO 1
  _ACEOF
@@@ -5142,14 -5170,14 +5170,14 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
  $as_echo_n "checking how to run the C preprocessor... " >&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
+   if test "${ac_cv_prog_CPP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
@@@ -5164,11 -5192,7 +5192,7 @@@ d
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
@@@ -5177,78 -5201,34 +5201,34 @@@
  #endif
  		     Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_try_cpp "$LINENO"; then :
  
+ else
    # Broken: fails on valid input.
  continue
  fi
- 
  rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
+ if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
- 
  rm -f conftest.err conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
+ if $ac_preproc_ok; then :
    break
  fi
  
@@@ -5260,7 -5240,7 +5240,7 @@@ f
  else
    ac_cv_prog_CPP=$CPP
  fi
- { $as_echo "$as_me:$LINENO: result: $CPP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
@@@ -5271,11 -5251,7 +5251,7 @@@ d
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
@@@ -5284,87 -5260,40 +5260,40 @@@
  #endif
  		     Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_try_cpp "$LINENO"; then :
  
+ else
    # Broken: fails on valid input.
  continue
  fi
- 
  rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
+ if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
- 
  rm -f conftest.err conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
-   :
+ if $ac_preproc_ok; then :
+ 
  else
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+   { { $as_echo "$as_me:${as_lineno-$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
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
+ as_fn_error "C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." "$LINENO" 5; }
  fi
  
  ac_ext=c
@@@ -5374,16 -5303,12 +5303,12 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
- { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  $as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
+ if test "${ac_cv_header_stdc+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
@@@ -5398,48 -5323,23 +5323,23 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_header_stdc=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_stdc=no
+   ac_cv_header_stdc=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <string.h>
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "memchr" >/dev/null 2>&1; then
-   :
+   $EGREP "memchr" >/dev/null 2>&1; then :
+ 
  else
    ac_cv_header_stdc=no
  fi
@@@ -5449,18 -5349,14 +5349,14 @@@ f
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "free" >/dev/null 2>&1; then
-   :
+   $EGREP "free" >/dev/null 2>&1; then :
+ 
  else
    ac_cv_header_stdc=no
  fi
@@@ -5470,14 -5366,10 +5366,10 @@@ f
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
    :
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
@@@ -5504,118 -5396,34 +5396,34 @@@ main (
    return 0;
  }
  _ACEOF
- rm -f 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>&5
-   ac_status=$?
-   $as_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 "$ac_try") 2>&5
-   ac_status=$?
-   $as_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
- sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_try_run "$LINENO"; then :
  
- ( exit $ac_status )
- ac_cv_header_stdc=no
+ else
+   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
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
- 
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
  $as_echo "$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
- _ACEOF
+ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
  
  fi
  
  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
- 
- 
- 
- 
- 
- 
- 
- 
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -5625,132 -5433,6 +5433,6 @@@ f
  done
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_header in \
  	AudioUnit/AudioUnit.h \
  	Carbon/Carbon.h \
@@@ -5879,147 -5561,11 +5561,11 @@@
  	valgrind/valgrind.h \
  	zlib.h
  
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -6028,16 -5574,12 +5574,12 @@@ f
  
  done
  
- { $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
  $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
- if test "${ac_cv_header_stat_broken+set}" = set; then
+ if test "${ac_cv_header_stat_broken+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
@@@ -6059,107 -5601,33 +5601,33 @@@ extern char c4[S_ISSOCK (S_IFREG) ? -1 
  #endif
  
  _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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_header_stat_broken=no
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_stat_broken=yes
+   ac_cv_header_stat_broken=yes
  fi
- 
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
  $as_echo "$ac_cv_header_stat_broken" >&6; }
  if test $ac_cv_header_stat_broken = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define STAT_MACROS_BROKEN 1
- _ACEOF
+ $as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
  
  fi
  
  
  
- 
- 
- 
- 
- 
  for ac_header in sys/mount.h sys/statfs.h sys/sysctl.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h>
       #ifdef HAVE_SYS_PARAM_H
       # include <sys/param.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -6169,19 -5637,6 +5637,6 @@@ f
  done
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_header in \
  	netinet/ip.h \
  	net/if.h \
@@@ -6197,20 -5652,9 +5652,9 @@@
  	netinet/udp.h \
  	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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h>
       #ifdef HAVE_SYS_SOCKET_H
       # include <sys/socket.h>
       #endif
@@@ -6232,44 -5676,9 +5676,9 @@@
       #ifdef HAVE_NETINET_IP_H
       # include <netinet/ip.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -6279,25 -5688,10 +5688,10 @@@ f
  done
  
  
- 
- 
- 
- 
  for ac_header in netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h>
       #ifdef HAVE_ALIAS_H
       # include <alias.h>
       #endif
@@@ -6334,44 -5728,9 +5728,9 @@@
       #ifdef HAVE_NETINET_TCP_TIMER_H
       #include <netinet/tcp_timer.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -6381,22 -5740,10 +5740,10 @@@ f
  done
  
  
- 
- 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ for ac_header in linux/ipx.h linux/irda.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h>
       #ifdef HAVE_ASM_TYPES_H
       # include <asm/types.h>
       #endif
@@@ -6406,44 -5753,9 +5753,9 @@@
       #ifdef HAVE_LINUX_TYPES_H
       # include <linux/types.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -6453,67 -5765,18 +5765,18 @@@ f
  done
  
  
- 
  for ac_header in mach-o/dyld_images.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_STDBOOL_H
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld_images.h" "ac_cv_header_mach_o_dyld_images_h" "#ifdef HAVE_STDBOOL_H
       # include <stdbool.h>
       #endif
       #ifdef HAVE_STDINT_H
       # include <stdint.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ if test "x$ac_cv_header_mach_o_dyld_images_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_MACH_O_DYLD_IMAGES_H 1
  _ACEOF
  
  fi
@@@ -6521,22 -5784,9 +5784,9 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#include <sys/types.h>
       #ifdef HAVE_SYS_SOCKET_H
       # include <sys/socket.h>
       #endif
@@@ -6546,46 -5796,10 +5796,10 @@@
       #ifdef HAVE_ARPA_NAMESER_H
       # include <arpa/nameser.h>
       #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ if test "x$ac_cv_header_resolv_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_RESOLV_H 1
  _ACEOF
  
  fi
@@@ -6593,62 -5807,13 +5807,13 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <signal.h>
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h>
+ "
+ if test "x$ac_cv_header_ucontext_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_UCONTEXT_H 1
  _ACEOF
  
  fi
@@@ -6656,65 -5821,16 +5821,16 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "#include <sys/types.h>
  #ifdef HAVE_UCONTEXT_H
  #include <ucontext.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ if test "x$ac_cv_header_sys_thr_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_SYS_THR_H 1
  _ACEOF
  
  fi
@@@ -6722,64 -5838,15 +5838,15 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_PTHREAD_H
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#ifdef HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ if test "x$ac_cv_header_pthread_np_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_PTHREAD_NP_H 1
  _ACEOF
  
  fi
@@@ -6787,68 -5854,19 +5854,19 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TIME_H
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "#ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
  #include <sys/types.h>
  #ifdef HAVE_ASM_TYPES_H
  #include <asm/types.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_LINUX_VIDEODEV_H 1
  _ACEOF
  
  fi
@@@ -6856,62 -5874,13 +5874,13 @@@
  done
  
  
- 
  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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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 __user
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "linux/capi.h" "ac_cv_header_linux_capi_h" "#define __user
+ "
+ if test "x$ac_cv_header_linux_capi_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_LINUX_CAPI_H 1
  _ACEOF
  
  fi
@@@ -6938,9 -5907,9 +5907,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_LDD+set}" = set; then
+ if test "${ac_cv_path_LDD+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $LDD in
@@@ -6954,14 -5923,14 +5923,14 @@@ for as_dir in $as_dumm
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_LDD" && ac_cv_path_LDD="true"
@@@ -6970,10 -5939,10 +5939,10 @@@ esa
  fi
  LDD=$ac_cv_path_LDD
  if test -n "$LDD"; then
-   { $as_echo "$as_me:$LINENO: result: $LDD" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
  $as_echo "$LDD" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -6984,9 -5953,9 +5953,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+ if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLTOOL"; then
@@@ -6997,24 -5966,24 +5966,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  DLLTOOL=$ac_cv_prog_DLLTOOL
  if test -n "$DLLTOOL"; then
-   { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  $as_echo "$DLLTOOL" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7024,9 -5993,9 +5993,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DLLTOOL"; then
@@@ -7037,24 -6006,24 +6006,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  $as_echo "$ac_ct_DLLTOOL" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7063,7 -6032,7 +6032,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -7076,9 -6045,9 +6045,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_DLLWRAP+set}" = set; then
+ if test "${ac_cv_prog_DLLWRAP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLWRAP"; then
@@@ -7089,24 -6058,24 +6058,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  DLLWRAP=$ac_cv_prog_DLLWRAP
  if test -n "$DLLWRAP"; then
-   { $as_echo "$as_me:$LINENO: result: $DLLWRAP" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5
  $as_echo "$DLLWRAP" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7116,9 -6085,9 +6085,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DLLWRAP"; then
@@@ -7129,24 -6098,24 +6098,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5
  $as_echo "$ac_ct_DLLWRAP" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7155,7 -6124,7 +6124,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -7168,9 -6137,9 +6137,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_MINGWAR+set}" = set; then
+ if test "${ac_cv_prog_MINGWAR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$MINGWAR"; then
@@@ -7181,24 -6150,24 +6150,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  MINGWAR=$ac_cv_prog_MINGWAR
  if test -n "$MINGWAR"; then
-   { $as_echo "$as_me:$LINENO: result: $MINGWAR" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWAR" >&5
  $as_echo "$MINGWAR" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7208,9 -6177,9 +6177,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_MINGWAR+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_MINGWAR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_MINGWAR"; then
@@@ -7221,24 -6190,24 +6190,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWAR" >&5
  $as_echo "$ac_ct_MINGWAR" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -7247,7 -6216,7 +6216,7 @@@
    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:${as_lineno-$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;}
  ac_tool_warned=yes ;;
  esac
@@@ -7304,102 -6273,12 +6273,12 @@@ f
      then
          ac_save_LIBS="$LIBS"
          LIBS="$LIBS $IOKITLIB"
- 
- for ac_func in IOHIDManagerCreate
- 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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+         for ac_func in IOHIDManagerCreate
+ do :
+   ac_fn_c_check_func "$LINENO" "IOHIDManagerCreate" "ac_cv_func_IOHIDManagerCreate"
+ if test "x$ac_cv_func_IOHIDManagerCreate" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_IOHIDMANAGERCREATE 1
  _ACEOF
  
  fi
@@@ -7419,17 -6298,13 +6298,13 @@@ don
      fi
          if test "x$enable_win16" = "xyes"
      then
-         { $as_echo "$as_me:$LINENO: checking whether 16-bit code can be built correctly" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5
  $as_echo_n "checking whether 16-bit code can be built correctly... " >&6; }
-         if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assuming yes" >&5
+         if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5
  $as_echo "cross-compiling, assuming yes" >&6; }
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  asm(".text\n"
                                              "bad:\tnop;nop\n"
@@@ -7446,114 -6321,57 +6321,57 @@@ unsigned short *p = (unsigned short *)t
    return 0;
  }
  _ACEOF
- rm -f 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>&5
-   ac_status=$?
-   $as_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 "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
-   $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-                                        { { $as_echo "$as_me:$LINENO: error: Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." >&5
- $as_echo "$as_me: error: Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." >&2;}
-    { (exit 1); exit 1; }; }
+                                        as_fn_error "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." "$LINENO" 5
  fi
- rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
- 
      fi
      ;;
    *)
      DLLFLAGS="$DLLFLAGS -fPIC"
      DLLEXT=".so"
-     { $as_echo "$as_me:$LINENO: checking whether we can build a GNU style ELF dll" >&5
+     { $as_echo "$as_me:${as_lineno-$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; }
- if test "${ac_cv_c_dll_gnuelf+set}" = set; then
+ if test "${ac_cv_c_dll_gnuelf+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  void myfunc() {}
  _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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_dll_gnuelf="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_dll_gnuelf="no"
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_gnuelf" >&5
  $as_echo "$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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+set}" = set; then
+ if test "${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7564,57 -6382,28 +6382,28 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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; }
- if test $ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1 = yes; then
+ 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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+set}" = set; then
+ if test "${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7625,61 -6414,30 +6414,30 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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; }
- if test $ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1 = yes; then
+ if test $ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1 = yes; then :
    LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-h,%)"
  fi
- 
  fi
  
- 
-       { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs" >&5
+       { $as_echo "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs+set}" = set; then
+ if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7690,59 -6448,29 +6448,29 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&5
  $as_echo "$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs" >&6; }
- if test $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs = yes; then
+ 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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini+set}" = set; then
+ 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
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7753,60 -6481,30 +6481,30 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; 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
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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; }
- if test $ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini = yes; then
+ 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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+set}" = set; then
+ if test "${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7817,60 -6515,30 +6515,30 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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; }
- if test $ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map = yes; then
+ 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
  $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
- if test "${ac_cv_cflags__fPIC__Wl___export_dynamic+set}" = set; then
+ if test "${ac_cv_cflags__fPIC__Wl___export_dynamic+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7881,60 -6549,102 +6549,30 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fPIC__Wl___export_dynamic=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fPIC__Wl___export_dynamic=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fPIC__Wl___export_dynamic" >&5
  $as_echo "$ac_cv_cflags__fPIC__Wl___export_dynamic" >&6; }
- if test $ac_cv_cflags__fPIC__Wl___export_dynamic = yes; then
+ 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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -  eval "$as_ac_var=yes"
 -else
 -  eval "$as_ac_var=no"
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -CFLAGS=$ac_wine_try_cflags_saved
 -fi
 -eval ac_res=\$$as_ac_var
 -	       { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -  eval "$as_ac_var=yes"
 -else
 -  eval "$as_ac_var=no"
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -CFLAGS=$ac_wine_try_cflags_saved
 -fi
 -eval ac_res=\$$as_ac_var
 -	       { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--enable-new-dtags" >&5
  $as_echo_n "checking whether the compiler supports -Wl,--enable-new-dtags... " >&6; }
- if test "${ac_cv_cflags__Wl___enable_new_dtags+set}" = set; then
+ if test "${ac_cv_cflags__Wl___enable_new_dtags+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wl,--enable-new-dtags"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -7945,61 -6655,31 +6583,31 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__Wl___enable_new_dtags=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__Wl___enable_new_dtags=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___enable_new_dtags" >&5
  $as_echo "$ac_cv_cflags__Wl___enable_new_dtags" >&6; }
- if test $ac_cv_cflags__Wl___enable_new_dtags = yes; then
+ if test $ac_cv_cflags__Wl___enable_new_dtags = yes; then :
    LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"
  fi
  
- 
        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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+set}" = set; then
+ if test "${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -8010,95 -6690,45 +6618,45 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5
  $as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; }
- if test $ac_cv_cflags__Wl___section_start__interp_0x7bf00400 = yes; then
+ if test $ac_cv_cflags__Wl___section_start__interp_0x7bf00400 = yes; then :
    LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
  fi
- 
            ;;
        esac
  
      else
-       { $as_echo "$as_me:$LINENO: checking whether we can build a UnixWare (Solaris) dll" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a UnixWare (Solaris) dll" >&5
  $as_echo_n "checking whether we can build a UnixWare (Solaris) dll... " >&6; }
- if test "${ac_cv_c_dll_unixware+set}" = set; then
+ if test "${ac_cv_c_dll_unixware+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  void myfunc() {}
  _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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_dll_unixware="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_dll_unixware="no"
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_unixware" >&5
  $as_echo "$ac_cv_c_dll_unixware" >&6; }
        if test "$ac_cv_c_dll_unixware" = "yes"
        then
@@@ -8106,51 -6736,27 +6664,27 @@@
          LDDLLFLAGS="-Wl,-G,-B,symbolic"
  
        else
-         { $as_echo "$as_me:$LINENO: checking whether we can build an HP-UX dll" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build an HP-UX dll" >&5
  $as_echo_n "checking whether we can build an HP-UX dll... " >&6; }
- if test "${ac_cv_c_dll_hpux+set}" = set; then
+ if test "${ac_cv_c_dll_hpux+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -shared"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  void myfunc() {}
  _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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_dll_hpux="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_dll_hpux="no"
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_hpux" >&5
  $as_echo "$ac_cv_c_dll_hpux" >&6; }
          if test "$ac_cv_c_dll_hpux" = "yes"
          then
@@@ -8167,17 -6773,11 +6701,11 @@@ 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.
- 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.
+   as_fn_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.
- " >&2;}
-    { (exit 1); exit 1; }; }
+ " "$LINENO" 5
  fi
  
  if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
@@@ -8186,9 -6786,9 +6714,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CROSSCC+set}" = set; then
+ if test "${ac_cv_prog_CROSSCC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CROSSCC"; then
@@@ -8199,24 -6799,24 +6727,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  CROSSCC=$ac_cv_prog_CROSSCC
  if test -n "$CROSSCC"; then
-   { $as_echo "$as_me:$LINENO: result: $CROSSCC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CROSSCC" >&5
  $as_echo "$CROSSCC" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -8229,9 -6829,9 +6757,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+ if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLTOOL"; then
@@@ -8242,24 -6842,24 +6770,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  DLLTOOL=$ac_cv_prog_DLLTOOL
  if test -n "$DLLTOOL"; then
-   { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  $as_echo "$DLLTOOL" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -8272,9 -6872,9 +6800,9 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_MINGWAR+set}" = set; then
+ if test "${ac_cv_prog_MINGWAR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$MINGWAR"; then
@@@ -8285,24 -6885,24 +6813,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  fi
  MINGWAR=$ac_cv_prog_MINGWAR
  if test -n "$MINGWAR"; then
-   { $as_echo "$as_me:$LINENO: result: $MINGWAR" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWAR" >&5
  $as_echo "$MINGWAR" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -8336,18 -6936,14 +6864,14 @@@ f
  
  if test "$ac_cv_header_pthread_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
  $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -8365,69 -6961,39 +6889,39 @@@ return pthread_create ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_pthread_pthread_create=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
    LIBPTHREAD="-lpthread"
  
  fi
  
  fi
- if test "x$LIBPTHREAD" = "x"; then
+ if test "x$LIBPTHREAD" = "x"; then :
    case "x$with_pthread" in
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: pthread ${notice_platform}development files not found.
+   *)   as_fn_error "pthread ${notice_platform}development files not found.
  Wine cannot support threads without libpthread.
- Use the --without-pthread option if you really want this." >&5
- $as_echo "$as_me: error: pthread ${notice_platform}development files not found.
- Wine cannot support threads without libpthread.
- Use the --without-pthread option if you really want this." >&2;}
-    { (exit 1); exit 1; }; } ;;
+ Use the --without-pthread option if you really want this." "$LINENO" 5 ;;
  esac
  fi
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for X" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
  $as_echo_n "checking for X... " >&6; }
  
  
  # Check whether --with-x was given.
- if test "${with_x+set}" = set; then
+ if test "${with_x+set}" = set; then :
    withval=$with_x;
  fi
  
@@@ -8437,10 -7003,8 +6931,8 @@@ 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;}
-    { (exit 1); exit 1; }; };; #(
-     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+     *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
@@@ -8488,21 -7052,25 +6980,25 @@@ f
  # Check X11 before X11Rn because it is often a symlink to the current release.
  ac_x_header_dirs='
  /usr/X11/include
+ /usr/X11R7/include
  /usr/X11R6/include
  /usr/X11R5/include
  /usr/X11R4/include
  
  /usr/include/X11
+ /usr/include/X11R7
  /usr/include/X11R6
  /usr/include/X11R5
  /usr/include/X11R4
  
  /usr/local/X11/include
+ /usr/local/X11R7/include
  /usr/local/X11R6/include
  /usr/local/X11R5/include
  /usr/local/X11R4/include
  
  /usr/local/include/X11
+ /usr/local/include/X11R7
  /usr/local/include/X11R6
  /usr/local/include/X11R5
  /usr/local/include/X11R4
@@@ -8524,37 -7092,14 +7020,14 @@@
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Xlib.h.
    # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
+ if ac_fn_c_try_cpp "$LINENO"; then :
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
    for ac_dir in $ac_x_header_dirs; do
    if test -r "$ac_dir/X11/Xlib.h"; then
      ac_x_includes=$ac_dir
@@@ -8562,7 -7107,6 +7035,6 @@@
    fi
  done
  fi
- 
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
@@@ -8572,11 -7116,7 +7044,7 @@@ if test "$ac_x_libraries" = no; the
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
    LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  int
@@@ -8587,35 -7127,12 +7055,12 @@@ XrmInitialize (
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	LIBS=$ac_save_LIBS
+   LIBS=$ac_save_LIBS
  for ac_dir in `$as_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!
@@@ -8627,10 -7144,8 +7072,8 @@@
    done
  done
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = no
  
  case $ac_x_includes,$ac_x_libraries in #(
@@@ -8651,7 -7166,7 +7094,7 @@@ f
  fi # $with_x != no
  
  if test "$have_x" != yes; then
-   { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
  $as_echo "$have_x" >&6; }
    no_x=yes
  else
@@@ -8662,16 -7177,14 +7105,14 @@@
    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 "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
  $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
  fi
  
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
- cat >>confdefs.h <<\_ACEOF
- #define X_DISPLAY_MISSING 1
- _ACEOF
+ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
@@@ -8684,16 -7197,12 +7125,12 @@@
      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 "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
  $as_echo_n "checking whether -R must be followed by a space... " >&6; }
      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
      ac_xsave_c_werror_flag=$ac_c_werror_flag
      ac_c_werror_flag=yes
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -8704,40 -7213,13 +7141,13 @@@ 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
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
         X_LIBS="$X_LIBS -R$x_libraries"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-        cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   LIBS="$ac_xsave_LIBS -R $x_libraries"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -8748,46 -7230,19 +7158,19 @@@ 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
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  	  X_LIBS="$X_LIBS -R $x_libraries"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
  $as_echo "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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
@@@ -8803,11 -7258,7 +7186,7 @@@
      # libraries were built with DECnet support.  And Karl Berry says
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -8825,44 -7276,17 +7204,17 @@@ return XOpenDisplay ()
    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
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_try_link "$LINENO"; then :
  
- 	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -8880,59 -7304,30 +7232,30 @@@ return dnet_ntoa ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dnet_dnet_ntoa=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""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 "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -8950,52 -7345,25 +7273,25 @@@ return dnet_ntoa ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dnet_stub_dnet_ntoa=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@@ -9006,105 -7374,20 +7302,20 @@@
      # 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; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   $as_echo_n "(cached) " >&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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define gethostbyname innocuous_gethostbyname
+     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+ if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname (); 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 gethostbyname
- 
- /* 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 gethostbyname ();
- /* 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_gethostbyname || defined __stub___gethostbyname
- choke me
- #endif
- 
- int
- main ()
- {
- return gethostbyname ();
-   ;
-   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
-   ac_cv_func_gethostbyname=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_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
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
- $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9122,59 -7405,30 +7333,30 @@@ return gethostbyname ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_nsl_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_nsl_gethostbyname=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_nsl_gethostbyname" = x""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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9192,43 -7446,18 +7374,18 @@@ return gethostbyname ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_bsd_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_bsd_gethostbyname=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
@@@ -9242,105 -7471,20 +7399,20 @@@
      # 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; }
- if test "${ac_cv_func_connect+set}" = set; then
-   $as_echo_n "(cached) " >&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 connect to an innocuous variant, in case <limits.h> declares connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define connect innocuous_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect (); 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 connect
- 
- /* 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 connect ();
- /* 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_connect || defined __stub___connect
- choke me
- #endif
+     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+ if test "x$ac_cv_func_connect" = x""yes; then :
  
- int
- main ()
- {
- return connect ();
-   ;
-   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
-   ac_cv_func_connect=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_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
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
- $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  $as_echo_n "checking for connect in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
+ if test "${ac_cv_lib_socket_connect+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9358,148 -7502,38 +7430,38 @@@ return connect ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_socket_connect=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_socket_connect=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_socket_connect" = x""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; }
- if test "${ac_cv_func_remove+set}" = set; then
-   $as_echo_n "(cached) " >&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 remove to an innocuous variant, in case <limits.h> declares remove.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define remove innocuous_remove
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove (); 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 remove
- 
- /* 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 remove ();
- /* 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_remove || defined __stub___remove
- choke me
- #endif
- 
- int
- main ()
- {
- return remove ();
-   ;
-   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
-   ac_cv_func_remove=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_remove=no
- fi
+     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+ if test "x$ac_cv_func_remove" = x""yes; then :
  
- 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_func_remove" >&5
- $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  $as_echo_n "checking for remove in -lposix... " >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
+ if test "${ac_cv_lib_posix_remove+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9517,148 -7551,38 +7479,38 @@@ return remove ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_posix_remove=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_posix_remove=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_posix_remove" = x""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; }
- if test "${ac_cv_func_shmat+set}" = set; then
-   $as_echo_n "(cached) " >&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 shmat to an innocuous variant, in case <limits.h> declares shmat.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define shmat innocuous_shmat
+     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+ if test "x$ac_cv_func_shmat" = x""yes; then :
  
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat (); 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 shmat
- 
- /* 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 shmat ();
- /* 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_shmat || defined __stub___shmat
- choke me
- #endif
- 
- int
- main ()
- {
- return shmat ();
-   ;
-   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
-   ac_cv_func_shmat=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_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
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
- $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  $as_echo_n "checking for shmat in -lipc... " >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9676,43 -7600,18 +7528,18 @@@ return shmat ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ipc_shmat=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_ipc_shmat=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
@@@ -9728,18 -7627,14 +7555,14 @@@
    # 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 "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9757,43 -7652,18 +7580,18 @@@ return IceConnectionNumber ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_ICE_IceConnectionNumber=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
@@@ -9804,22 -7674,18 +7602,18 @@@ f
  
  if test "$have_x" = "yes"
  then
-     XLIB="-lXext -lX11"
+     XLIB="-lX11"
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-     { $as_echo "$as_me:$LINENO: checking for -lX11" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lX11" >&5
  $as_echo_n "checking for -lX11... " >&6; }
- if test "${ac_cv_lib_soname_X11+set}" = set; then
+ if test "${ac_cv_lib_soname_X11+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lX11 $X_LIBS $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9837,50 -7703,23 +7631,23 @@@ return XCreateWindow ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_X11" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_X11" >&5
  $as_echo "$ac_cv_lib_soname_X11" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -9889,19 -7728,14 +7656,14 @@@ _ACEO
  
  
  fi
- 
-     { $as_echo "$as_me:$LINENO: checking for -lXext" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXext" >&5
  $as_echo_n "checking for -lXext... " >&6; }
- if test "${ac_cv_lib_soname_Xext+set}" = set; then
+ if test "${ac_cv_lib_soname_Xext+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lXext $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -9919,73 -7753,33 +7681,33 @@@ return XextCreateExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xext" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xext" >&5
  $as_echo "$ac_cv_lib_soname_Xext" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext"
  _ACEOF
  
- 
+        XLIB="-lXext $XLIB"
  fi
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- for ac_header in X11/Xlib.h \
+         for ac_header in X11/Xlib.h \
                        X11/XKBlib.h \
                        X11/Xutil.h \
                        X11/Xcursor/Xcursor.h \
@@@ -9997,63 -7791,17 +7719,17 @@@
                        X11/extensions/Xrandr.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_X11_XLIB_H
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_X11_XLIB_H
  # include <X11/Xlib.h>
  #endif
  #ifdef HAVE_X11_XUTIL_H
  # include <X11/Xutil.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -10065,18 -7813,14 +7741,14 @@@ don
  
                  if test "$ac_cv_header_X11_XKBlib_h" = "yes"
          then
-               { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension in -lX11" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XkbQueryExtension in -lX11" >&5
  $as_echo_n "checking for XkbQueryExtension in -lX11... " >&6; }
- if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then
+ if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lX11 $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10094,47 -7838,20 +7766,20 @@@ return XkbQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_X11_XkbQueryExtension=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_X11_XkbQueryExtension=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_X11_XkbQueryExtension" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XKB 1
- _ACEOF
+ $as_echo "#define HAVE_XKB 1" >>confdefs.h
  
  fi
  
@@@ -10142,18 -7859,14 +7787,14 @@@
  
                  if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
          then
-             { $as_echo "$as_me:$LINENO: checking for -lXcursor" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXcursor" >&5
  $as_echo_n "checking for -lXcursor... " >&6; }
- if test "${ac_cv_lib_soname_Xcursor+set}" = set; then
+ if test "${ac_cv_lib_soname_Xcursor+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXcursor $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXcursor $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10171,50 -7884,23 +7812,23 @@@ return XcursorImageLoadCursor ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xcursor" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xcursor" >&5
  $as_echo "$ac_cv_lib_soname_Xcursor" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -10223,35 -7909,26 +7837,26 @@@ _ACEO
  
  
  fi
- 
          fi
-         if test "x$ac_cv_lib_soname_Xcursor" = "x"; then
+         if test "x$ac_cv_lib_soname_Xcursor" = "x"; then :
    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.
- 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.
- This is an error since --with-xcursor was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.
+ This is an error since --with-xcursor was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
          then
-             { $as_echo "$as_me:$LINENO: checking for -lXi" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXi" >&5
  $as_echo_n "checking for -lXi... " >&6; }
- if test "${ac_cv_lib_soname_Xi+set}" = set; then
+ if test "${ac_cv_lib_soname_Xi+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXi $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXi $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10269,50 -7946,23 +7874,23 @@@ return XOpenDevice ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xi" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xi" >&5
  $as_echo "$ac_cv_lib_soname_Xi" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -10321,35 -7971,26 +7899,26 @@@ _ACEO
  
  
  fi
- 
          fi
-         if test "x$ac_cv_lib_soname_Xi" = "x"; then
+         if test "x$ac_cv_lib_soname_Xi" = "x"; then :
    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.
- 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.
- This is an error since --with-xinput was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxi ${notice_platform}development files not found, the Xinput extension won't be supported.
+ This is an error since --with-xinput was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
          then
-               { $as_echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5
  $as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; }
- if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then
+ if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10367,78 -8008,43 +7936,43 @@@ return XShmQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_Xext_XShmQueryExtension=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xext_XShmQueryExtension=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_Xext_XShmQueryExtension" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBXXSHM 1
- _ACEOF
+ $as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h
  
  fi
  
          fi
-         if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then
+         if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then :
    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.
- 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.
- This is an error since --with-xshm was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
+ This is an error since --with-xshm was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
          then
-               { $as_echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
  $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
- if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
+ if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10456,78 -8062,43 +7990,43 @@@ return XShapeQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_Xext_XShapeQueryExtension=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xext_XShapeQueryExtension=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBXSHAPE 1
- _ACEOF
+ $as_echo "#define HAVE_LIBXSHAPE 1" >>confdefs.h
  
  fi
  
          fi
-         if test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"; then
+         if test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"; then :
    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.
- 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.
- This is an error since --with-xshape was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "XShape ${notice_platform}development files not found, XShape won't be supported.
+ This is an error since --with-xshape was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
          then
-             { $as_echo "$as_me:$LINENO: checking for -lXxf86vm" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXxf86vm" >&5
  $as_echo_n "checking for -lXxf86vm... " >&6; }
- if test "${ac_cv_lib_soname_Xxf86vm+set}" = set; then
+ if test "${ac_cv_lib_soname_Xxf86vm+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXxf86vm $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10545,50 -8116,23 +8044,23 @@@ return XF86VidModeQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xxf86vm" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xxf86vm" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xxf86vm" >&5
  $as_echo "$ac_cv_lib_soname_Xxf86vm" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -10597,35 -8141,26 +8069,26 @@@ _ACEO
  
  
  fi
- 
          fi
-         if test "x$ac_cv_lib_soname_Xxf86vm" = "x"; then
+         if test "x$ac_cv_lib_soname_Xxf86vm" = "x"; then :
    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.
- 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.
- This is an error since --with-xxf86vm was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.
+ This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  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 "$as_me:${as_lineno-$LINENO}: checking for -lXrender" >&5
  $as_echo_n "checking for -lXrender... " >&6; }
- if test "${ac_cv_lib_soname_Xrender+set}" = set; then
+ if test "${ac_cv_lib_soname_Xrender+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10643,68 -8178,37 +8106,37 @@@ return XRenderQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xrender" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xrender" >&5
  $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for XRenderSetPictureTransform in -lXrender" >&5
  $as_echo_n "checking for XRenderSetPictureTransform in -lXrender... " >&6; }
- if test "${ac_cv_lib_Xrender_XRenderSetPictureTransform+set}" = set; then
+ if test "${ac_cv_lib_Xrender_XRenderSetPictureTransform+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10722,74 -8226,38 +8154,38 @@@ return XRenderSetPictureTransform ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_Xrender_XRenderSetPictureTransform=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xrender_XRenderSetPictureTransform=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_Xrender_XRenderSetPictureTransform" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XRENDERSETPICTURETRANSFORM 1
- _ACEOF
+ $as_echo "#define HAVE_XRENDERSETPICTURETRANSFORM 1" >>confdefs.h
  
  fi
  
  fi
  
- 
          fi
-         if test "x$ac_cv_lib_soname_Xrender" = "x"; then
+         if test "x$ac_cv_lib_soname_Xrender" = "x"; then :
    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.
- 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.
- This is an error since --with-xrender was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxrender ${notice_platform}development files not found, XRender won't be supported.
+ This is an error since --with-xrender was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" -a "x$ac_cv_lib_soname_Xrender" != "x"
          then
-                 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  #include <X11/extensions/Xrandr.h>
@@@ -10801,36 -8269,15 +8197,15 @@@ static typeof(XRRSetScreenConfigAndRate
    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
-   { $as_echo "$as_me:$LINENO: checking for -lXrandr" >&5
+ if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXrandr" >&5
  $as_echo_n "checking for -lXrandr... " >&6; }
- if test "${ac_cv_lib_soname_Xrandr+set}" = set; then
+ if test "${ac_cv_lib_soname_Xrandr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXrandr $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXrandr $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10848,50 -8295,23 +8223,23 @@@ return XRRQueryExtension ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xrandr" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrandr" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xrandr" >&5
  $as_echo "$ac_cv_lib_soname_Xrandr" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -10900,36 -8320,21 +8248,21 @@@ _ACEO
  
  
  fi
- 
- 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
-         if test "x$ac_cv_lib_soname_Xrandr" = "x"; then
+         if test "x$ac_cv_lib_soname_Xrandr" = "x"; then :
    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.
- 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.
- This is an error since --with-xrandr was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxrandr ${notice_platform}development files not found, XRandr won't be supported.
+ This is an error since --with-xrandr was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes"
          then
-                 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  #include <X11/extensions/Xinerama.h>
@@@ -10941,36 -8346,15 +8274,15 @@@ static typeof(XineramaQueryScreens) * f
    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
-   { $as_echo "$as_me:$LINENO: checking for -lXinerama" >&5
+ if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXinerama" >&5
  $as_echo_n "checking for -lXinerama... " >&6; }
- if test "${ac_cv_lib_soname_Xinerama+set}" = set; then
+ if test "${ac_cv_lib_soname_Xinerama+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXinerama $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXinerama $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -10988,50 -8372,23 +8300,23 @@@ return XineramaQueryScreens ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xinerama" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xinerama" >&5
  $as_echo "$ac_cv_lib_soname_Xinerama" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -11040,43 -8397,28 +8325,28 @@@ _ACEO
  
  
  fi
- 
- 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
-         if test "x$ac_cv_lib_soname_Xinerama" = "x"; then
+         if test "x$ac_cv_lib_soname_Xinerama" = "x"; then :
    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.
- 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.
- This is an error since --with-xinerama was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.
+ This is an error since --with-xinerama was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
                  if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
          then
-             { $as_echo "$as_me:$LINENO: checking for -lXcomposite" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXcomposite" >&5
  $as_echo_n "checking for -lXcomposite... " >&6; }
- if test "${ac_cv_lib_soname_Xcomposite+set}" = set; then
+ if test "${ac_cv_lib_soname_Xcomposite+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lXcomposite $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lXcomposite $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -11094,50 -8436,23 +8364,23 @@@ return XCompositeRedirectWindow ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcomposite" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xcomposite" >&5
  $as_echo "$ac_cv_lib_soname_Xcomposite" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -11146,123 -8461,21 +8389,21 @@@ _ACEO
  
  
  fi
- 
          fi
-         if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then
+         if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then :
    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.
- 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.
- This is an error since --with-xcomposite was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.
+ This is an error since --with-xcomposite was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
-                 { $as_echo "$as_me:$LINENO: checking for XICCallback.callback" >&5
- $as_echo_n "checking for XICCallback.callback... " >&6; }
- if test "${ac_cv_member_XICCallback_callback+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_X11_XLIB_H
+                 ac_fn_c_check_member "$LINENO" "XICCallback" "callback" "ac_cv_member_XICCallback_callback" "#ifdef HAVE_X11_XLIB_H
  #include <X11/Xlib.h>
  #endif
- 
- int
- main ()
- {
- static XICCallback ac_aggr;
- if (ac_aggr.callback)
- 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
-   ac_cv_member_XICCallback_callback=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_X11_XLIB_H
- #include <X11/Xlib.h>
- #endif
- 
- int
- main ()
- {
- static XICCallback ac_aggr;
- if (sizeof ac_aggr.callback)
- 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
-   ac_cv_member_XICCallback_callback=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_XICCallback_callback=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_XICCallback_callback" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_XICCALLBACK_CALLBACK 1
@@@ -11276,64 -8489,15 +8417,15 @@@ f
          opengl_msg=""
      if test "x$with_opengl" != "xno"
      then
- 
- 
- 
- for ac_header in GL/gl.h GL/glx.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_GL_GLX_H
+ 	for ac_header in GL/gl.h GL/glx.h GL/glu.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_GL_GLX_H
  # include <GL/glx.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -11344,16 -8508,12 +8436,12 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for up-to-date OpenGL version" >&5
  $as_echo_n "checking for up-to-date OpenGL version... " >&6; }
- if test "${wine_cv_opengl_header_version_OK+set}" = set; then
+ if test "${wine_cv_opengl_header_version_OK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <GL/gl.h>
  int
@@@ -11364,51 -8524,26 +8452,26 @@@ GLenum test = GL_UNSIGNED_SHORT_5_6_5
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    wine_cv_opengl_header_version_OK="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	wine_cv_opengl_header_version_OK="no"
+   wine_cv_opengl_header_version_OK="no"
  fi
- 
  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 "$as_me:${as_lineno-$LINENO}: result: $wine_cv_opengl_header_version_OK" >&5
  $as_echo "$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 "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5
  $as_echo_n "checking for -lGL... " >&6; }
- if test "${ac_cv_lib_soname_GL+set}" = set; then
+ if test "${ac_cv_lib_soname_GL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lGL $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -11426,59 -8561,28 +8489,28 @@@ return glXCreateContext ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_GL" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
-        { $as_echo "$as_me:$LINENO: checking for -lGL" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5
  $as_echo_n "checking for -lGL... " >&6; }
- if test "${ac_cv_lib_soname_GL+set}" = set; then
+ if test "${ac_cv_lib_soname_GL+set}" = set; then :
    $as_echo_n "(cached) " >&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"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lGL $X_LIBS $XLIB -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"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -11496,46 -8600,19 +8528,19 @@@ return glXCreateContext ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_GL" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
         if test -f /usr/X11R6/lib/libGL.a
  	                            then
@@@ -11545,7 -8622,7 +8550,7 @@@ 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5
  $as_echo "$ac_cv_lib_soname_GL" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -11554,14 -8631,11 +8559,11 @@@ _ACEO
  
         OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENGL 1
- _ACEOF
+ $as_echo "#define HAVE_OPENGL 1" >>confdefs.h
  
  fi
- 
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5
  $as_echo "$ac_cv_lib_soname_GL" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -11570,26 -8644,19 +8572,19 @@@ _ACEO
  
         OPENGL_LIBS="-lGL"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_OPENGL 1
- _ACEOF
+ $as_echo "#define HAVE_OPENGL 1" >>confdefs.h
  
  fi
- 
                   if test "$ac_cv_header_GL_glu_h" = "yes"
                   then
-                     { $as_echo "$as_me:$LINENO: checking for -lGLU" >&5
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGLU" >&5
  $as_echo_n "checking for -lGLU... " >&6; }
- if test "${ac_cv_lib_soname_GLU+set}" = set; then
+ if test "${ac_cv_lib_soname_GLU+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
- LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -11607,50 -8674,23 +8602,23 @@@ return gluLookAt ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_GLU" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GLU" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GLU" >&5
  $as_echo "$ac_cv_lib_soname_GLU" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -11659,20 -8699,15 +8627,15 @@@ _ACEO
  
  
  fi
- 
                   fi
-                  if test "x$ac_cv_lib_soname_GLU" = "x"; then
+                  if test "x$ac_cv_lib_soname_GLU" = "x"; then :
    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.
- 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.
- This is an error since --with-glu was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libGLU ${notice_platform}development files not found, GLU won't be supported.
+ This is an error since --with-glu was requested." "$LINENO" 5 ;;
  esac
  fi
- 
               else
                   opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
  	     fi
@@@ -11685,244 -8720,47 +8648,47 @@@
           enable_opengl32=${enable_opengl32:-no}
           enable_glu32=${enable_glu32:-no}
      fi
-     if test -n "$opengl_msg"; then
+     if test -n "$opengl_msg"; then :
    case "x$with_opengl" in
    x)   wine_warnings="$wine_warnings|$opengl_msg
  OpenGL and Direct3D won't be supported." ;;
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: $opengl_msg
+   *)   as_fn_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
- OpenGL and Direct3D won't be supported.
- This is an error since --with-opengl was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+ This is an error since --with-opengl was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
          NASLIBS=""
  
- 
- for ac_header in audio/audiolib.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in audio/audiolib.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
+ if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_AUDIO_AUDIOLIB_H 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <audio/audiolib.h>
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+  for ac_header in audio/soundlib.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "audio/soundlib.h" "ac_cv_header_audio_soundlib_h" "#include <audio/audiolib.h>
+ "
+ if test "x$ac_cv_header_audio_soundlib_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_AUDIO_SOUNDLIB_H 1
  _ACEOF
  
  fi
  
  done
  
-           { $as_echo "$as_me:$LINENO: checking for AuCreateFlow in -laudio" >&5
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuCreateFlow in -laudio" >&5
  $as_echo_n "checking for AuCreateFlow in -laudio... " >&6; }
- if test "${ac_cv_lib_audio_AuCreateFlow+set}" = set; then
+ if test "${ac_cv_lib_audio_AuCreateFlow+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -11940,60 -8778,29 +8706,29 @@@ return AuCreateFlow ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_audio_AuCreateFlow=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_audio_AuCreateFlow=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NAS 1
- _ACEOF
+ $as_echo "#define HAVE_NAS 1" >>confdefs.h
  
-                         { $as_echo "$as_me:$LINENO: checking for XauGetBestAuthByAddr in -lXau" >&5
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5
  $as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; }
- if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then
+ if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXau $X_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12011,46 -8818,21 +8746,21 @@@ return XauGetBestAuthByAddr ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_Xau_XauGetBestAuthByAddr=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_Xau_XauGetBestAuthByAddr=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
-   NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ if test "x$ac_cv_lib_Xau_XauGetBestAuthByAddr" = x""yes; then :
+   NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"
  else
-   NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+   NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"
  fi
  
  
@@@ -12070,23 -8852,17 +8780,17 @@@ els
      enable_opengl32=${enable_opengl32:-no}
      enable_glu32=${enable_glu32:-no}
  fi
- if test "x$XLIB" = "x"; then
+ if test "x$XLIB" = "x"; then :
    case "x$with_x" in
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: X ${notice_platform}development files not found. Wine will be built
+   *)   as_fn_error "X ${notice_platform}development files not found. Wine will be built
  without X support, which probably isn't what you want. You will need to install
  ${notice_platform}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 ${notice_platform}development files not found. Wine will be built
- without X support, which probably isn't what you want. You will need to install
- ${notice_platform}development packages of Xlib/Xfree86 at the very least.
- Use the --without-x option if you really want this." >&2;}
-    { (exit 1); exit 1; }; } ;;
+ Use the --without-x option if you really want this." "$LINENO" 5 ;;
  esac
  fi
  
  
- 
  XML2LIBS=""
  
  XML2INCL=""
@@@ -12105,164 -8881,21 +8809,21 @@@ the
          ac_xml_cflags="`xml2-config --cflags  2>/dev/null`"
      fi
      CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
- 
- for ac_header in libxml/parser.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in libxml/parser.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default"
+ if test "x$ac_cv_header_libxml_parser_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_LIBXML_PARSER_H 1
  _ACEOF
-  { $as_echo "$as_me:$LINENO: checking for xmlParseMemory in -lxml2" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseMemory in -lxml2" >&5
  $as_echo_n "checking for xmlParseMemory in -lxml2... " >&6; }
- if test "${ac_cv_lib_xml2_xmlParseMemory+set}" = set; then
+ if test "${ac_cv_lib_xml2_xmlParseMemory+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12280,64 -8913,33 +8841,33 @@@ return xmlParseMemory ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_xml2_xmlParseMemory=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_xml2_xmlParseMemory=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_xml2_xmlParseMemory" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBXML2 1
- _ACEOF
+ $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
  
                   XML2LIBS="$ac_xml_libs"
                   XML2INCL="$ac_xml_cflags"
  fi
  
-              { $as_echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReadMemory in -lxml2" >&5
  $as_echo_n "checking for xmlReadMemory in -lxml2... " >&6; }
- if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then
+ if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12355,62 -8957,31 +8885,31 @@@ return xmlReadMemory ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_xml2_xmlReadMemory=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_xml2_xmlReadMemory=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_xml2_xmlReadMemory" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XMLREADMEMORY 1
- _ACEOF
+ $as_echo "#define HAVE_XMLREADMEMORY 1" >>confdefs.h
  
  fi
  
-              { $as_echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlNewDocPI in -lxml2" >&5
  $as_echo_n "checking for xmlNewDocPI in -lxml2... " >&6; }
- if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then
+ if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lxml2 $ac_xml_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12428,47 -8999,20 +8927,20 @@@ return xmlNewDocPI ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_xml2_xmlNewDocPI=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_xml2_xmlNewDocPI=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_xml2_xmlNewDocPI" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_XMLNEWDOCPI 1
- _ACEOF
+ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h
  
  fi
  
@@@ -12479,19 -9023,15 +8951,15 @@@ don
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then
+ if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then :
    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.
- 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.
- This is an error since --with-xml was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxml2 ${notice_platform}development files not found, XML won't be supported.
+ This is an error since --with-xml was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "x$with_xslt" != "xno"
  then
      if test "$PKG_CONFIG" != "false"
@@@ -12504,63 -9044,15 +8972,15 @@@
      fi
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
- 
- 
- 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_LIBXSLT_PATTERN_H
+     for ac_header in libxslt/pattern.h libxslt/transform.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LIBXSLT_PATTERN_H
  # include <libxslt/pattern.h>
  #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -12572,18 -9064,14 +8992,14 @@@ don
      CPPFLAGS="$ac_save_CPPFLAGS"
      if test "$ac_cv_header_libxslt_transform_h" = "yes"
      then
-         { $as_echo "$as_me:$LINENO: checking for -lxslt" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lxslt" >&5
  $as_echo_n "checking for -lxslt... " >&6; }
- if test "${ac_cv_lib_soname_xslt+set}" = set; then
+ if test "${ac_cv_lib_soname_xslt+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lxslt $ac_xslt_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12601,50 -9089,23 +9017,23 @@@ return xsltCompilePattern ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
- if test "x$ac_cv_lib_soname_xslt" = "x"; then
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
+ if test "x$ac_cv_lib_soname_xslt" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_xslt" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_xslt" >&5
  $as_echo "$ac_cv_lib_soname_xslt" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -12653,22 -9114,17 +9042,17 @@@ _ACEO
  
         XSLTINCL="$ac_xslt_cflags"
  fi
- 
      fi
  fi
- if test "x$ac_cv_lib_soname_xslt" = "x"; 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.
- 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.
- This is an error since --with-xslt was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libxslt ${notice_platform}development files not found, xslt won't be supported.
+ This is an error since --with-xslt was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  HALINCL=""
  
  if test "x$with_hal" != "xno"
@@@ -12680,150 -9136,12 +9064,12 @@@ the
          ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
          CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
      fi
- 
- 
- for ac_header in dbus/dbus.h hal/libhal.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in dbus/dbus.h hal/libhal.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -12834,18 -9152,14 +9080,14 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for dbus_connection_close in -ldbus-1" >&5
  $as_echo_n "checking for dbus_connection_close in -ldbus-1... " >&6; }
- if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then
+ if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbus-1 $ac_hal_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12863,55 -9177,26 +9105,26 @@@ return dbus_connection_close ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_dbus_1_dbus_connection_close=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dbus_1_dbus_connection_close=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_dbus_1_dbus_connection_close" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lhal" >&5
  $as_echo_n "checking for -lhal... " >&6; }
- if test "${ac_cv_lib_soname_hal+set}" = set; then
+ if test "${ac_cv_lib_soname_hal+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lhal $ac_hal_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -12929,50 -9214,23 +9142,23 @@@ return libhal_ctx_new ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_hal" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_hal" >&5
  $as_echo "$ac_cv_lib_soname_hal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -12981,25 -9239,20 +9167,20 @@@ _ACEO
  
         HALINCL="$ac_hal_cflags"
  fi
- 
  fi
  
      fi
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "x$ac_cv_lib_soname_hal" = "x"; then
+ if test "x$ac_cv_lib_soname_hal" = "x"; then :
    case "x$with_hal" in
    x)   wine_notices="$wine_notices|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;;
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: libhal/libdbus ${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/libdbus ${notice_platform}development files not found, no dynamic device support.
- This is an error since --with-hal was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libhal/libdbus ${notice_platform}development files not found, no dynamic device support.
+ This is an error since --with-hal was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "x$with_gnutls" != "xno"
  then
      ac_save_CPPFLAGS="$CPPFLAGS"
@@@ -13009,144 -9262,9 +9190,9 @@@
          ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
          CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
      fi
-     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; }
- if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5
- $as_echo "$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; }
- 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
- #include <gnutls/gnutls.h>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking gnutls/gnutls.h presence" >&5
- $as_echo_n "checking gnutls/gnutls.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <gnutls/gnutls.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+     ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+ if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <gnutls/gnutls.h>
  int
@@@ -13157,36 -9275,15 +9203,15 @@@ typeof(gnutls_mac_get_key_size) *pfunc
    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
-   { $as_echo "$as_me:$LINENO: checking for -lgnutls" >&5
+ if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lgnutls" >&5
  $as_echo_n "checking for -lgnutls... " >&6; }
- if test "${ac_cv_lib_soname_gnutls+set}" = set; then
+ if test "${ac_cv_lib_soname_gnutls+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lgnutls $ac_gnutls_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -13204,50 -9301,23 +9229,23 @@@ return gnutls_global_init ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_gnutls" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_gnutls" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_gnutls" >&5
  $as_echo "$ac_cv_lib_soname_gnutls" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -13257,48 -9327,33 +9255,33 @@@ _ACEO
         GNUTLSINCL="$ac_gnutls_cflags"
  
  fi
- 
- 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
  
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "x$ac_cv_lib_soname_gnutls" = "x"; then
+ if test "x$ac_cv_lib_soname_gnutls" = "x"; then :
    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.
- 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.
- This is an error since --with-gnutls was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libgnutls ${notice_platform}development files not found, no schannel support.
+ This is an error since --with-gnutls was requested." "$LINENO" 5 ;;
  esac
  fi
  
  CURSESLIBS=""
  if test "$ac_cv_header_ncurses_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -lncurses" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lncurses" >&5
  $as_echo_n "checking for -lncurses... " >&6; }
- if test "${ac_cv_lib_soname_ncurses+set}" = set; then
+ if test "${ac_cv_lib_soname_ncurses+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lncurses  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -13316,50 -9371,23 +9299,23 @@@ return waddch ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_ncurses" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ncurses" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ncurses" >&5
  $as_echo "$ac_cv_lib_soname_ncurses" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -13368,21 -9396,16 +9324,16 @@@ _ACEO
  
         CURSESLIBS="-lncurses"
  fi
- 
  elif test "$ac_cv_header_curses_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -lcurses" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcurses" >&5
  $as_echo_n "checking for -lcurses... " >&6; }
- if test "${ac_cv_lib_soname_curses+set}" = set; then
+ if test "${ac_cv_lib_soname_curses+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcurses  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -13400,50 -9423,23 +9351,23 @@@ return waddch ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_curses" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_curses" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_curses" >&5
  $as_echo "$ac_cv_lib_soname_curses" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -13452,133 -9448,38 +9376,38 @@@ _ACEO
  
         CURSESLIBS="-lcurses"
  fi
  fi
  ac_save_LIBS="$LIBS"
  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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   ac_fn_c_check_func "$LINENO" "mousemask" "ac_cv_func_mousemask"
+ if test "x$ac_cv_func_mousemask" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_MOUSEMASK 1
  _ACEOF
  
  fi
  done
  
  LIBS="$ac_save_LIBS"
- if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then
+ if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then :
    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.
- 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.
- This is an error since --with-curses was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "lib(n)curses ${notice_platform}development files not found, curses won't be supported.
+ This is an error since --with-curses was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "x$with_sane" != "xno"
  then
      ac_save_CPPFLAGS="$CPPFLAGS"
      # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_sane_devel+set}" = set; then
+ if test "${ac_cv_prog_sane_devel+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$sane_devel"; then
@@@ -13589,14 -9490,14 +9418,14 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_sane_devel" && ac_cv_prog_sane_devel="no"
@@@ -13604,10 -9505,10 +9433,10 @@@ 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 "$as_me:${as_lineno-$LINENO}: result: $sane_devel" >&5
  $as_echo "$sane_devel" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -13618,151 -9519,16 +9447,16 @@@
          ac_sane_libs="`$sane_devel --ldflags`"
          CPPFLAGS="$CPPFLAGS $ac_sane_incl"
      fi
-     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; }
- if test "${ac_cv_header_sane_sane_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
- $as_echo "$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; }
- 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
- #include <sane/sane.h>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
- $as_echo_n "checking sane/sane.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sane/sane.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if test "${ac_cv_header_sane_sane_h+set}" = set; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- if test "x$ac_cv_header_sane_sane_h" = x""yes; then
-   { $as_echo "$as_me:$LINENO: checking for -lsane" >&5
+     ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
+ if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lsane" >&5
  $as_echo_n "checking for -lsane... " >&6; }
- if test "${ac_cv_lib_soname_sane+set}" = set; then
+ if test "${ac_cv_lib_soname_sane+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lsane $ac_sane_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -13780,50 -9546,23 +9474,23 @@@ return sane_init ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_sane" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_sane" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_sane" >&5
  $as_echo "$ac_cv_lib_soname_sane" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -13833,33 -9572,28 +9500,28 @@@ _ACEO
         SANEINCL="$ac_sane_incl"
  
  fi
- 
  fi
  
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "x$ac_cv_lib_soname_sane" = "x"; then
+ if test "x$ac_cv_lib_soname_sane" = "x"; then :
    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.
- 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.
- This is an error since --with-sane was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libsane ${notice_platform}development files not found, scanners won't be supported.
+ This is an error since --with-sane was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "x$with_gphoto" != "xno"
  then
      ac_save_CPPFLAGS="$CPPFLAGS"
      # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_gphoto2_devel+set}" = set; then
+ if test "${ac_cv_prog_gphoto2_devel+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$gphoto2_devel"; then
@@@ -13870,14 -9604,14 +9532,14 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_gphoto2_devel" && ac_cv_prog_gphoto2_devel="no"
@@@ -13885,19 -9619,19 +9547,19 @@@ 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 "$as_me:${as_lineno-$LINENO}: result: $gphoto2_devel" >&5
  $as_echo "$gphoto2_devel" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_gphoto2port_devel+set}" = set; then
+ if test "${ac_cv_prog_gphoto2port_devel+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$gphoto2port_devel"; then
@@@ -13908,14 -9642,14 +9570,14 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_gphoto2port_devel" && ac_cv_prog_gphoto2port_devel="no"
@@@ -13923,10 -9657,10 +9585,10 @@@ 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 "$as_me:${as_lineno-$LINENO}: result: $gphoto2port_devel" >&5
  $as_echo "$gphoto2port_devel" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -13945,151 -9679,16 +9607,16 @@@
          CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl"
      fi
      ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"}
-     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; }
- if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_gphoto2_camera_h" >&5
- $as_echo "$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; }
- 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
- #include <gphoto2-camera.h>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking gphoto2-camera.h presence" >&5
- $as_echo_n "checking gphoto2-camera.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <gphoto2-camera.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
-   $as_echo_n "(cached) " >&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; }
- 
- 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
+     ac_fn_c_check_header_mongrel "$LINENO" "gphoto2-camera.h" "ac_cv_header_gphoto2_camera_h" "$ac_includes_default"
+ if test "x$ac_cv_header_gphoto2_camera_h" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gp_camera_new in -lgphoto2" >&5
  $as_echo_n "checking for gp_camera_new in -lgphoto2... " >&6; }
- if test "${ac_cv_lib_gphoto2_gp_camera_new+set}" = set; then
+ if test "${ac_cv_lib_gphoto2_gp_camera_new+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgphoto2 $ac_gphoto2_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -14107,47 -9706,20 +9634,20 @@@ return gp_camera_new ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_gphoto2_gp_camera_new=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_gphoto2_gp_camera_new=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_gphoto2_gp_camera_new" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GPHOTO2 1
- _ACEOF
+ $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h
  
                                     GPHOTO2LIBS="$ac_gphoto2_libs"
  
@@@ -14160,31 -9732,23 +9660,23 @@@ f
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then
+ if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then :
    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.
- 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.
- This is an error since --with-gphoto was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.
+ This is an error since --with-gphoto was requested." "$LINENO" 5 ;;
  esac
  fi
  
  
- 
  RESOLVLIBS=""
  
  if test "$ac_cv_header_resolv_h" = "yes"
  then
      ac_save_LIBS="$LIBS"
      LIBS="$LIBS -lresolv"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
@@@ -14198,43 -9762,14 +9690,14 @@@ res_init()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_RESOLV 1
- _ACEOF
+ $as_echo "#define HAVE_RESOLV 1" >>confdefs.h
  
           RESOLVLIBS="-lresolv"
- else
-   $as_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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_save_LIBS"
  fi
  
@@@ -14242,18 -9777,14 +9705,14 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5
  $as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
- if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then
+ if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-llcms  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -14271,74 -9802,43 +9730,43 @@@ return cmsOpenProfileFromFile ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_lcms_cmsOpenProfileFromFile=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LCMS 1
- _ACEOF
+ $as_echo "#define HAVE_LCMS 1" >>confdefs.h
  
           LCMSLIBS="-llcms"
  fi
  
  fi
- if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then
+ if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then :
    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.
- 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.
- This is an error since --with-cms was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "liblcms ${notice_platform}development files not found, Color Management won't be supported.
+ This is an error since --with-cms was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "x$with_freetype" != "xno"
  then
      for ac_prog in freetype-config freetype2-config
  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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ft_devel+set}" = set; then
+ if test "${ac_cv_prog_ft_devel+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ft_devel"; then
@@@ -14349,24 -9849,24 +9777,24 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ft_devel" >&5
  $as_echo "$ft_devel" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -14381,18 -9881,14 +9809,14 @@@ test -n "$ft_devel" || ft_devel="no
          ac_freetype_libs=`$ft_devel --libs`
      fi
      ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
-     { $as_echo "$as_me:$LINENO: checking for -lfreetype" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
  $as_echo_n "checking for -lfreetype... " >&6; }
- if test "${ac_cv_lib_soname_freetype+set}" = set; then
+ if test "${ac_cv_lib_soname_freetype+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfreetype $ac_freetype_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -14410,50 -9906,23 +9834,23 @@@ return FT_Init_FreeType ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_freetype" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
         ft_lib=no
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_freetype" >&5
  $as_echo "$ac_cv_lib_soname_freetype" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -14462,24 -9931,11 +9859,11 @@@ _ACEO
  
         ft_lib=yes
  fi
- 
      if test "$ft_lib" = "yes"
      then
  	ac_save_CPPFLAGS="$CPPFLAGS"
  	CPPFLAGS="$ac_freetype_incl $CPPFLAGS"
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- for ac_header in ft2build.h \
+ 	for ac_header in ft2build.h \
                           freetype/freetype.h \
                           freetype/ftglyph.h \
                           freetype/fttypes.h \
@@@ -14491,60 -9947,14 +9875,14 @@@
                           freetype/ftmodapi.h \
                           freetype/ftlcdfil.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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_FT2BUILD_H
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
                            # include <ft2build.h>
                            #endif
- 
- #include <$ac_header>
- _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
-   eval "$as_ac_Header=yes"
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
- fi
- 
- 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
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@@ -14553,143 -9963,23 +9891,23 @@@ f
  
  done
  
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <ft2build.h>
                      #include <freetype/fttrigon.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
+ if ac_fn_c_try_cpp "$LINENO"; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FREETYPE_FTTRIGON_H 1
- _ACEOF
+ $as_echo "#define HAVE_FREETYPE_FTTRIGON_H 1" >>confdefs.h
  
                      wine_cv_fttrigon=yes
  else
-   $as_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; }
- if test "${ac_cv_type_FT_TrueTypeEngineType+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- else
-   $as_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
- 
- 
- 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
+         ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <freetype/ftmodapi.h>
+ "
+ if test "x$ac_cv_type_FT_TrueTypeEngineType" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FT_TRUETYPEENGINETYPE 1
@@@ -14700,102 -9990,12 +9918,12 @@@ f
  
          ac_save_CFLAGS="$CFLAGS"
          CFLAGS="$CFLAGS $ac_freetype_libs"
- 
- 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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+         for ac_func in FT_Load_Sfnt_Table
+ do :
+   ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table"
+ if test "x$ac_cv_func_FT_Load_Sfnt_Table" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_FT_LOAD_SFNT_TABLE 1
  _ACEOF
  
  fi
@@@ -14806,9 -10006,7 +9934,7 @@@ don
  		if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
  	then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FREETYPE 1
- _ACEOF
+ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
  
              FREETYPELIBS="$ac_freetype_libs"
  
@@@ -14817,29 -10015,21 +9943,21 @@@
  	fi
      fi
  fi
- if test "x$FREETYPELIBS" = "x"; then
+ if test "x$FREETYPELIBS" = "x"; then :
    case "x$with_freetype" in
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: FreeType ${notice_platform}development files not found. Fonts will not be built.
- Use the --without-freetype option if you really want this." >&5
- $as_echo "$as_me: error: FreeType ${notice_platform}development files not found. Fonts will not be built.
- Use the --without-freetype option if you really want this." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "FreeType ${notice_platform}development files not found. Fonts will not be built.
+ Use the --without-freetype option if you really want this." "$LINENO" 5 ;;
  esac
  fi
- 
  test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no}
  
- { $as_echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parport header/ppdev.h" >&5
  $as_echo_n "checking for parport header/ppdev.h... " >&6; }
- if test "${ac_cv_c_ppdev+set}" = set; then
+ if test "${ac_cv_c_ppdev+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <linux/ppdev.h>
  int
@@@ -14850,148 -10040,34 +9968,34 @@@ ioctl (1,PPCLAIM,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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_ppdev="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_ppdev="no"
+   ac_cv_c_ppdev="no"
  fi
- 
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_ppdev" >&5
  $as_echo "$ac_cv_c_ppdev" >&6; }
  if test "$ac_cv_c_ppdev" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PPDEV 1
- _ACEOF
+ $as_echo "#define HAVE_PPDEV 1" >>confdefs.h
  
  fi
  
  ac_wine_check_funcs_save_LIBS="$LIBS"
  LIBS="$LIBS $LIBPTHREAD"
- 
- 
- 
- 
  for ac_func in \
          pthread_attr_get_np \
          pthread_getattr_np \
          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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@@ -15003,18 -10079,14 +10007,14 @@@ LIBS="$ac_wine_check_funcs_save_LIBS
  
  if test "$ac_cv_header_zlib_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
  $as_echo_n "checking for inflate in -lz... " >&6; }
- if test "${ac_cv_lib_z_inflate+set}" = set; then
+ if test "${ac_cv_lib_z_inflate+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15032,47 -10104,20 +10032,20 @@@ return inflate ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_z_inflate=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_inflate=no
+   ac_cv_lib_z_inflate=no
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
  $as_echo "$ac_cv_lib_z_inflate" >&6; }
- if test "x$ac_cv_lib_z_inflate" = x""yes; then
+ if test "x$ac_cv_lib_z_inflate" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ZLIB 1
- _ACEOF
+ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
  
                              ZLIB="-lz"
  
@@@ -15085,9 -10130,9 +10058,9 @@@ the
      save_CFLAGS="$CFLAGS"
      # 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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_ESDCONFIG+set}" = set; then
+ if test "${ac_cv_path_ESDCONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $ESDCONFIG in
@@@ -15100,14 -10145,14 +10073,14 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     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
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
- done
+   done
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_ESDCONFIG" && ac_cv_path_ESDCONFIG="no"
@@@ -15116,10 -10161,10 +10089,10 @@@ esa
  fi
  ESDCONFIG=$ac_cv_path_ESDCONFIG
  if test -n "$ESDCONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $ESDCONFIG" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ESDCONFIG" >&5
  $as_echo "$ESDCONFIG" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
@@@ -15137,151 -10182,16 +10110,16 @@@
          CFLAGS="$CFLAGS $ac_esd_incl"
      fi
      ac_esd_libs=${ac_esd_libs:-"-lesd"}
-     if test "${ac_cv_header_esd_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for esd.h" >&5
- $as_echo_n "checking for esd.h... " >&6; }
- if test "${ac_cv_header_esd_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
- $as_echo "$ac_cv_header_esd_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking esd.h usability" >&5
- $as_echo_n "checking esd.h usability... " >&6; }
- 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
- #include <esd.h>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking esd.h presence" >&5
- $as_echo_n "checking esd.h presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <esd.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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: esd.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: esd.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: esd.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: esd.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: esd.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: esd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: esd.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: esd.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for esd.h" >&5
- $as_echo_n "checking for esd.h... " >&6; }
- if test "${ac_cv_header_esd_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_esd_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
- $as_echo "$ac_cv_header_esd_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_esd_h" = x""yes; then
-   { $as_echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5
+     ac_fn_c_check_header_mongrel "$LINENO" "esd.h" "ac_cv_header_esd_h" "$ac_includes_default"
+ if test "x$ac_cv_header_esd_h" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for esd_open_sound in -lesd" >&5
  $as_echo_n "checking for esd_open_sound in -lesd... " >&6; }
- if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then
+ if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lesd $ac_esd_libs $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15299,51 -10209,24 +10137,24 @@@ return esd_open_sound ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_esd_esd_open_sound=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_esd_esd_open_sound=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then :
    ESDINCL="$ac_esd_incl"
  
               ESDLIBS="$ac_esd_libs"
  
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ESD 1
- _ACEOF
+ $as_echo "#define HAVE_ESD 1" >>confdefs.h
  
  fi
  
@@@ -15357,18 -10240,14 +10168,14 @@@ 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 "$as_me:${as_lineno-$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; }
- if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; then
+ if test "${ac_cv_lib_asound_snd_pcm_hw_params_get_access+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lasound  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15386,48 -10265,19 +10193,19 @@@ return snd_pcm_hw_params_get_access ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_asound_snd_pcm_hw_params_get_access=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_asound_snd_pcm_hw_params_get_access=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access" = x""yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_ALSA_ASOUNDLIB_H
  #include <alsa/asoundlib.h>
@@@ -15442,37 -10292,12 +10220,12 @@@ int ret = snd_pcm_hw_params_get_access(
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ALSA 1
- _ACEOF
+ $as_echo "#define HAVE_ALSA 1" >>confdefs.h
  
                           ALSALIBS="-lasound"
- 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
  
@@@ -15482,18 -10307,14 +10235,14 @@@ AUDIOIOLIBS="
  
  if test "$ac_cv_header_libaudioio_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for AudioIOGetVersion in -laudioio" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AudioIOGetVersion in -laudioio" >&5
  $as_echo_n "checking for AudioIOGetVersion in -laudioio... " >&6; }
- if test "${ac_cv_lib_audioio_AudioIOGetVersion+set}" = set; then
+ if test "${ac_cv_lib_audioio_AudioIOGetVersion+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-laudioio  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15511,48 -10332,21 +10260,21 @@@ return AudioIOGetVersion ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_audioio_AudioIOGetVersion=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_audioio_AudioIOGetVersion=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_audioio_AudioIOGetVersion" = x""yes; then :
    AUDIOIOLIBS="-laudioio"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBAUDIOIO 1
- _ACEOF
+ $as_echo "#define HAVE_LIBAUDIOIO 1" >>confdefs.h
  
  fi
  
@@@ -15561,18 -10355,14 +10283,14 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for -lcapi20" >&5
  $as_echo_n "checking for -lcapi20... " >&6; }
- if test "${ac_cv_lib_soname_capi20+set}" = set; then
+ if test "${ac_cv_lib_soname_capi20+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcapi20  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15590,50 -10380,23 +10308,23 @@@ return capi20_register ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_capi20" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_capi20" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_capi20" >&5
  $as_echo "$ac_cv_lib_soname_capi20" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15642,21 -10405,16 +10333,16 @@@ _ACEO
  
  
  fi
- 
  fi
- if test "x$ac_cv_lib_soname_capi20" = "x"; then
+ if test "x$ac_cv_lib_soname_capi20" = "x"; then :
    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.
- 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.
- This is an error since --with-capi was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libcapi20 ${notice_platform}development files not found, ISDN won't be supported.
+ This is an error since --with-capi was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  CUPSINCL=""
  
  if test "x$with_cups" != "xno"
@@@ -15665,164 -10423,21 +10351,21 @@@ the
      ac_cups_cflags=`cups-config --cflags 2>/dev/null`
      ac_cups_libs=`cups-config --ldflags 2>/dev/null`
      CPPFLAGS="$CPPFLAGS $ac_cups_cflags"
- 
- for ac_header in cups/cups.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in cups/cups.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default"
+ if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_CUPS_CUPS_H 1
  _ACEOF
-  { $as_echo "$as_me:$LINENO: checking for -lcups" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcups" >&5
  $as_echo_n "checking for -lcups... " >&6; }
- if test "${ac_cv_lib_soname_cups+set}" = set; then
+ if test "${ac_cv_lib_soname_cups+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcups $ac_cups_libs $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15840,50 -10455,23 +10383,23 @@@ return cupsGetDefault ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_cups" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_cups" >&5
  $as_echo "$ac_cv_lib_soname_cups" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15892,40 -10480,31 +10408,31 @@@ _ACEO
  
         CUPSINCL="$ac_cups_cflags"
  fi
- 
  fi
  
  done
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  fi
- if test "x$ac_cv_lib_soname_cups" = "x"; then
+ if test "x$ac_cv_lib_soname_cups" = "x"; then :
    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.
- 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.
- This is an error since --with-cups was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libcups ${notice_platform}development files not found, CUPS won't be supported.
+ This is an error since --with-cups was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "$ac_cv_header_jack_jack_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -ljack" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljack" >&5
  $as_echo_n "checking for -ljack... " >&6; }
- if test "${ac_cv_lib_soname_jack+set}" = set; then
+ if test "${ac_cv_lib_soname_jack+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-ljack  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -15943,50 -10522,23 +10450,23 @@@ return jack_client_new ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_jack" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_jack" >&5
  $as_echo "$ac_cv_lib_soname_jack" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15995,23 -10547,18 +10475,18 @@@ _ACEO
  
  
  fi
- 
  fi
  
  if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -lfontconfig" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5
  $as_echo_n "checking for -lfontconfig... " >&6; }
- if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
+ if test "${ac_cv_lib_soname_fontconfig+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfontconfig  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16029,50 -10576,23 +10504,23 @@@ return FcInit ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_fontconfig" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_fontconfig" >&5
  $as_echo "$ac_cv_lib_soname_fontconfig" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16081,157 -10601,17 +10529,17 @@@ _ACEO
  
  
  fi
- 
  elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno"
  then
          ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
      $as_unset ac_cv_header_fontconfig_fontconfig_h
- 
- for ac_header in fontconfig/fontconfig.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in fontconfig/fontconfig.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
+ if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_FONTCONFIG_FONTCONFIG_H 1
  _ACEOF
  
  fi
@@@ -16243,18 -10623,14 +10551,14 @@@ don
      then
          FONTCONFIGINCL="$X_CFLAGS"
  
-         { $as_echo "$as_me:$LINENO: checking for -lfontconfig" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5
  $as_echo_n "checking for -lfontconfig... " >&6; }
- if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
+ if test "${ac_cv_lib_soname_fontconfig+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lfontconfig $X_LIBS $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16272,50 -10648,23 +10576,23 @@@ return FcInit ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_fontconfig" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_fontconfig" >&5
  $as_echo "$ac_cv_lib_soname_fontconfig" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16324,36 -10673,27 +10601,27 @@@ _ACEO
  
  
  fi
- 
      fi
  fi
- if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
+ if test "x$ac_cv_lib_soname_fontconfig" = "x"; then :
    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.
- 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.
- This is an error since --with-fontconfig was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "fontconfig ${notice_platform}development files not found, fontconfig won't be supported.
+ This is an error since --with-fontconfig was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  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 "$as_me:${as_lineno-$LINENO}: checking for -lssl" >&5
  $as_echo_n "checking for -lssl... " >&6; }
- if test "${ac_cv_lib_soname_ssl+set}" = set; then
+ if test "${ac_cv_lib_soname_ssl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lssl  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16371,50 -10711,23 +10639,23 @@@ return SSL_library_init ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_ssl" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ssl" >&5
  $as_echo "$ac_cv_lib_soname_ssl" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16423,19 -10736,14 +10664,14 @@@ _ACEO
  
  
  fi
- 
-     { $as_echo "$as_me:$LINENO: checking for -lcrypto" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcrypto" >&5
  $as_echo_n "checking for -lcrypto... " >&6; }
- if test "${ac_cv_lib_soname_crypto+set}" = set; then
+ if test "${ac_cv_lib_soname_crypto+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lcrypto  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16453,50 -10761,23 +10689,23 @@@ return BIO_new_socket ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_crypto" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_crypto" >&5
  $as_echo "$ac_cv_lib_soname_crypto" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16505,35 -10786,26 +10714,26 @@@ _ACEO
  
  
  fi
- 
  fi
- if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then
+ if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then :
    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.
- 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.
- This is an error since --with-openssl was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "OpenSSL ${notice_platform}development files not found, SSL won't be supported.
+ This is an error since --with-openssl was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -lgsm" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lgsm" >&5
  $as_echo_n "checking for -lgsm... " >&6; }
- if test "${ac_cv_lib_soname_gsm+set}" = set; then
+ if test "${ac_cv_lib_soname_gsm+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lgsm  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16551,50 -10823,23 +10751,23 @@@ return gsm_create ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    case "$LIBEXT" in
      dll) ;;
      dylib) ac_cv_lib_soname_gsm=`otool -L conftest$ac_exeext | grep "libgsm\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libgsm\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
      *) ac_cv_lib_soname_gsm=`$ac_cv_path_LDD conftest$ac_exeext | grep "libgsm\\.$LIBEXT" | sed -e "s/^.*\(libgsm\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
    esac
- else
-   $as_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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
    LIBS=$ac_check_soname_save_LIBS
  fi
- if test "x$ac_cv_lib_soname_gsm" = "x"; then
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
+ if test "x$ac_cv_lib_soname_gsm" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_gsm" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_gsm" >&5
  $as_echo "$ac_cv_lib_soname_gsm" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16603,35 -10848,26 +10776,26 @@@ _ACEO
  
  
  fi
- 
  fi
- if test "x$ac_cv_lib_soname_gsm" = "x"; then
-   case "x$with_libgsm" in
-   x)   wine_warnings="$wine_warnings|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
+ if test "x$ac_cv_lib_soname_gsm" = "x"; then :
+   case "x$with_gsm" in
+   x)   wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;;
    xno) ;;
-   *)   { { $as_echo "$as_me:$LINENO: error: libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
- This is an error since --with-libgsm was requested." >&5
- $as_echo "$as_me: error: libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
- This is an error since --with-libgsm was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.
+ This is an error since --with-gsm was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "$ac_cv_header_jpeglib_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -ljpeg" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5
  $as_echo_n "checking for -ljpeg... " >&6; }
- if test "${ac_cv_lib_soname_jpeg+set}" = set; then
+ if test "${ac_cv_lib_soname_jpeg+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-ljpeg  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16649,50 -10885,23 +10813,23 @@@ return jpeg_start_decompress ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_jpeg" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jpeg" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_jpeg" >&5
  $as_echo "$ac_cv_lib_soname_jpeg" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16701,35 -10910,26 +10838,26 @@@ _ACEO
  
  
  fi
- 
  fi
- if test "x$ac_cv_lib_soname_jpeg" = "x"; then
+ if test "x$ac_cv_lib_soname_jpeg" = "x"; then :
    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.
- 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.
- This is an error since --with-jpeg was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libjpeg ${notice_platform}development files not found, JPEG won't be supported.
+ This is an error since --with-jpeg was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "$ac_cv_header_png_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for -lpng" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lpng" >&5
  $as_echo_n "checking for -lpng... " >&6; }
- if test "${ac_cv_lib_soname_png+set}" = set; then
+ if test "${ac_cv_lib_soname_png+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lpng -lm -lz $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16747,50 -10947,23 +10875,23 @@@ return png_create_read_struct ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_png" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_png" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_png" >&5
  $as_echo "$ac_cv_lib_soname_png" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16799,157 -10972,17 +10900,17 @@@ _ACEO
  
  
  fi
- 
  elif test -n "$X_CFLAGS" -a "x$with_png" != "xno"
  then
          ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
      $as_unset ac_cv_header_png_h
- 
- for ac_header in png.h
- do
- as_ac_Header=`$as_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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
- $as_echo_n "checking $ac_header usability... " >&6; }
- 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
- #include <$ac_header>
- _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
-   ac_header_compiler=yes
- else
-   $as_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; }
- 
- # Is the header present?
- { $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
- $as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- 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_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
-   (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
- 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; }
- 
- # 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;}
-     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;}
-     ( cat <<\_ASBOX
- ## ------------------------------------ ##
- ## Report this to wine-devel at winehq.org ##
- ## ------------------------------------ ##
- _ASBOX
-      ) | 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; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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; }
- 
- fi
- as_val=`eval 'as_val=${'$as_ac_Header'}
- 		 $as_echo "$as_val"'`
-    if test "x$as_val" = x""yes; then
+     for ac_header in png.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+ if test "x$ac_cv_header_png_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_PNG_H 1
  _ACEOF
  
  fi
@@@ -16961,18 -10994,14 +10922,14 @@@ don
      then
          PNGINCL="$X_CFLAGS"
  
-         { $as_echo "$as_me:$LINENO: checking for -lpng" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lpng" >&5
  $as_echo_n "checking for -lpng... " >&6; }
- if test "${ac_cv_lib_soname_png+set}" = set; then
+ if test "${ac_cv_lib_soname_png+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lpng $X_LIBS -lm -lz $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -16990,50 -11019,23 +10947,23 @@@ return png_create_read_struct ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_png" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
  
  else
-   { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_soname_png" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_png" >&5
  $as_echo "$ac_cv_lib_soname_png" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -17042,36 -11044,27 +10972,27 @@@ _ACEO
  
  
  fi
- 
      fi
  fi
- if test "x$ac_cv_lib_soname_png" = "x"; then
+ if test "x$ac_cv_lib_soname_png" = "x"; then :
    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.
- 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.
- This is an error since --with-png was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libpng ${notice_platform}development files not found, PNG won't be supported.
+ This is an error since --with-png was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
  if test "$ac_cv_header_kstat_h" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
  $as_echo_n "checking for kstat_open in -lkstat... " >&6; }
- if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
+ if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lkstat  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -17089,47 -11082,20 +11010,20 @@@ return kstat_open ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_kstat_kstat_open=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_kstat_kstat_open=no
+   ac_cv_lib_kstat_kstat_open=no
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
  $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
- if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then
+ if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBKSTAT 1
- _ACEOF
+ $as_echo "#define HAVE_LIBKSTAT 1" >>confdefs.h
  
                    LIBKSTAT="-lkstat"
  
@@@ -17137,18 -11103,14 +11031,14 @@@ f
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for -lodbc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lodbc" >&5
  $as_echo_n "checking for -lodbc... " >&6; }
- if test "${ac_cv_lib_soname_odbc+set}" = set; then
+ if test "${ac_cv_lib_soname_odbc+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_soname_save_LIBS=$LIBS
  LIBS="-lodbc  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -17166,53 -11128,26 +11056,26 @@@ return SQLConnect ()
    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
+ if ac_fn_c_try_link "$LINENO"; 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
- 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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ if test "x$ac_cv_lib_soname_odbc" = "x"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_odbc" >&5
  $as_echo "$ac_cv_lib_soname_odbc" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -17222,7 -11157,6 +11085,6 @@@ _ACEO
  
  fi
  
- 
  if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
          "$ac_cv_header_sys_soundcard_h" != "yes" -a \
          "$ac_cv_header_machine_soundcard_h" != "yes" -a \
@@@ -17239,19 -11173,15 +11101,15 @@@ if test "x${GCC}" = "xyes
  then
    EXTRACFLAGS="-Wall -pipe"
  
-     { $as_echo "$as_me:$LINENO: checking for gcc strength-reduce bug" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc strength-reduce bug" >&5
  $as_echo_n "checking for gcc strength-reduce bug... " >&6; }
- if test "${ac_cv_c_gcc_strength_bug+set}" = set; then
+ if test "${ac_cv_c_gcc_strength_bug+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
    ac_cv_c_gcc_strength_bug="yes"
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int L[4] = {0,1,2,3};
  int
@@@ -17268,62 -11198,31 +11126,31 @@@ static int Array[3]
    return 0;
  }
  _ACEOF
- rm -f 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>&5
-   ac_status=$?
-   $as_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 "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+ if ac_fn_c_try_run "$LINENO"; 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
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- ac_cv_c_gcc_strength_bug="yes"
+   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
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
- 
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_gcc_strength_bug" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_gcc_strength_bug" >&5
  $as_echo "$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 -fno-builtin" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5
  $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; }
- if test "${ac_cv_cflags__fno_builtin+set}" = set; then
+ if test "${ac_cv_cflags__fno_builtin+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fno-builtin"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17334,59 -11233,29 +11161,29 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fno_builtin=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fno_builtin=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5
  $as_echo "$ac_cv_cflags__fno_builtin" >&6; }
- if test $ac_cv_cflags__fno_builtin = yes; then
+ 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5
  $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; }
- if test "${ac_cv_cflags__fno_strict_aliasing+set}" = set; then
+ if test "${ac_cv_cflags__fno_strict_aliasing+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -fno-strict-aliasing"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17397,58 -11266,28 +11194,28 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__fno_strict_aliasing=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__fno_strict_aliasing=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_strict_aliasing" >&5
  $as_echo "$ac_cv_cflags__fno_strict_aliasing" >&6; }
- if test $ac_cv_cflags__fno_strict_aliasing = yes; then
+ 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5
  $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; }
- if test "${ac_cv_cflags__Wdeclaration_after_statement+set}" = set; then
+ if test "${ac_cv_cflags__Wdeclaration_after_statement+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wdeclaration-after-statement"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17459,58 -11298,28 +11226,28 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__Wdeclaration_after_statement=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__Wdeclaration_after_statement=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wdeclaration_after_statement" >&5
  $as_echo "$ac_cv_cflags__Wdeclaration_after_statement" >&6; }
- if test $ac_cv_cflags__Wdeclaration_after_statement = yes; then
+ 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5
  $as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; }
- if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then
+ if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wwrite-strings"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17521,58 -11330,28 +11258,28 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__Wwrite_strings=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__Wwrite_strings=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wwrite_strings" >&5
  $as_echo "$ac_cv_cflags__Wwrite_strings" >&6; }
- if test $ac_cv_cflags__Wwrite_strings = yes; then
+ 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wtype-limits" >&5
  $as_echo_n "checking whether the compiler supports -Wtype-limits... " >&6; }
- if test "${ac_cv_cflags__Wtype_limits+set}" = set; then
+ if test "${ac_cv_cflags__Wtype_limits+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
  CFLAGS="$CFLAGS -Wtype-limits"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17583,59 -11362,29 +11290,29 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_cflags__Wtype_limits=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_cflags__Wtype_limits=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wtype_limits" >&5
  $as_echo "$ac_cv_cflags__Wtype_limits" >&6; }
- if test $ac_cv_cflags__Wtype_limits = yes; then
+ if test $ac_cv_cflags__Wtype_limits = yes; then :
    EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits"
  fi
  
- 
      saved_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -Wpointer-arith -Werror"
-   { $as_echo "$as_me:$LINENO: checking for broken string.h that generates warnings" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings" >&5
  $as_echo_n "checking for broken string.h that generates warnings... " >&6; }
- if test "${ac_cv_c_string_h_warnings+set}" = set; then
+ if test "${ac_cv_c_string_h_warnings+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <string.h>
  int
@@@ -17646,35 -11395,14 +11323,14 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_string_h_warnings=no
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_string_h_warnings=yes
+   ac_cv_c_string_h_warnings=yes
  fi
- 
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_string_h_warnings" >&5
  $as_echo "$ac_cv_c_string_h_warnings" >&6; }
    CFLAGS="$saved_CFLAGS"
    if test "$ac_cv_c_string_h_warnings" = "no"
@@@ -17684,16 -11412,12 +11340,12 @@@
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking whether external symbols need an underscore prefix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether external symbols need an underscore prefix" >&5
  $as_echo_n "checking whether external symbols need an underscore prefix... " >&6; }
- if test "${ac_cv_c_extern_prefix+set}" = set; then
+ if test "${ac_cv_c_extern_prefix+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  extern int ac_test;
  int
@@@ -17704,54 -11428,25 +11356,25 @@@ asm(".globl _ac_test\n_ac_test:\t.long 
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_extern_prefix="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_extern_prefix="no"
+   ac_cv_c_extern_prefix="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_extern_prefix" >&5
  $as_echo "$ac_cv_c_extern_prefix" >&6; }
  
  case $host_cpu in
    *i[3456789]86*)
-     { $as_echo "$as_me:$LINENO: checking whether external symbols need stdcall decoration" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether external symbols need stdcall decoration" >&5
  $as_echo_n "checking whether external symbols need stdcall decoration... " >&6; }
- if test "${ac_cv_c_stdcall_suffix+set}" = set; then
+ if test "${ac_cv_c_stdcall_suffix+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef _MSC_VER
  #define __stdcall __attribute__((__stdcall__))
@@@ -17765,87 -11460,48 +11388,48 @@@ asm("jmp _ac_test at 4"); if (ac_test(1)) 
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_stdcall_suffix="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_stdcall_suffix="no"
+   ac_cv_c_stdcall_suffix="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_stdcall_suffix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stdcall_suffix" >&5
  $as_echo "$ac_cv_c_stdcall_suffix" >&6; } ;;
    *) ac_cv_c_stdcall_suffix="no" ;;
  esac
  
  
- 
  if test "$ac_cv_c_extern_prefix" = "yes"
  then
-     cat >>confdefs.h <<\_ACEOF
- #define __ASM_NAME(name) "_" name
- _ACEOF
+     $as_echo "#define __ASM_NAME(name) \"_\" name" >>confdefs.h
  
      asm_name_prefix="_"
  else
-     cat >>confdefs.h <<\_ACEOF
- #define __ASM_NAME(name) name
- _ACEOF
+     $as_echo "#define __ASM_NAME(name) name" >>confdefs.h
  
      asm_name_prefix=""
  fi
  
  
- 
  if test "$ac_cv_c_stdcall_suffix" = "yes"
  then
-     cat >>confdefs.h <<\_ACEOF
- #define __ASM_STDCALL(args) "@" #args
- _ACEOF
+     $as_echo "#define __ASM_STDCALL(args) \"@\" #args" >>confdefs.h
  
  else
-     cat >>confdefs.h <<\_ACEOF
- #define __ASM_STDCALL(args) ""
- _ACEOF
+     $as_echo "#define __ASM_STDCALL(args) \"\"" >>confdefs.h
  
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to define a function in assembly code" >&5
  $as_echo_n "checking how to define a function in assembly code... " >&6; }
- if test "${ac_cv_asm_func_def+set}" = set; then
+ if test "${ac_cv_asm_func_def+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17856,37 -11512,10 +11440,10 @@@ asm("\t.globl _ac_test\n\t.def _ac_test
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_asm_func_def=".def"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17897,37 -11526,10 +11454,10 @@@ asm("\t.globl _ac_test\n\t.type _ac_tes
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_asm_func_def=".type @function"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -17938,91 -11540,49 +11468,49 @@@ asm("\t.globl _ac_test\n\t.type _ac_tes
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_asm_func_def=".type 2"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_asm_func_def="unknown"
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ rm -f core conftest.err conftest.$ac_objext \
+     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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_asm_func_def" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_asm_func_def" >&5
  $as_echo "$ac_cv_asm_func_def" >&6; }
  
  
- 
  case "$ac_cv_asm_func_def" in
    ".def")
-      cat >>confdefs.h <<\_ACEOF
- #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"
- _ACEOF
+      $as_echo "#define __ASM_FUNC(name) \".def \" __ASM_NAME(name) \"; .scl 2; .type 32; .endef\"" >>confdefs.h
  
       asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;;
    ".type @function")
-      cat >>confdefs.h <<\_ACEOF
- #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ", at function"
- _ACEOF
+      $as_echo "#define __ASM_FUNC(name) \".type \" __ASM_NAME(name) \", at function\"" >>confdefs.h
  
       asm_func_header=".type $asm_name_prefix\" #name suffix \", at function" ;;
    ".type 2")
-      cat >>confdefs.h <<\_ACEOF
- #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",2"
- _ACEOF
+      $as_echo "#define __ASM_FUNC(name) \".type \" __ASM_NAME(name) \",2\"" >>confdefs.h
  
       asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;;
    *)
-      cat >>confdefs.h <<\_ACEOF
- #define __ASM_FUNC(name) ""
- _ACEOF
+      $as_echo "#define __ASM_FUNC(name) \"\"" >>confdefs.h
  
       asm_func_header="" ;;
  esac
  
- { $as_echo "$as_me:$LINENO: checking whether asm() works outside of functions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether asm() works outside of functions" >&5
  $as_echo_n "checking whether asm() works outside of functions... " >&6; }
- if test "${ac_cv_c_asm_outside_funcs+set}" = set; then
+ if test "${ac_cv_c_asm_outside_funcs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  asm(".text\n\t.long 0");
  int
@@@ -18033,47 -11593,22 +11521,22 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_asm_outside_funcs="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_asm_outside_funcs="no"
+   ac_cv_c_asm_outside_funcs="no"
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_asm_outside_funcs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_asm_outside_funcs" >&5
  $as_echo "$ac_cv_c_asm_outside_funcs" >&6; }
  
- { $as_echo "$as_me:$LINENO: checking whether .previous is supported in assembly code" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether .previous is supported in assembly code" >&5
  $as_echo_n "checking whether .previous is supported in assembly code... " >&6; }
- if test "${ac_cv_c_dot_previous+set}" = set; then
+ if test "${ac_cv_c_dot_previous+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -18084,52 -11619,23 +11547,23 @@@ asm(".text\nac_test:\t.long 0\n\t.previ
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_c_dot_previous="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_dot_previous="no"
+   ac_cv_c_dot_previous="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_dot_previous" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dot_previous" >&5
  $as_echo "$ac_cv_c_dot_previous" >&6; }
  
- { $as_echo "$as_me:$LINENO: checking whether CFI directives are supported in assembly code" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CFI directives are supported in assembly code" >&5
  $as_echo_n "checking whether CFI directives are supported in assembly code... " >&6; }
- if test "${ac_cv_c_cfi_support+set}" = set; then
+ if test "${ac_cv_c_cfi_support+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");
  int
@@@ -18140,35 -11646,14 +11574,14 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_cfi_support="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_cfi_support="no"
+   ac_cv_c_cfi_support="no"
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_cfi_support" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_cfi_support" >&5
  $as_echo "$ac_cv_c_cfi_support" >&6; }
  
  asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t"
@@@ -18182,21 -11667,16 +11595,16 @@@ the
     asm_func_header="$asm_func_header.cfi_startproc\\n\\t"
     asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer"
  
- cat >>confdefs.h <<\_ACEOF
- #define __ASM_CFI(str) str
- _ACEOF
+ $as_echo "#define __ASM_CFI(str) str" >>confdefs.h
  
  else
-    cat >>confdefs.h <<\_ACEOF
- #define __ASM_CFI(str) ""
- _ACEOF
+    $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h
  
  fi
  
  asm_func_code="$asm_func_header\" code \"$asm_func_trailer"
  
  
- 
  if test "$ac_cv_c_asm_outside_funcs" = "yes"
  then
      cat >>confdefs.h <<_ACEOF
@@@ -18210,14 -11690,10 +11618,10 @@@ _ACEO
  
  fi
  
- cat >>confdefs.h <<\_ACEOF
- #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code)
- _ACEOF
+ $as_echo "#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,\"\",code)" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code)
- _ACEOF
+ $as_echo "#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code)" >>confdefs.h
  
  
  
@@@ -18243,6 -11719,10 +11647,10 @@@ case $host_os i
      ;;
  esac
  
+ MAIN_BINARY="wine"
+ 
+ test -z "$with_wine64" || MAIN_BINARY="wine32"
+ 
  case $host_cpu in
    *i[3456789]86*)
      case $host_os in
@@@ -18256,76 -11736,6 +11664,6 @@@ esa
  
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS $BUILTINFLAG"
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_func in \
  	_pclose \
  	_popen \
@@@ -18398,98 -11808,11 +11736,11 @@@
  	wait4 \
  	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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@@ -18501,18 -11824,14 +11752,14 @@@ CFLAGS="$ac_save_CFLAGS
  
  if test "$ac_cv_func_dlopen" = no
  then
-     { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -18530,46 -11849,19 +11777,19 @@@ return dlopen ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_dl_dlopen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dl_dlopen=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
-   cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLOPEN 1
- _ACEOF
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+   $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
   LIBDL="-ldl"
  
  fi
@@@ -18577,102 -11869,12 +11797,12 @@@
  fi
  ac_wine_check_funcs_save_LIBS="$LIBS"
  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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr"
+ if test "x$ac_cv_func_dladdr" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_DLADDR 1
  _ACEOF
  
  fi
@@@ -18682,18 -11884,14 +11812,14 @@@ 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 "$as_me:${as_lineno-$LINENO}: checking for poll in -lpoll" >&5
  $as_echo_n "checking for poll in -lpoll... " >&6; }
- if test "${ac_cv_lib_poll_poll+set}" = set; then
+ if test "${ac_cv_lib_poll_poll+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpoll  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -18711,63 -11909,32 +11837,32 @@@ return poll ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_poll_poll=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_poll_poll=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
-   cat >>confdefs.h <<\_ACEOF
- #define HAVE_POLL 1
- _ACEOF
+ if test "x$ac_cv_lib_poll_poll" = x""yes; then :
+   $as_echo "#define HAVE_POLL 1" >>confdefs.h
   LIBPOLL="-lpoll"
  
  fi
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
  $as_echo_n "checking for library containing gethostbyname... " >&6; }
- if test "${ac_cv_search_gethostbyname+set}" = set; then
+ if test "${ac_cv_search_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -18792,70 -11959,39 +11887,39 @@@ for ac_lib in '' nsl; d
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
-   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
+   if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_search_gethostbyname=$ac_res
- else
-   $as_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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_gethostbyname+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_gethostbyname+set}" = set; then
-   :
+ if test "${ac_cv_search_gethostbyname+set}" = set; then :
+ 
  else
    ac_cv_search_gethostbyname=no
  fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
  $as_echo "$ac_cv_search_gethostbyname" >&6; }
  ac_res=$ac_cv_search_gethostbyname
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for library containing connect" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5
  $as_echo_n "checking for library containing connect... " >&6; }
- if test "${ac_cv_search_connect+set}" = set; then
+ if test "${ac_cv_search_connect+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -18880,70 -12016,39 +11944,39 @@@ for ac_lib in '' socket; d
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
-   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
+   if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_search_connect=$ac_res
- else
-   $as_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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_connect+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_connect+set}" = set; then
-   :
+ if test "${ac_cv_search_connect+set}" = set; then :
+ 
  else
    ac_cv_search_connect=no
  fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5
  $as_echo "$ac_cv_search_connect" >&6; }
  ac_res=$ac_cv_search_connect
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
  $as_echo_n "checking for library containing inet_aton... " >&6; }
- if test "${ac_cv_search_inet_aton+set}" = set; then
+ if test "${ac_cv_search_inet_aton+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -18968,70 -12073,32 +12001,32 @@@ for ac_lib in '' resolv; d
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
-   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
+   if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_search_inet_aton=$ac_res
- else
-   $as_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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_inet_aton+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_inet_aton+set}" = set; then
-   :
+ if test "${ac_cv_search_inet_aton+set}" = set; then :
+ 
  else
    ac_cv_search_inet_aton=no
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
  $as_echo "$ac_cv_search_inet_aton" >&6; }
  ac_res=$ac_cv_search_inet_aton
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_func in \
  	getaddrinfo \
  	getnameinfo \
@@@ -19045,98 -12112,11 +12040,11 @@@
  	sendmsg \
  	socketpair \
  
- 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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@@ -19149,115 -12129,17 +12057,17 @@@ 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; }
- if test "${ac_cv_type_LDAPSortKey+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_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
+     ac_fn_c_check_type "$LINENO" "LDAPSortKey" "ac_cv_type_LDAPSortKey" "#include <ldap.h>
+ "
+ if test "x$ac_cv_type_LDAPSortKey" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap_r" >&5
  $as_echo_n "checking for ldap_initialize in -lldap_r... " >&6; }
- if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then
+ if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lldap_r $LIBPTHREAD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -19275,55 -12157,26 +12085,26 @@@ return ldap_initialize ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ldap_r_ldap_initialize=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_ldap_r_ldap_initialize=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_ldap_r_ldap_initialize" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_init in -llber" >&5
  $as_echo_n "checking for ber_init in -llber... " >&6; }
- if test "${ac_cv_lib_lber_ber_init+set}" = set; then
+ if test "${ac_cv_lib_lber_ber_init+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-llber $LIBPTHREAD $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
@@@ -19341,47 -12194,20 +12122,20 @@@ return ber_init ()
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_lber_ber_init=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_lber_ber_init=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     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 "$as_me:${as_lineno-$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
+ if test "x$ac_cv_lib_lber_ber_init" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LDAP 1
- _ACEOF
+ $as_echo "#define HAVE_LDAP 1" >>confdefs.h
  
                   LDAPLIBS="-lldap_r -llber"
  fi
@@@ -19392,14 -12218,6 +12146,6 @@@ f
  
      ac_wine_check_funcs_save_LIBS="$LIBS"
  LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_func in \
  	ldap_count_references \
  	ldap_first_reference \
@@@ -19409,98 -12227,11 +12155,11 @@@
  	ldap_parse_sortresponse_control \
  	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; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&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
- 
- 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 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
- 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
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
@@@ -19510,29 -12241,21 +12169,21 @@@ don
  
  LIBS="$ac_wine_check_funcs_save_LIBS"
  fi
- if test "x$LDAPLIBS" = "x"; then
+ if test "x$LDAPLIBS" = "x"; then :
    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.
- 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.
- This is an error since --with-ldap was requested." >&2;}
-    { (exit 1); exit 1; }; } ;;
+   *)   as_fn_error "libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.
+ This is an error since --with-ldap was requested." "$LINENO" 5 ;;
  esac
  fi
  
- 
- { $as_echo "$as_me:$LINENO: checking whether mkdir takes only one argument" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir takes only one argument" >&5
  $as_echo_n "checking whether mkdir takes only one argument... " >&6; }
- if test "${wine_cv_one_arg_mkdir+set}" = set; then
+ if test "${wine_cv_one_arg_mkdir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <sys/stat.h>
  int
@@@ -19543,56 -12266,29 +12194,29 @@@ mkdir("foo")
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    wine_cv_one_arg_mkdir=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	wine_cv_one_arg_mkdir=no
+   wine_cv_one_arg_mkdir=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $wine_cv_one_arg_mkdir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_one_arg_mkdir" >&5
  $as_echo "$wine_cv_one_arg_mkdir" >&6; }
  if test "$wine_cv_one_arg_mkdir" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ONE_ARG_MKDIR 1
- _ACEOF
+ $as_echo "#define HAVE_ONE_ARG_MKDIR 1" >>confdefs.h
  
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
  $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
- if test "${ac_cv_c_const+set}" = set; then
+ if test "${ac_cv_c_const+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
@@@ -19652,56 -12348,29 +12276,29 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_const=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_const=no
+   ac_cv_c_const=no
  fi
- 
  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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
  $as_echo "$ac_cv_c_const" >&6; }
  if test $ac_cv_c_const = no; then
  
- cat >>confdefs.h <<\_ACEOF
- #define const /**/
- _ACEOF
+ $as_echo "#define const /**/" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for inline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
  $as_echo_n "checking for inline... " >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
+ if test "${ac_cv_c_inline+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
@@@ -19710,41 -12379,17 +12307,17 @@@ $ac_kw foo_t foo () {return 0; 
  #endif
  
  _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
+ if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_c_inline=$ac_kw
- 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
    test "$ac_cv_c_inline" != no && break
  done
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
  $as_echo "$ac_cv_c_inline" >&6; }
  
- 
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
@@@ -19760,101 -12405,8 +12333,8 @@@ _ACEO
      ;;
  esac
  
- { $as_echo "$as_me:$LINENO: checking for mode_t" >&5
- $as_echo_n "checking for mode_t... " >&6; }
- if test "${ac_cv_type_mode_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_mode_t" >&5
- $as_echo "$ac_cv_type_mode_t" >&6; }
- if test "x$ac_cv_type_mode_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+ if test "x$ac_cv_type_mode_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_MODE_T 1
@@@ -19862,101 -12414,8 +12342,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for off_t" >&5
- $as_echo_n "checking for off_t... " >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_off_t" >&5
- $as_echo "$ac_cv_type_off_t" >&6; }
- if test "x$ac_cv_type_off_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+ if test "x$ac_cv_type_off_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_OFF_T 1
@@@ -19964,101 -12423,8 +12351,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for pid_t" >&5
- $as_echo_n "checking for pid_t... " >&6; }
- if test "${ac_cv_type_pid_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- else
-   $as_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
- 
- 
- 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
+ ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+ if test "x$ac_cv_type_pid_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_PID_T 1
@@@ -20066,101 -12432,8 +12360,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for size_t" >&5
- $as_echo_n "checking for size_t... " >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_size_t" >&5
- $as_echo "$ac_cv_type_size_t" >&6; }
- if test "x$ac_cv_type_size_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+ if test "x$ac_cv_type_size_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIZE_T 1
@@@ -20168,101 -12441,8 +12369,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
- $as_echo_n "checking for ssize_t... " >&6; }
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_ssize_t" >&5
- $as_echo "$ac_cv_type_ssize_t" >&6; }
- if test "x$ac_cv_type_ssize_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+ if test "x$ac_cv_type_ssize_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SSIZE_T 1
@@@ -20270,101 -12450,8 +12378,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for long long" >&5
- $as_echo_n "checking for long long... " >&6; }
- if test "${ac_cv_type_long_long+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_long_long" >&5
- $as_echo "$ac_cv_type_long_long" >&6; }
- if test "x$ac_cv_type_long_long" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
+ if test "x$ac_cv_type_long_long" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_LONG_LONG 1
@@@ -20372,101 -12459,8 +12387,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for fsblkcnt_t" >&5
- $as_echo_n "checking for fsblkcnt_t... " >&6; }
- if test "${ac_cv_type_fsblkcnt_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_fsblkcnt_t" >&5
- $as_echo "$ac_cv_type_fsblkcnt_t" >&6; }
- if test "x$ac_cv_type_fsblkcnt_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "fsblkcnt_t" "ac_cv_type_fsblkcnt_t" "$ac_includes_default"
+ if test "x$ac_cv_type_fsblkcnt_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FSBLKCNT_T 1
@@@ -20474,101 -12468,8 +12396,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for fsfilcnt_t" >&5
- $as_echo_n "checking for fsfilcnt_t... " >&6; }
- if test "${ac_cv_type_fsfilcnt_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_fsfilcnt_t" >&5
- $as_echo "$ac_cv_type_fsfilcnt_t" >&6; }
- if test "x$ac_cv_type_fsfilcnt_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "fsfilcnt_t" "ac_cv_type_fsfilcnt_t" "$ac_includes_default"
+ if test "x$ac_cv_type_fsfilcnt_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_FSFILCNT_T 1
@@@ -20577,105 -12478,10 +12406,10 @@@ _ACEO
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for sigset_t" >&5
- $as_echo_n "checking for sigset_t... " >&6; }
- if test "${ac_cv_type_sigset_t+set}" = set; then
-   $as_echo_n "(cached) " >&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
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
+ ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#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
-   :
- 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
- 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_sigset_t" >&5
- $as_echo "$ac_cv_type_sigset_t" >&6; }
- if test "x$ac_cv_type_sigset_t" = x""yes; then
+ "
+ if test "x$ac_cv_type_sigset_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGSET_T 1
@@@ -20684,103 -12490,9 +12418,9 @@@ _ACEO
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for request_sense" >&5
- $as_echo_n "checking for request_sense... " >&6; }
- if test "${ac_cv_type_request_sense+set}" = set; then
-   $as_echo_n "(cached) " >&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
- 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
-   :
- 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
- 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_request_sense" >&5
- $as_echo "$ac_cv_type_request_sense" >&6; }
- if test "x$ac_cv_type_request_sense" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "request_sense" "ac_cv_type_request_sense" "#include <linux/cdrom.h>
+ "
+ if test "x$ac_cv_type_request_sense" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_REQUEST_SENSE 1
@@@ -20790,75 -12502,7 +12430,7 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct xinpgen" >&5
- $as_echo_n "checking for struct xinpgen... " >&6; }
- if test "${ac_cv_type_struct_xinpgen+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_type_struct_xinpgen=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>
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #ifdef HAVE_SYS_SOCKETVAR_H
- #include <sys/socketvar.h>
- #endif
- #ifdef HAVE_NET_ROUTE_H
- #include <net/route.h>
- #endif
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #ifdef HAVE_NETINET_IN_SYSTM_H
- #include <netinet/in_systm.h>
- #endif
- #ifdef HAVE_NETINET_IP_H
- #include <netinet/ip.h>
- #endif
- #ifdef HAVE_NETINET_IN_PCB_H
- #include <netinet/in_pcb.h>
- #endif
- 
- int
- main ()
- {
- if (sizeof (struct xinpgen))
-        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
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
+ ac_fn_c_check_type "$LINENO" "struct xinpgen" "ac_cv_type_struct_xinpgen" "#include <sys/types.h>
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
@@@ -20880,55 -12524,8 +12452,8 @@@
  #ifdef HAVE_NETINET_IN_PCB_H
  #include <netinet/in_pcb.h>
  #endif
- 
- int
- main ()
- {
- if (sizeof ((struct xinpgen)))
- 	  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
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_type_struct_xinpgen=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
- 
- 
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_xinpgen" >&5
- $as_echo "$ac_cv_type_struct_xinpgen" >&6; }
- if test "x$ac_cv_type_struct_xinpgen" = x""yes; then
+ "
+ if test "x$ac_cv_type_struct_xinpgen" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_XINPGEN 1
@@@ -20938,108 -12535,11 +12463,11 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct ff_effect.direction" >&5
- $as_echo_n "checking for struct ff_effect.direction... " >&6; }
- if test "${ac_cv_member_struct_ff_effect_direction+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_LINUX_INPUT_H
- #include <linux/input.h>
- #endif
- 
- int
- main ()
- {
- static struct ff_effect ac_aggr;
- if (ac_aggr.direction)
- 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
-   ac_cv_member_struct_ff_effect_direction=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_LINUX_INPUT_H
+ ac_fn_c_check_member "$LINENO" "struct ff_effect" "direction" "ac_cv_member_struct_ff_effect_direction" "#ifdef HAVE_LINUX_INPUT_H
  #include <linux/input.h>
  #endif
- 
- int
- main ()
- {
- static struct ff_effect ac_aggr;
- if (sizeof ac_aggr.direction)
- 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
-   ac_cv_member_struct_ff_effect_direction=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_ff_effect_direction=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_ff_effect_direction" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_FF_EFFECT_DIRECTION 1
@@@ -21049,16 -12549,12 +12477,12 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for sigaddset" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5
  $as_echo_n "checking for sigaddset... " >&6; }
- if test "${wine_cv_have_sigaddset+set}" = set; then
+ if test "${wine_cv_have_sigaddset+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <signal.h>
  int
@@@ -21069,61 -12565,30 +12493,30 @@@ sigset_t set; sigaddset(&set,SIGTERM)
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    wine_cv_have_sigaddset=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	wine_cv_have_sigaddset=no
+   wine_cv_have_sigaddset=no
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $wine_cv_have_sigaddset" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sigaddset" >&5
  $as_echo "$wine_cv_have_sigaddset" >&6; }
  if test "$wine_cv_have_sigaddset" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SIGADDSET 1
- _ACEOF
+ $as_echo "#define HAVE_SIGADDSET 1" >>confdefs.h
  
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking whether we can use re-entrant gethostbyname_r Linux style" >&5
+ { $as_echo "$as_me:${as_lineno-$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; }
- if test "${wine_cv_linux_gethostbyname_r_6+set}" = set; then
+ if test "${wine_cv_linux_gethostbyname_r_6+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <netdb.h>
  int
@@@ -21146,64 -12611,33 +12539,33 @@@ 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
+ if ac_fn_c_try_link "$LINENO"; then :
    wine_cv_linux_gethostbyname_r_6=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	wine_cv_linux_gethostbyname_r_6=no
+   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
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  
  fi
- { $as_echo "$as_me:$LINENO: result: $wine_cv_linux_gethostbyname_r_6" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_linux_gethostbyname_r_6" >&5
  $as_echo "$wine_cv_linux_gethostbyname_r_6" >&6; }
     if test "$wine_cv_linux_gethostbyname_r_6" = "yes"
     then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LINUX_GETHOSTBYNAME_R_6 1
- _ACEOF
+ $as_echo "#define HAVE_LINUX_GETHOSTBYNAME_R_6 1" >>confdefs.h
  
     fi
  
  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 "$as_me:${as_lineno-$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; }
- if test "${wine_cv_linux_joystick_22_api+set}" = set; then
+ if test "${wine_cv_linux_joystick_22_api+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  	#include <sys/ioctl.h>
@@@ -21223,60 -12657,26 +12585,26 @@@ main (
    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
+ if ac_fn_c_try_compile "$LINENO"; then :
    wine_cv_linux_joystick_22_api=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	wine_cv_linux_joystick_22_api=no
+   wine_cv_linux_joystick_22_api=no
  fi
  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 "$as_me:${as_lineno-$LINENO}: result: $wine_cv_linux_joystick_22_api" >&5
  $as_echo "$wine_cv_linux_joystick_22_api" >&6; }
     if test "$wine_cv_linux_joystick_22_api" = "yes"
     then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LINUX_22_JOYSTICK_API 1
- _ACEOF
+ $as_echo "#define HAVE_LINUX_22_JOYSTICK_API 1" >>confdefs.h
  
     fi
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_bfree" >&5
- $as_echo_n "checking for struct statfs.f_bfree... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_bfree+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_bfree" "ac_cv_member_struct_statfs_f_bfree" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21289,104 -12689,8 +12617,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_bfree)
- 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
-   ac_cv_member_struct_statfs_f_bfree=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_bfree)
- 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
-   ac_cv_member_struct_statfs_f_bfree=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_bfree=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_bfree" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_BFREE 1
@@@ -21394,71 -12698,7 +12626,7 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_bavail" >&5
- $as_echo_n "checking for struct statfs.f_bavail... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_bavail+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_bavail)
- 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
-   ac_cv_member_struct_statfs_f_bavail=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_bavail" "ac_cv_member_struct_statfs_f_bavail" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21471,51 -12711,8 +12639,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_bavail)
- 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
-   ac_cv_member_struct_statfs_f_bavail=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_bavail=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_bavail" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_BAVAIL 1
@@@ -21523,18 -12720,7 +12648,7 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_frsize" >&5
- $as_echo_n "checking for struct statfs.f_frsize... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_frsize+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_frsize" "ac_cv_member_struct_statfs_f_frsize" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21547,104 -12733,8 +12661,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_frsize)
- 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
-   ac_cv_member_struct_statfs_f_frsize=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_frsize)
- 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
-   ac_cv_member_struct_statfs_f_frsize=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_frsize=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_frsize" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FRSIZE 1
@@@ -21652,71 -12742,7 +12670,7 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_ffree" >&5
- $as_echo_n "checking for struct statfs.f_ffree... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_ffree+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_ffree)
- 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
-   ac_cv_member_struct_statfs_f_ffree=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_ffree" "ac_cv_member_struct_statfs_f_ffree" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21729,51 -12755,8 +12683,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_ffree)
- 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
-   ac_cv_member_struct_statfs_f_ffree=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_ffree=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_ffree" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FFREE 1
@@@ -21781,18 -12764,7 +12692,7 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_favail" >&5
- $as_echo_n "checking for struct statfs.f_favail... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_favail+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_favail" "ac_cv_member_struct_statfs_f_favail" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21805,104 -12777,8 +12705,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_favail)
- 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
-   ac_cv_member_struct_statfs_f_favail=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_favail)
- 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
-   ac_cv_member_struct_statfs_f_favail=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_favail=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_favail" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_FAVAIL 1
@@@ -21910,18 -12786,7 +12714,7 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct statfs.f_namelen" >&5
- $as_echo_n "checking for struct statfs.f_namelen... " >&6; }
- if test "${ac_cv_member_struct_statfs_f_namelen+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct statfs" "f_namelen" "ac_cv_member_struct_statfs_f_namelen" "#include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
  # include <sys/param.h>
  #endif
@@@ -21934,104 -12799,8 +12727,8 @@@
  #ifdef HAVE_SYS_STATFS_H
  # include <sys/statfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (ac_aggr.f_namelen)
- 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
-   ac_cv_member_struct_statfs_f_namelen=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- # include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- # include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statfs ac_aggr;
- if (sizeof ac_aggr.f_namelen)
- 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
-   ac_cv_member_struct_statfs_f_namelen=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statfs_f_namelen=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statfs_f_namelen" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATFS_F_NAMELEN 1
@@@ -22041,108 -12810,11 +12738,11 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct statvfs.f_blocks" >&5
- $as_echo_n "checking for struct statvfs.f_blocks... " >&6; }
- if test "${ac_cv_member_struct_statvfs_f_blocks+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #endif
- 
- int
- main ()
- {
- static struct statvfs ac_aggr;
- if (ac_aggr.f_blocks)
- 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
-   ac_cv_member_struct_statvfs_f_blocks=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_STATVFS_H
+ ac_fn_c_check_member "$LINENO" "struct statvfs" "f_blocks" "ac_cv_member_struct_statvfs_f_blocks" "#ifdef HAVE_SYS_STATVFS_H
  #include <sys/statvfs.h>
  #endif
- 
- int
- main ()
- {
- static struct statvfs ac_aggr;
- if (sizeof ac_aggr.f_blocks)
- 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
-   ac_cv_member_struct_statvfs_f_blocks=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_statvfs_f_blocks=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_statvfs_f_blocks" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATVFS_F_BLOCKS 1
@@@ -22152,116 -12824,15 +12752,15 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct msghdr.msg_accrights" >&5
- $as_echo_n "checking for struct msghdr.msg_accrights... " >&6; }
- if test "${ac_cv_member_struct_msghdr_msg_accrights+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#include <sys/types.h>
  #ifdef HAVE_SYS_SOCKET_H
  # include <sys/socket.h>
  #endif
  #ifdef HAVE_SYS_UN_H
  # include <sys/un.h>
  #endif
- 
- int
- main ()
- {
- static struct msghdr ac_aggr;
- if (ac_aggr.msg_accrights)
- 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
-   ac_cv_member_struct_msghdr_msg_accrights=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #endif
- #ifdef HAVE_SYS_UN_H
- # include <sys/un.h>
- #endif
- 
- int
- main ()
- {
- static struct msghdr ac_aggr;
- if (sizeof ac_aggr.msg_accrights)
- 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
-   ac_cv_member_struct_msghdr_msg_accrights=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_msghdr_msg_accrights=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1
@@@ -22269,116 -12840,15 +12768,15 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
- $as_echo_n "checking for struct sockaddr.sa_len... " >&6; }
- if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
- #ifdef HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #endif
- #ifdef HAVE_SYS_UN_H
- # include <sys/un.h>
- #endif
- 
- int
- main ()
- {
- static struct sockaddr ac_aggr;
- if (ac_aggr.sa_len)
- 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
-   ac_cv_member_struct_sockaddr_sa_len=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
+ ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
  #ifdef HAVE_SYS_SOCKET_H
  # include <sys/socket.h>
  #endif
  #ifdef HAVE_SYS_UN_H
  # include <sys/un.h>
  #endif
- 
- int
- main ()
- {
- static struct sockaddr ac_aggr;
- if (sizeof ac_aggr.sa_len)
- 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
-   ac_cv_member_struct_sockaddr_sa_len=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_sockaddr_sa_len=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
@@@ -22386,116 -12856,15 +12784,15 @@@ _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; }
- if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h>
  #ifdef HAVE_SYS_SOCKET_H
  # include <sys/socket.h>
  #endif
  #ifdef HAVE_SYS_UN_H
  # include <sys/un.h>
  #endif
- 
- int
- main ()
- {
- static struct sockaddr_un ac_aggr;
- if (ac_aggr.sun_len)
- 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
-   ac_cv_member_struct_sockaddr_un_sun_len=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #endif
- #ifdef HAVE_SYS_UN_H
- # include <sys/un.h>
- #endif
- 
- int
- main ()
- {
- static struct sockaddr_un ac_aggr;
- if (sizeof ac_aggr.sun_len)
- 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
-   ac_cv_member_struct_sockaddr_un_sun_len=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_sockaddr_un_sun_len=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
@@@ -22505,110 -12874,12 +12802,12 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for scsireq_t.cmd" >&5
- $as_echo_n "checking for scsireq_t.cmd... " >&6; }
- if test "${ac_cv_member_scsireq_t_cmd+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
- #ifdef HAVE_SCSI_SG_H
- #include <scsi/sg.h>
- #endif
- 
- int
- main ()
- {
- static scsireq_t ac_aggr;
- if (ac_aggr.cmd)
- 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
-   ac_cv_member_scsireq_t_cmd=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
+ ac_fn_c_check_member "$LINENO" "scsireq_t" "cmd" "ac_cv_member_scsireq_t_cmd" "#include <sys/types.h>
  #ifdef HAVE_SCSI_SG_H
  #include <scsi/sg.h>
  #endif
- 
- int
- main ()
- {
- static scsireq_t ac_aggr;
- if (sizeof ac_aggr.cmd)
- 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
-   ac_cv_member_scsireq_t_cmd=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_scsireq_t_cmd=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_scsireq_t_cmd" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SCSIREQ_T_CMD 1
@@@ -22616,110 -12887,12 +12815,12 @@@ _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; }
- if test "${ac_cv_member_sg_io_hdr_t_interface_id+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "sg_io_hdr_t" "interface_id" "ac_cv_member_sg_io_hdr_t_interface_id" "#include <sys/types.h>
  #ifdef HAVE_SCSI_SG_H
  #include <scsi/sg.h>
  #endif
- 
- int
- main ()
- {
- static sg_io_hdr_t ac_aggr;
- if (ac_aggr.interface_id)
- 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
-   ac_cv_member_sg_io_hdr_t_interface_id=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SCSI_SG_H
- #include <scsi/sg.h>
- #endif
- 
- int
- main ()
- {
- static sg_io_hdr_t ac_aggr;
- if (sizeof ac_aggr.interface_id)
- 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
-   ac_cv_member_sg_io_hdr_t_interface_id=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_sg_io_hdr_t_interface_id=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_sg_io_hdr_t_interface_id" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SG_IO_HDR_T_INTERFACE_ID 1
@@@ -22729,104 -12902,9 +12830,9 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for siginfo_t.si_fd" >&5
- $as_echo_n "checking for siginfo_t.si_fd... " >&6; }
- if test "${ac_cv_member_siginfo_t_si_fd+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <signal.h>
- 
- int
- main ()
- {
- static siginfo_t ac_aggr;
- if (ac_aggr.si_fd)
- 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
-   ac_cv_member_siginfo_t_si_fd=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <signal.h>
- 
- int
- main ()
- {
- static siginfo_t ac_aggr;
- if (sizeof ac_aggr.si_fd)
- 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
-   ac_cv_member_siginfo_t_si_fd=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_siginfo_t_si_fd=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ ac_fn_c_check_member "$LINENO" "siginfo_t" "si_fd" "ac_cv_member_siginfo_t_si_fd" "#include <signal.h>
+ "
+ if test "x$ac_cv_member_siginfo_t_si_fd" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGINFO_T_SI_FD 1
@@@ -22836,110 -12914,12 +12842,12 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct mtget.mt_blksiz" >&5
- $as_echo_n "checking for struct mtget.mt_blksiz... " >&6; }
- if test "${ac_cv_member_struct_mtget_mt_blksiz+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct mtget" "mt_blksiz" "ac_cv_member_struct_mtget_mt_blksiz" "#include <sys/types.h>
  #ifdef HAVE_SYS_MTIO_H
  #include <sys/mtio.h>
  #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (ac_aggr.mt_blksiz)
- 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
-   ac_cv_member_struct_mtget_mt_blksiz=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_MTIO_H
- #include <sys/mtio.h>
- #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (sizeof ac_aggr.mt_blksiz)
- 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
-   ac_cv_member_struct_mtget_mt_blksiz=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_mtget_mt_blksiz=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_mtget_mt_blksiz" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_BLKSIZ 1
@@@ -22947,110 -12927,12 +12855,12 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct mtget.mt_gstat" >&5
- $as_echo_n "checking for struct mtget.mt_gstat... " >&6; }
- if test "${ac_cv_member_struct_mtget_mt_gstat+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
- #ifdef HAVE_SYS_MTIO_H
- #include <sys/mtio.h>
- #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (ac_aggr.mt_gstat)
- 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
-   ac_cv_member_struct_mtget_mt_gstat=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
+ ac_fn_c_check_member "$LINENO" "struct mtget" "mt_gstat" "ac_cv_member_struct_mtget_mt_gstat" "#include <sys/types.h>
  #ifdef HAVE_SYS_MTIO_H
  #include <sys/mtio.h>
  #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (sizeof ac_aggr.mt_gstat)
- 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
-   ac_cv_member_struct_mtget_mt_gstat=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_mtget_mt_gstat=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_mtget_mt_gstat" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_GSTAT 1
@@@ -23058,110 -12940,12 +12868,12 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct mtget.mt_blkno" >&5
- $as_echo_n "checking for struct mtget.mt_blkno... " >&6; }
- if test "${ac_cv_member_struct_mtget_mt_blkno+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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>
+ ac_fn_c_check_member "$LINENO" "struct mtget" "mt_blkno" "ac_cv_member_struct_mtget_mt_blkno" "#include <sys/types.h>
  #ifdef HAVE_SYS_MTIO_H
  #include <sys/mtio.h>
  #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (ac_aggr.mt_blkno)
- 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
-   ac_cv_member_struct_mtget_mt_blkno=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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>
- #ifdef HAVE_SYS_MTIO_H
- #include <sys/mtio.h>
- #endif
- 
- int
- main ()
- {
- static struct mtget ac_aggr;
- if (sizeof ac_aggr.mt_blkno)
- 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
-   ac_cv_member_struct_mtget_mt_blkno=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_mtget_mt_blkno=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_mtget_mt_blkno" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_MTGET_MT_BLKNO 1
@@@ -23171,108 -12955,11 +12883,11 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct option.name" >&5
- $as_echo_n "checking for struct option.name... " >&6; }
- if test "${ac_cv_member_struct_option_name+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
- 
- int
- main ()
- {
- static struct option ac_aggr;
- if (ac_aggr.name)
- 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
-   ac_cv_member_struct_option_name=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_GETOPT_H
+ ac_fn_c_check_member "$LINENO" "struct option" "name" "ac_cv_member_struct_option_name" "#ifdef HAVE_GETOPT_H
  #include <getopt.h>
  #endif
- 
- int
- main ()
- {
- static struct option ac_aggr;
- if (sizeof ac_aggr.name)
- 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
-   ac_cv_member_struct_option_name=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_option_name=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_option_name" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_OPTION_NAME 1
@@@ -23282,102 -12969,8 +12897,8 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
- $as_echo_n "checking for struct stat.st_blocks... " >&6; }
- if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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 ()
- {
- static struct stat ac_aggr;
- if (ac_aggr.st_blocks)
- 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
-   ac_cv_member_struct_stat_st_blocks=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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 ()
- {
- static struct stat ac_aggr;
- if (sizeof ac_aggr.st_blocks)
- 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
-   ac_cv_member_struct_stat_st_blocks=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_stat_st_blocks=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
+ if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
@@@ -23385,102 -12978,8 +12906,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
- $as_echo_n "checking for struct stat.st_mtim... " >&6; }
- if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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 ()
- {
- static struct stat ac_aggr;
- if (ac_aggr.st_mtim)
- 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
-   ac_cv_member_struct_stat_st_mtim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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 ()
- {
- static struct stat ac_aggr;
- if (sizeof ac_aggr.st_mtim)
- 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
-   ac_cv_member_struct_stat_st_mtim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_stat_st_mtim=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
+ if test "x$ac_cv_member_struct_stat_st_mtim" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_MTIM 1
@@@ -23488,102 -12987,8 +12915,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct stat.st_ctim" >&5
- $as_echo_n "checking for struct stat.st_ctim... " >&6; }
- if test "${ac_cv_member_struct_stat_st_ctim+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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 ()
- {
- static struct stat ac_aggr;
- if (ac_aggr.st_ctim)
- 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
-   ac_cv_member_struct_stat_st_ctim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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 ()
- {
- static struct stat ac_aggr;
- if (sizeof ac_aggr.st_ctim)
- 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
-   ac_cv_member_struct_stat_st_ctim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_stat_st_ctim=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim" "ac_cv_member_struct_stat_st_ctim" "$ac_includes_default"
+ if test "x$ac_cv_member_struct_stat_st_ctim" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_CTIM 1
@@@ -23591,102 -12996,8 +12924,8 @@@ _ACEO
  
  
  fi
- { $as_echo "$as_me:$LINENO: checking for struct stat.st_atim" >&5
- $as_echo_n "checking for struct stat.st_atim... " >&6; }
- if test "${ac_cv_member_struct_stat_st_atim+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   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 ()
- {
- static struct stat ac_aggr;
- if (ac_aggr.st_atim)
- 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
-   ac_cv_member_struct_stat_st_atim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	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 ()
- {
- static struct stat ac_aggr;
- if (sizeof ac_aggr.st_atim)
- 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
-   ac_cv_member_struct_stat_st_atim=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_stat_st_atim=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_atim" "ac_cv_member_struct_stat_st_atim" "$ac_includes_default"
+ if test "x$ac_cv_member_struct_stat_st_atim" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_ATIM 1
@@@ -23696,114 -13007,14 +12935,14 @@@ _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; }
- if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- 
- int
- main ()
- {
- static struct sockaddr_in6 ac_aggr;
- if (ac_aggr.sin6_scope_id)
- 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
-   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
+ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
- 
- int
- main ()
- {
- static struct sockaddr_in6 ac_aggr;
- if (sizeof ac_aggr.sin6_scope_id)
- 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
-   ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
@@@ -23813,18 -13024,7 +12952,7 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for ns_msg._msg_ptr" >&5
- $as_echo_n "checking for ns_msg._msg_ptr... " >&6; }
- if test "${ac_cv_member_ns_msg__msg_ptr+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
+ ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #ifdef HAVE_NETINET_IN_H
@@@ -23833,100 -13033,8 +12961,8 @@@
  #ifdef HAVE_ARPA_NAMESER_H
  # include <arpa/nameser.h>
  #endif
- 
- int
- main ()
- {
- static ns_msg ac_aggr;
- if (ac_aggr._msg_ptr)
- 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
-   ac_cv_member_ns_msg__msg_ptr=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
- #endif
- #ifdef HAVE_ARPA_NAMESER_H
- # include <arpa/nameser.h>
- #endif
- 
- int
- main ()
- {
- static ns_msg ac_aggr;
- if (sizeof ac_aggr._msg_ptr)
- 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
-   ac_cv_member_ns_msg__msg_ptr=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_ns_msg__msg_ptr=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 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
+ "
+ if test "x$ac_cv_member_ns_msg__msg_ptr" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_NS_MSG__MSG_PTR 1
@@@ -23936,91 -13044,7 +12972,7 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for struct icmpstat.icps_outhist" >&5
- $as_echo_n "checking for struct icmpstat.icps_outhist... " >&6; }
- if test "${ac_cv_member_struct_icmpstat_icps_outhist+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #ifdef HAVE_ALIAS_H
- #include <alias.h>
- #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #ifdef HAVE_SYS_SOCKETVAR_H
- #include <sys/socketvar.h>
- #endif
- #ifdef HAVE_SYS_TIMEOUT_H
- #include <sys/timeout.h>
- #endif
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #ifdef HAVE_NETINET_IN_SYSTM_H
- #include <netinet/in_systm.h>
- #endif
- #ifdef HAVE_NETINET_IP_H
- #include <netinet/ip.h>
- #endif
- #ifdef HAVE_NETINET_IP_VAR_H
- #include <netinet/ip_var.h>
- #endif
- #ifdef HAVE_NETINET_IP_ICMP_H
- #include <netinet/ip_icmp.h>
- #endif
- #ifdef HAVE_NETINET_ICMP_VAR
- #include <netinet/icmp_var.h>
- #endif
- 
- int
- main ()
- {
- static struct icmpstat ac_aggr;
- if (ac_aggr.icps_outhist)
- 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
-   ac_cv_member_struct_icmpstat_icps_outhist=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_TYPES_H
+ ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_outhist" "ac_cv_member_struct_icmpstat_icps_outhist" "#ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #ifdef HAVE_ALIAS_H
@@@ -24053,51 -13077,8 +13005,8 @@@
  #ifdef HAVE_NETINET_ICMP_VAR
  #include <netinet/icmp_var.h>
  #endif
- 
- int
- main ()
- {
- static struct icmpstat ac_aggr;
- if (sizeof ac_aggr.icps_outhist)
- 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
-   ac_cv_member_struct_icmpstat_icps_outhist=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_icmpstat_icps_outhist=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_icmpstat_icps_outhist" >&5
- $as_echo "$ac_cv_member_struct_icmpstat_icps_outhist" >&6; }
- if test "x$ac_cv_member_struct_icmpstat_icps_outhist" = x""yes; then
+ "
+ if test "x$ac_cv_member_struct_icmpstat_icps_outhist" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST 1
@@@ -24107,16 -13088,12 +13016,12 @@@ _ACEO
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for timezone variable" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5
  $as_echo_n "checking for timezone variable... " >&6; }
- if test "${ac_cv_have_timezone+set}" = set; then
+ if test "${ac_cv_have_timezone+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <time.h>
  int
@@@ -24127,59 -13104,28 +13032,28 @@@ timezone = 
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_have_timezone="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_timezone="no"
+   ac_cv_have_timezone="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_timezone" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_timezone" >&5
  $as_echo "$ac_cv_have_timezone" >&6; }
  if test "$ac_cv_have_timezone" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_TIMEZONE 1
- _ACEOF
+ $as_echo "#define HAVE_TIMEZONE 1" >>confdefs.h
  
  fi
- { $as_echo "$as_me:$LINENO: checking for daylight variable" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daylight variable" >&5
  $as_echo_n "checking for daylight variable... " >&6; }
- if test "${ac_cv_have_daylight+set}" = set; then
+ if test "${ac_cv_have_daylight+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <time.h>
  int
@@@ -24190,60 -13136,29 +13064,29 @@@ daylight = 
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_have_daylight="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_daylight="no"
+   ac_cv_have_daylight="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_daylight" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_daylight" >&5
  $as_echo "$ac_cv_have_daylight" >&6; }
  if test "$ac_cv_have_daylight" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DAYLIGHT 1
- _ACEOF
+ $as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for isinf" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf" >&5
  $as_echo_n "checking for isinf... " >&6; }
- if test "${ac_cv_have_isinf+set}" = set; then
+ if test "${ac_cv_have_isinf+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <math.h>
  int
@@@ -24254,60 -13169,29 +13097,29 @@@ float f = 0.0; int i=isinf(f
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_have_isinf="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_isinf="no"
+   ac_cv_have_isinf="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_isinf" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_isinf" >&5
  $as_echo "$ac_cv_have_isinf" >&6; }
  if test "$ac_cv_have_isinf" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ISINF 1
- _ACEOF
+ $as_echo "#define HAVE_ISINF 1" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for isnan" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan" >&5
  $as_echo_n "checking for isnan... " >&6; }
- if test "${ac_cv_have_isnan+set}" = set; then
+ if test "${ac_cv_have_isnan+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <math.h>
  int
@@@ -24318,69 -13202,38 +13130,38 @@@ float f = 0.0; int i=isnan(f
    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
+ if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_have_isnan="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_isnan="no"
+   ac_cv_have_isnan="no"
  fi
- 
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_isnan" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_isnan" >&5
  $as_echo "$ac_cv_have_isnan" >&6; }
  if test "$ac_cv_have_isnan" = "yes"
  then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ISNAN 1
- _ACEOF
+ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h
  
  fi
  
  
  case $host_cpu in
-   *i[3456789]86*) { $as_echo "$as_me:$LINENO: checking whether we need to define __i386__" >&5
+   *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5
  $as_echo_n "checking whether we need to define __i386__... " >&6; }
- if test "${ac_cv_cpp_def___i386__+set}" = set; then
+ if test "${ac_cv_cpp_def___i386__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __i386__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___i386__=yes
  else
    ac_cv_cpp_def___i386__=no
@@@ -24388,30 -13241,25 +13169,25 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___i386__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___i386__" >&5
  $as_echo "$ac_cv_cpp_def___i386__" >&6; }
- if test $ac_cv_cpp_def___i386__ = yes; then
+ 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
+ fi ;;
+   *x86_64*)         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __x86_64__" >&5
  $as_echo_n "checking whether we need to define __x86_64__... " >&6; }
- if test "${ac_cv_cpp_def___x86_64__+set}" = set; then
+ if test "${ac_cv_cpp_def___x86_64__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __x86_64__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___x86_64__=yes
  else
    ac_cv_cpp_def___x86_64__=no
@@@ -24419,30 -13267,25 +13195,25 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___x86_64__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___x86_64__" >&5
  $as_echo "$ac_cv_cpp_def___x86_64__" >&6; }
- if test $ac_cv_cpp_def___x86_64__ = yes; then
+ 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
+ fi ;;
+   *alpha*)          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __ALPHA__" >&5
  $as_echo_n "checking whether we need to define __ALPHA__... " >&6; }
- if test "${ac_cv_cpp_def___ALPHA__+set}" = set; then
+ if test "${ac_cv_cpp_def___ALPHA__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __ALPHA__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___ALPHA__=yes
  else
    ac_cv_cpp_def___ALPHA__=no
@@@ -24450,30 -13293,25 +13221,25 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___ALPHA__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___ALPHA__" >&5
  $as_echo "$ac_cv_cpp_def___ALPHA__" >&6; }
- if test $ac_cv_cpp_def___ALPHA__ = yes; then
+ 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
+ fi ;;
+   *sparc*)          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc__" >&5
  $as_echo_n "checking whether we need to define __sparc__... " >&6; }
- if test "${ac_cv_cpp_def___sparc__+set}" = set; then
+ if test "${ac_cv_cpp_def___sparc__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __sparc__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___sparc__=yes
  else
    ac_cv_cpp_def___sparc__=no
@@@ -24481,30 -13319,25 +13247,25 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sparc__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___sparc__" >&5
  $as_echo "$ac_cv_cpp_def___sparc__" >&6; }
- if test $ac_cv_cpp_def___sparc__ = yes; then
+ 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
+ fi ;;
+   *powerpc*)        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc__" >&5
  $as_echo_n "checking whether we need to define __powerpc__... " >&6; }
- if test "${ac_cv_cpp_def___powerpc__+set}" = set; then
+ if test "${ac_cv_cpp_def___powerpc__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __powerpc__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___powerpc__=yes
  else
    ac_cv_cpp_def___powerpc__=no
@@@ -24512,33 -13345,28 +13273,28 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___powerpc__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___powerpc__" >&5
  $as_echo "$ac_cv_cpp_def___powerpc__" >&6; }
- if test $ac_cv_cpp_def___powerpc__ = yes; then
+ if test $ac_cv_cpp_def___powerpc__ = yes; then :
    CFLAGS="$CFLAGS -D__powerpc__"
    LINTFLAGS="$LINTFLAGS -D__powerpc__"
- fi
-  ;;
+ fi ;;
  esac
  
  case $host_vendor in
-   *sun*) { $as_echo "$as_me:$LINENO: checking whether we need to define __sun__" >&5
+   *sun*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sun__" >&5
  $as_echo_n "checking whether we need to define __sun__... " >&6; }
- if test "${ac_cv_cpp_def___sun__+set}" = set; then
+ if test "${ac_cv_cpp_def___sun__+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifndef __sun__
  yes
  #endif
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
+   $EGREP "yes" >/dev/null 2>&1; then :
    ac_cv_cpp_def___sun__=yes
  else
    ac_cv_cpp_def___sun__=no
@@@ -24546,13 -13374,12 +13302,12 @@@ f
  rm -f conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_cpp_def___sun__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___sun__" >&5
  $as_echo "$ac_cv_cpp_def___sun__" >&6; }
- if test $ac_cv_cpp_def___sun__ = yes; then
+ if test $ac_cv_cpp_def___sun__ = yes; then :
    CFLAGS="$CFLAGS -D__sun__"
    LINTFLAGS="$LINTFLAGS -D__sun__"
- fi
-  ;;
+ fi ;;
  esac
  
  
@@@ -24595,7 -13422,6 +13350,6 @@@ ALL_PROGRAM_BIN_INSTALL_DIRS="
  
  
  
- 
  ac_config_commands="$ac_config_commands include/stamp-h"
  
  
@@@ -28792,13 -17618,13 +17546,13 @@@ _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
+       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
  $as_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 ;;
+       *) { eval $ac_var=; unset $ac_var;} ;;
        esac ;;
      esac
    done
@@@ -28806,8 -17632,8 +17560,8 @@@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       # `set' does not quote correctly, so add quotes: double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \.
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@@ -28830,11 -17656,11 +17584,11 @@@
  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:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  $as_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:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
@@@ -28854,8 -17680,8 +17608,8 @@@ for ac_i in : $LIBOBJS; do test "x$ac_i
    ac_i=`$as_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"
-   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
  
@@@ -28867,9 -17693,10 +17621,10 @@@ LTLIBOBJS=$ac_ltlibobj
  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:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
  $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ as_write_fail=0
+ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
@@@ -28879,17 -17706,18 +17634,18 @@@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ export SHELL
+ _ASEOF
+ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
  
  # Be more Bourne compatible
  DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ 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
@@@ -28897,23 -17725,15 +17653,15 @@@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
+   case `(set -o) 2>/dev/null` in #(
+   *posix*) :
+     set -o posix ;; #(
+   *) :
+      ;;
  esac
  fi
  
  
- 
- 
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
  as_nl='
  '
  export as_nl
@@@ -28921,7 -17741,13 +17669,13 @@@
  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
+ # Prefer a ksh shell builtin over an external printf program on Solaris,
+ # but without wasting forks for bash or zsh.
+ if test -z "$BASH_VERSION$ZSH_VERSION" \
+     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='print -r --'
+   as_echo_n='print -rn --'
+ elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
@@@ -28932,7 -17758,7 +17686,7 @@@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@@ -28955,13 -17781,6 +17709,6 @@@ if test "${PATH_SEPARATOR+set}" != set
    }
  fi
  
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
- 
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
@@@ -28971,15 -17790,15 +17718,15 @@@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+   done
  IFS=$as_save_IFS
  
       ;;
@@@ -28991,12 -17810,16 +17738,16 @@@ if test "x$as_myself" = x; the
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
  
- # Work around bugs in pre-3.0 UWIN ksh.
- for as_var in ENV MAIL MAILPATH
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # Unset variables that we do not need and which cause bugs (e.g. in
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+ # suppresses any "Segmentation fault" message there.  '((' could
+ # trigger a bug in pdksh 5.2.14.
+ for as_var in BASH_ENV ENV MAIL MAILPATH
+ do eval test x\${$as_var+set} = xset \
+   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
  done
  PS1='$ '
  PS2='> '
@@@ -29008,7 -17831,89 +17759,89 @@@ export LC_AL
  LANGUAGE=C
  export LANGUAGE
  
- # Required to use basename.
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+ # as_fn_error ERROR [LINENO LOG_FD]
+ # ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+ # script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+   as_status=$?; test $as_status -eq 0 && as_status=1
+   if test "$3"; then
+     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+   fi
+   $as_echo "$as_me: error: $1" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+ 
+ # as_fn_set_status STATUS
+ # -----------------------
+ # Set $? to STATUS, without forking.
+ as_fn_set_status ()
+ {
+   return $1
+ } # as_fn_set_status
+ 
+ # as_fn_exit STATUS
+ # -----------------
+ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+ as_fn_exit ()
+ {
+   set +e
+   as_fn_set_status $1
+   exit $1
+ } # as_fn_exit
+ 
+ # as_fn_unset VAR
+ # ---------------
+ # Portably unset VAR.
+ as_fn_unset ()
+ {
+   { eval $1=; unset $1;}
+ }
+ as_unset=as_fn_unset
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+ # advantage of any shell optimizations that allow amortized linear growth over
+ # repeated appends, instead of the typical quadratic growth present in naive
+ # implementations.
+ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+   eval 'as_fn_append ()
+   {
+     eval $1+=\$2
+   }'
+ else
+   as_fn_append ()
+   {
+     eval $1=\$$1\$2
+   }
+ fi # as_fn_append
+ 
+ # as_fn_arith ARG...
+ # ------------------
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+   eval 'as_fn_arith ()
+   {
+     as_val=$(( $* ))
+   }'
+ else
+   as_fn_arith ()
+   {
+     as_val=`expr "$@" || test $? -eq 1`
+   }
+ fi # as_fn_arith
+ 
+ 
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@@ -29022,8 -17927,12 +17855,12 @@@ els
    as_basename=false
  fi
  
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+   as_dirname=dirname
+ else
+   as_dirname=false
+ fi
  
- # Name of the executable.
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
@@@ -29043,76 -17952,25 +17880,25 @@@ $as_echo X/"$0" 
  	  }
  	  s/.*/./; q'`
  
- # CDPATH.
- $as_unset CDPATH
- 
- 
- 
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
-   # line-number line after each line using $LINENO; the second 'sed'
-   # does the real work.  The second script uses 'N' to pair each
-   # line-number line with the line containing $LINENO, and appends
-   # trailing '-' during substitution so that $LINENO is not a special
-   # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-   # scripts with optimization help from Paolo Bonzini.  Blame Lee
-   # E. McMahon (1931-1989) for sed's syntax.  :-)
-   sed -n '
-     p
-     /[$]LINENO/=
-   ' <$as_myself |
-     sed '
-       s/[$]LINENO.*/&-/
-       t lineno
-       b
-       :lineno
-       N
-       :loop
-       s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
-       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
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-   . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
- if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   as_dirname=dirname
- else
-   as_dirname=false
- fi
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
  
  ECHO_C= ECHO_N= ECHO_T=
- case `echo -n x` in
+ case `echo -n x` in #(((((
  -n*)
-   case `echo 'x\c'` in
+   case `echo 'xy\c'` in
    *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-   *)   ECHO_C='\c';;
+   xy)  ECHO_C='\c';;
+   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+        ECHO_T='	';;
    esac;;
  *)
    ECHO_N='-n';;
  esac
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
@@@ -29141,8 -17999,56 +17927,56 @@@ f
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
+ 
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
+ as_fn_mkdir_p ()
+ {
+ 
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+   test -d "$as_dir" || eval $as_mkdir_p || {
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+       as_dir=`$as_dirname -- "$as_dir" ||
+ $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" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\/\)[^/].*/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\/\)$/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  /^X\(\/\).*/{
+ 	    s//\1/
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
@@@ -29161,10 -18067,10 +17995,10 @@@ els
        if test -d "$1"; then
  	test -d "$1/.";
        else
- 	case $1 in
+ 	case $1 in #(
  	-*)set "./$1";;
  	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
@@@ -29179,13 -18085,19 +18013,19 @@@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_c
  
  
  exec 6>&1
+ ## ----------------------------------- ##
+ ## Main body of $CONFIG_STATUS script. ##
+ ## ----------------------------------- ##
+ _ASEOF
+ test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
  
- # Save the log message, to keep $[0] and so on meaningful, and to
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # Save the log message, to keep $0 and so on meaningful, and to
  # 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.27, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ This file was extended by Wine $as_me 1.1.28, which was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -29217,10 -18129,11 +18057,11 @@@ _ACEO
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
+ \`$as_me' instantiates files and other configuration actions
+ from templates according to the current configuration.  Unless the files
+ and actions are specified as TAGs, all are instantiated by default.
  
- Usage: $0 [OPTION]... [FILE]...
+ Usage: $0 [OPTION]... [TAG]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
@@@ -29242,16 -18155,17 +18083,17 @@@ $config_header
  Configuration commands:
  $config_commands
  
- Report bugs to <bug-autoconf at gnu.org>."
+ Report bugs to <wine-devel at winehq.org>.
+ Wine home page: <http://www.winehq.org>."
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
- Wine config.status 1.1.27
- configured by $0, generated by GNU Autoconf 2.63,
+ Wine config.status 1.1.28
+ configured by $0, generated by GNU Autoconf 2.64,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
@@@ -29292,20 -18206,19 +18134,19 @@@ d
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
-     CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+     as_fn_append 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'"
+     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
      ac_need_defaults=false;;
    --he | --h)
      # Conflict between --help and --header
-     { $as_echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; };;
+     as_fn_error "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@@ -29313,11 -18226,10 +18154,10 @@@
      ac_cs_silent=: ;;
  
    # This is an error.
-   -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
+   -*) as_fn_error "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
  
-   *) ac_config_targets="$ac_config_targets $1"
+   *) as_fn_append ac_config_targets " $1"
       ac_need_defaults=false ;;
  
    esac
@@@ -29883,9 -18795,7 +18723,7 @@@ d
      "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;}
-    { (exit 1); exit 1; }; };;
+   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    esac
  done
  
@@@ -29912,7 -18822,7 +18750,7 @@@ $debug |
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
+   trap 'as_fn_exit 1' 1 2 13 15
  }
  # Create a (secure) tmp directory for tmp files.
  
@@@ -29923,11 -18833,7 +18761,7 @@@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
- } ||
- {
-    $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
+ } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
@@@ -29952,10 -18858,16 +18786,16 @@@ els
    # The final `:' finishes the AND list.
    ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
  fi
- ac_cr='
'
+ ac_cr=`echo X | tr X '\015'`
+ # On cygwin, bash can eat \r inside `` if the user requested igncr.
+ # But we know of no other shell where ac_cr would be empty at this
+ # point, so we can use a bashism as a fallback.
+ if test "x$ac_cr" = x; then
+   eval ac_cr=\$\'\\r\'
+ fi
  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'
+   ac_cs_awk_cr='\r'
  else
    ac_cs_awk_cr=$ac_cr
  fi
@@@ -29972,9 -18884,7 +18812,7 @@@ _ACEO
    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; }; }
+   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  rm -f conf$$files.sh
  
  {
@@@ -29982,24 -18892,18 +18820,18 @@@
    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; }; }
+   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  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; }; }
+     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  
    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
      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;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
@@@ -30094,9 -18998,7 +18926,7 @@@ if sed "s/$ac_cr//" < /dev/null > /dev/
  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;}
-    { (exit 1); exit 1; }; }
+   || as_fn_error "could not setup config files machinery" "$LINENO" 5
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@@ -30137,9 -19039,7 +18967,7 @@@ for ac_last_try in false false :; d
    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; }; }
+     as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
@@@ -30224,9 -19124,7 +19052,7 @@@ cat >>$CONFIG_STATUS <<_ACEOF || ac_wri
  _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; }; }
+   as_fn_error "could not setup config headers machinery" "$LINENO" 5
  fi # test -n "$CONFIG_HEADERS"
  
  
@@@ -30239,9 -19137,7 +19065,7 @@@ d
    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;}
-    { (exit 1); exit 1; }; };;
+   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
@@@ -30269,12 -19165,10 +19093,10 @@@
  	   [\\/$]*) 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;}
-    { (exit 1); exit 1; }; };;
+ 	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       ac_file_inputs="$ac_file_inputs '$ac_f'"
+       as_fn_append ac_file_inputs " '$ac_f'"
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
@@@ -30285,7 -19179,7 +19107,7 @@@
  	`' 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:${as_lineno-$LINENO}: creating $ac_file" >&5
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
@@@ -30298,9 -19192,7 +19120,7 @@@
  
      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; }; } ;;
+       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
      esac
      ;;
    esac
@@@ -30328,47 -19220,7 +19148,7 @@@ $as_echo X"$ac_file" 
  	    q
  	  }
  	  s/.*/./; q'`
-   { as_dir="$ac_dir"
-   case $as_dir in #(
-   -*) as_dir=./$as_dir;;
-   esac
-   test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
-     while :; do
-       case $as_dir in #(
-       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-       as_dir=`$as_dirname -- "$as_dir" ||
- $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" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
- 	  }
- 	  /^X\(\/\/\)[^/].*/{
- 	    s//\1/
- 	    q
- 	  }
- 	  /^X\(\/\/\)$/{
- 	    s//\1/
- 	    q
- 	  }
- 	  /^X\(\/\).*/{
- 	    s//\1/
- 	    q
- 	  }
- 	  s/.*/./; q'`
-       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;}
-    { (exit 1); exit 1; }; }; }
+   as_dir="$ac_dir"; as_fn_mkdir_p
    ac_builddir=.
  
  case "$ac_dir" in
@@@ -30420,7 -19272,6 +19200,6 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # 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/ {
    p
@@@ -30430,12 -19281,11 +19209,11 @@@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
- /@mandir@/p
- '
+ /@mandir@/p'
  case `eval "sed -n \"\$ac_sed_dataroot\" $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:${as_lineno-$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;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@@ -30445,7 -19295,7 +19223,7 @@@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
-     s&\\\${datarootdir}&$datarootdir&g' ;;
+   s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
  _ACEOF
  
@@@ -30478,14 -19328,12 +19256,12 @@@ if $ac_cs_awk_getline; the
  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; }; }
+   || as_fn_error "could not create $ac_file" "$LINENO" 5
  
  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'
+   { $as_echo "$as_me:${as_lineno-$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'
  which seems to be undefined.  Please make sure it is defined." >&2;}
@@@ -30495,9 -19343,7 +19271,7 @@@
    -) 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; }; }
+   || as_fn_error "could not create $ac_file" "$LINENO" 5
   ;;
    :H)
    #
@@@ -30508,29 -19354,23 +19282,23 @@@
        $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; }; }
+       || as_fn_error "could not create $ac_file" "$LINENO" 5
      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:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  $as_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; }; }
+ 	|| as_fn_error "could not create $ac_file" "$LINENO" 5
      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; }; }
+       || as_fn_error "could not create -" "$LINENO" 5
    fi
   ;;
  
-   :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
@@@ -30538,32 -19378,29 +19306,29 @@@
  
    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
+     "dlls/gdi32/enhmfdrv":C) test -d "dlls/gdi32/enhmfdrv" || ({ $as_echo "$as_me:${as_lineno-$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
+     "dlls/gdi32/mfdrv":C) test -d "dlls/gdi32/mfdrv" || ({ $as_echo "$as_me:${as_lineno-$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
+     "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ $as_echo "$as_me:${as_lineno-$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
+     "dlls/user32/resources":C) test -d "dlls/user32/resources" || ({ $as_echo "$as_me:${as_lineno-$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
+     "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ $as_echo "$as_me:${as_lineno-$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
+     "include/wine":C) test -d "include/wine" || ({ $as_echo "$as_me:${as_lineno-$LINENO}: creating include/wine" >&5
  $as_echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
  
    esac
  done # for ac_tag
  
  
- { (exit 0); exit 0; }
+ as_fn_exit 0
  _ACEOF
  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; }; }
+   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  
  
  # configure is writing to config.log, and then calls config.status.
@@@ -30584,10 -19421,10 +19349,10 @@@ if test "$no_create" != yes; the
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
+   $ac_cs_success || as_fn_exit $?
  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:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
@@@ -30604,7 -19441,7 +19369,7 @@@ 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:${as_lineno-$LINENO}: $msg" >&5
  $as_echo "$as_me: $msg" >&6;}
          fi
      done
@@@ -30614,7 -19451,7 +19379,7 @@@ 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:${as_lineno-$LINENO}: WARNING: $msg" >&5
  $as_echo "$as_me: WARNING: $msg" >&2;}
      fi
  done
diff --combined configure.ac
index 4fb06c4,a18083b..bc4a12a
--- a/configure.ac
+++ b/configure.ac
@@@ -6,7 -6,7 +6,7 @@@ m4_define(WINE_VERSION,regexp(m4_includ
  
  dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly
  AC_PREREQ(2.59d)
- AC_INIT([Wine],[WINE_VERSION],[wine-devel at winehq.org])
+ AC_INIT([Wine],[WINE_VERSION],[wine-devel at winehq.org],[wine],[http://www.winehq.org])
  AC_CONFIG_SRCDIR(server/atom.c)
  AC_CONFIG_HEADERS(include/config.h)
  AC_CONFIG_AUX_DIR(tools)
@@@ -40,7 -40,7 +40,7 @@@ AC_ARG_WITH(gphoto,    AS_HELP_STRING([
  AC_ARG_WITH(glu,       AS_HELP_STRING([--without-glu],[do not use the GLU library]),
              [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
  AC_ARG_WITH(gnutls,    AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
- AC_ARG_WITH(libgsm,    AS_HELP_STRING([--without-libgsm],[do not use libgsm (GSM 06.10 codec support)]),
+ AC_ARG_WITH(gsm,       AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]),
              [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
  AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
  AC_ARG_WITH(jack,      AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
@@@ -83,6 -83,7 +83,7 @@@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi])
  
  AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
+ AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
  
  AC_CANONICAL_HOST
  
@@@ -105,7 -106,7 +106,7 @@@ AC_CHECK_TOOL(CPPBIN,cpp,cpp
  
  case $host in
    *-darwin*)
-     if test "x$enable_win64" == "xyes"
+     if test "x$enable_win64" = "xyes"
      then
        CC="$CC -m64"
        CXX="$CXX -m64"
@@@ -174,20 -175,42 +175,42 @@@ the
      enable_winevdm=${enable_winevdm:-no}
  fi
  
+ dnl Some special cases for the wow64 build
+ if test -n "$with_wine64"
+ then
+     if test "x$enable_win64" = "xyes"
+     then
+         AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive.
+ --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.])
+     fi
+     AC_SUBST([WOW64_DISABLE],[\#])
+     enable_fonts=${enable_fonts:-no}
+     enable_include=${enable_include:-no}
+     enable_server=${enable_server:-no}
+     enable_tools=${enable_tools:-no}
+     enable_wineboot=${enable_wineboot:-no}
+     enable_winedbg=${enable_winedbg:-no}
+     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32"
+ fi
+ 
  AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
-   [if test -z "$with_wine_tools"; then
+   [wine_cv_toolsdir="$with_wine_tools"
+    if test -z "$with_wine_tools"; then
       if test "$cross_compiling" = "yes"; then
         AC_MSG_ERROR([you must use the --with-wine-tools option when cross-compiling.])
-      else
-        wine_cv_toolsdir="\$(TOPOBJDIR)"
+      elif test -n "$with_wine64"; then
+        wine_cv_toolsdir="$with_wine64"
       fi
-    elif test -d "$with_wine_tools/tools/winebuild"; then
-      case $with_wine_tools in
-        /*) wine_cv_toolsdir="$with_wine_tools" ;;
-        *)  wine_cv_toolsdir="\$(TOPOBJDIR)/$with_wine_tools" ;;
+    fi
+    if test -z "$wine_cv_toolsdir"; then
+      wine_cv_toolsdir="\$(TOPOBJDIR)"
+    elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
+      case "$wine_cv_toolsdir" in
+        /*) ;;
+        *)  wine_cv_toolsdir="\$(TOPOBJDIR)/$wine_cv_toolsdir" ;;
       esac
     else
-      AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
+      AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
     fi])
  AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
  if test -n "$host_alias" -a "$host_alias" != "$build_alias"
@@@ -479,7 -502,7 +502,7 @@@ AC_CHECK_HEADERS([netinet/tcp_timer.h n
       #include <netinet/tcp_timer.h>
       #endif])
  
- AC_CHECK_HEADERS([linux/ipx.h],,,
+ AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,,
      [#include <sys/types.h>
       #ifdef HAVE_ASM_TYPES_H
       # include <asm/types.h>
@@@ -660,6 -683,13 +683,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"])
  
@@@ -746,12 -776,12 +769,12 @@@ AC_PATH_XTR
  
  if test "$have_x" = "yes"
  then
-     XLIB="-lXext -lX11"
+     XLIB="-lX11"
      ac_save_CPPFLAGS="$CPPFLAGS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
      WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS])
-     WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
+     WINE_CHECK_SONAME(Xext,XextCreateExtension,[XLIB="-lXext $XLIB"],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
  
      dnl *** All of the following tests require X11/Xlib.h
      AC_CHECK_HEADERS([X11/Xlib.h \
@@@ -778,13 -808,13 +801,13 @@@
          then
                AC_CHECK_LIB(X11, XkbQueryExtension,
                AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,
-               $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+               $X_LIBS $XLIB $X_EXTRA_LIBS)
          fi
  
          dnl *** Check for X cursor
          if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
          then
-             WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+             WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
          fi
          WINE_NOTICE_WITH(xcursor,[test "x$ac_cv_lib_soname_Xcursor" = "x"],
                           [libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.])
@@@ -792,7 -822,7 +815,7 @@@
          dnl *** Check for X input extension
          if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
          then
-             WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+             WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
          fi
          WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"],
                           [libxi ${notice_platform}development files not found, the Xinput extension won't be supported.])
@@@ -802,7 -832,7 +825,7 @@@
          then
                AC_CHECK_LIB(Xext, XShmQueryExtension,
                AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
-               $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+               $X_LIBS $XLIB $X_EXTRA_LIBS)
          fi
          WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],
                           [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.])
@@@ -812,7 -842,7 +835,7 @@@
          then
                AC_CHECK_LIB(Xext,XShapeQueryExtension,
  	      AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
- 	      $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+ 	      $X_LIBS $XLIB $X_EXTRA_LIBS)
          fi
          WINE_NOTICE_WITH(xshape,[test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"],
                           [XShape ${notice_platform}development files not found, XShape won't be supported.])
@@@ -820,7 -850,7 +843,7 @@@
          dnl *** Check for XFree86 VMODE extension
          if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
          then
-             WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+             WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
          fi
          WINE_NOTICE_WITH(xxf86vm,[test "x$ac_cv_lib_soname_Xxf86vm" = "x"],
                           [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.])
@@@ -832,7 -862,7 +855,7 @@@
                [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,
                  [AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1,
                   [Define if Xrender has the XRenderSetPictureTransform function])],,
-                 [$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])],,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+                 [$X_LIBS $XLIB $X_EXTRA_LIBS])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])
  
          fi
          WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"],
@@@ -843,7 -873,7 +866,7 @@@
          then
                  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
  #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func;]])],
-                   [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
+                   [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
          fi
          WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"],
                           [libxrandr ${notice_platform}development files not found, XRandr won't be supported.])
@@@ -853,7 -883,7 +876,7 @@@
          then
                  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
  #include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])],
-                   [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
+                   [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
          fi
          WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"],
                           [libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.])
@@@ -861,7 -891,7 +884,7 @@@
          dnl *** Check for X Composite extension
          if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
          then
-             WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+             WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
          fi
          WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
                           [libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
@@@ -906,11 -936,11 +929,11 @@@ This probably prevents linking to OpenG
  	                            else
  	                                opengl_msg="No OpenGL library found on this system."
  	                            fi],
- 				    $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)],
- 			     $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
+ 				    $X_LIBS $XLIB -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)],
+ 			     $X_LIBS $XLIB -lm $X_EXTRA_LIBS)
                   if test "$ac_cv_header_GL_glu_h" = "yes"
                   then
-                     WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS])
+                     WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
                   fi
                   WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"],
                                   [libGLU ${notice_platform}development files not found, GLU won't be supported.])
@@@ -936,11 -966,11 +959,11 @@@ OpenGL and Direct3D won't be supported.
            AC_CHECK_LIB(audio,AuCreateFlow,
                         [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
                          AC_CHECK_LIB(Xau,XauGetBestAuthByAddr,
-                           [NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],
-                           [NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],
+                           [NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
+                           [NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
                            [$X_LIBS])
                         ],,
-                        [-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
+                        [-lXt $X_LIBS $XLIB $X_EXTRA_LIBS])])
  
      CPPFLAGS="$ac_save_CPPFLAGS"
  else
@@@ -1340,7 -1370,7 +1363,7 @@@ if test "$ac_cv_header_gsm_h" = "yes" -
  then
      WINE_CHECK_SONAME(gsm,gsm_create)
  fi
- WINE_WARNING_WITH(libgsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
+ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
                   [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.])
  
  dnl **** Check for libjpeg ****
@@@ -1565,6 -1595,9 +1588,9 @@@ case $host_os i
      ;;
  esac
  
+ AC_SUBST(MAIN_BINARY,"wine")
+ test -z "$with_wine64" || MAIN_BINARY="wine32"
+ 
  case $host_cpu in
    *i[[3456789]]86*)
      case $host_os in
diff --combined debian/changelog
index 6f8b753,0000000..7623c8e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3943 -1,0 +1,3949 @@@
++wine-unstable (1.1.28-1) UNRELEASED; urgency=low
++
++  * UNRELEASED
++
++ -- Ove Kaaven <ovek at arcticnet.no>  Fri, 21 Aug 2009 19:49:14 +0200
++
 +wine-unstable (1.1.27-1) unstable; urgency=low
 +
 +  * New upstream release 1.1.27, released Aug 7, 2009.
 +    - New version of the Gecko engine.
 +    - New GSM 06.10 codec support.
 +    - Improved support for the disk volume APIs.
 +    - Support for XShm pixmaps for better performance.
 +    - Various bug fixes.
 +  * Added libgsm1-dev build-dependency.
 +  * Added wineconsole and wine-safe manpages by Francois Wendling.
 +    (Closes: #540652, #540653)
 +  * Annotate binary packages with the Multi-Arch field as appropriate.
 +  * Added a script to generate Recommends lines. Initially use it to
 +    make libwine recommend the libgsm package Wine was compiled against.
 +    (The package splitting has gone far enough, I don't think I want to
 +    make a separate libwine-codecs package to depend on libgsm. I'm just
 +    going to use Recommends instead for stuff like that. Perhaps even
 +    eliminate some more libwine-* packages in the future...)
 +  * Made it possible to add suffixes to the dependencies of
 +    autogenerated transition packages. (I've used this to make
 +    experimental users migrate to the wine-unstable packages.)
 +  * Automatically substitute the current library paths into the lintian
 +    overrides.
 +  * Added lintian override for wine.bin being unstripped.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 09 Aug 2009 15:29:11 +0200
 +
 +wine-unstable (1.1.26-1) unstable; urgency=low
 +
 +  * New upstream release 1.1.26, released Jul 17, 2009.
 +    - Still more translation updates.
 +    - Faster bitmap stretching using XRender.
 +    - Proxy support in WinHTTP.
 +    - Many more JScript functions.
 +    - Various bug fixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 18 Jul 2009 21:16:14 +0200
 +
 +wine-unstable (1.1.25-1) unstable; urgency=low
 +
 +  * New upstream release 1.1.25, released Jul 3, 2009.
 +    - A ton of translation updates.
 +    - Support for various Unicode file encodings in Notepad.
 +    - Improved memory management, especially for OpenGL.
 +    - Desktop menus now cleaned up automatically.
 +    - Beginnings of a windowscodecs DLL implementation.
 +    - Various bug fixes.
 +  * Split out yet another binary package, libwine-bin, which now
 +    contains everything wine-bin used to ship in /usr/lib/wine.
 +  * Moved all winelib programs in wine-utils to libwine-bin and wine-bin.
 +    Moved all development utilities in wine-utils to libwine-dev.
 +    Moved all remaining utilities in wine-utils to wine-bin.
 +    Deleted the wine-utils package.
 +  * Removed wine-utils from README.Debian.
 +  * Now build with multiarch library paths. Hence, instead of /usr/lib
 +    on i386 and /usr/lib32 on amd64, Wine's 32-bit libraries are now in
 +    /usr/lib/i486-linux-gnu for both. Although full multiarch isn't here
 +    yet, this should also make Wine work better with ia32-apt-get.
 +  * If installing into /usr/lib32 (on an amd64 system), and it is not a
 +    symlink on the build system, force the resulting binaries to pre-
 +    depend on libc6-i386 2.9.18. Closes: #535204.
 +  * Updated winelauncher for the new realities in the amd64 world. Any
 +    other fallout from the ia32-libs transitions is out of my control.
 +    (Closes: #535097)
 +  * Added code to generate transition packages for amd64 in the event
 +    that ia32-apt-get completely replaces ia32-libs. Not enabled yet,
 +    though, since right now, it looks like such a replacement may not
 +    actually happen.
 +  * Removed versioned dependency on ia32-libs.
 +  * In the scripts for preprocessing debhelper files to add package
 +    suffixes, also handle maintainer scripts and documentation.
 +  * Updated year in debian/copyright.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 11 Jul 2009 20:51:19 +0200
 +
 +wine-unstable (1.1.24-1) unstable; urgency=low
 +
 +  * New upstream release 1.1.24, released Jun 19, 2009.
 +    - Support for freedesktop file associations.
 +    - Support for exception handling on 64-bit.
 +    - Improved ARB shaders.
 +    - Fixes for the FBO mode.
 +    - Many listview improvements.
 +    - Various bug fixes.
 +  * Check at build time whether /usr/lib32 is a symlink (and what it
 +    symlinks to). It should then be a matter of a quick rebuild in the
 +    appropriate build environment to get packages that work both before
 +    and after the transition.
 +  * Name the upstream tarball properly in debian/maint/import (with
 +    -unstable for the 1.1.* series).
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 21 Jun 2009 19:30:18 +0200
 +
 +wine-unstable (1.1.23-2) unstable; urgency=low
 +
 +  * On amd64, install into /emul/ia32-linux/usr/lib instead of into
 +    /usr/lib32. While they both refer to the same place, the relative
 +    paths inferred by the Wine build process work much better when
 +    they're deduced from the true path, rather than from symlinks.
 +  * Removed obsolete configure option --enable-opengl.
 +  * Changed "git-cat-file" to "git cat-file" in debian/maint/build-final.
 +  * Fixed git-dch workaround in debian/maint/build-final to work with
 +    package updates that aren't new upstream releases.
 +  * Exclude wine.bin from stripping, so that this will compile on lenny.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Fri, 19 Jun 2009 01:20:14 +0200
 +
 +wine-unstable (1.1.23-1) unstable; urgency=low
 +
 +  * New upstream release 1.1.23, released Jun 5, 2009.
 +    - Support for registering MIME types with the Linux desktop.
 +    - FBO mode is now the default for Direct3D.
 +    - Support for COM proxy delegation.
 +    - Improved support for the Mingw cross-compile.
 +    - Proper fullscreen mode for the virtual desktop.
 +    - Various bug fixes.
 +  * Add "-unstable" suffix to package names for the Wine development
 +    branch, and upload to sid.
 +  * Fix up package names of dependencies when adding a suffix. For now,
 +    also add conflicts with the corresponding suffixless packages.
 +  * Fix cleanup after building a package with a suffix and extra
 +    dependencies.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Fri, 12 Jun 2009 15:53:05 +0200
 +
 +wine (1.1.22-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.22, released May 22, 2009.
 +    - More improvements to OLE copy/paste.
 +    - Beginnings of x86_64 exception handling.
 +    - Direct3D locking fixes.
 +    - ARB shaders improvements.
 +    - Better OpenGL pixel format support.
 +    - Various bug fixes.
 +  * Added workaround to debian/maint/build-final for current git-dch not
 +    working like it's supposed to.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 10 Jun 2009 13:25:08 +0200
 +
 +wine (1.1.21-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.21, released May 8, 2009.
 +    - Beginnings of shader model 4 support.
 +    - Support for copying/pasting images from X11 applications.
 +    - A number of GDIPlus improvements.
 +    - Various listview fixes.
 +    - 64-bit support in winemaker.
 +    - Support for building on Mac OS X Snow Leopard.
 +    - Various bug fixes.
 +  * Made it possible to easily add a suffix to all package names. This
 +    should make it possible to maintain multiple branches of Wine
 +    (stable and unstable) simply by specifying different suffixes.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 09 Jun 2009 23:38:43 +0200
 +
 +wine (1.1.20-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.20, released Apr 24, 2009.
 +    - Show a dialog on application crashes.
 +    - Much improved OLE copy/paste support.
 +    - Various listview improvements.
 +    - More Direct3D code cleanups.
 +    - Various bug fixes.
 +  * Killed the libwine-twain transitional package.
 +  * Renamed remaining debian/*.install files to debian/*.install-common.
 +  * Installed termsv.exe.so into wine-bin.
 +  * On amd64, winelib is now installed into /usr/lib32 instead of
 +    /usr/lib. (This *is* an upload to experimental, after all...)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 01 Jun 2009 00:30:23 +0200
 +
 +wine (1.1.19-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.19, released Apr 10, 2009.
 +    - Support for Visual C++ project files in winemaker.
 +    - Improvements to the Esound driver.
 +    - Many Direct3D code cleanups.
 +    - Fixes to OLE clipboard handling.
 +    - OpenBSD compilation fixed.
 +    - Various bug fixes.
 +  * Made filenames in libwine.split tidier.
 +  * Split libwine-gphoto2 and libwine-sane with libwine.split instead of
 +    with *.install files.
 +  * Removed *.dirs files, rely on dh_install (and split.sh) to create
 +    directories as needed.
 +  * Made the /usr/share/doc/<package> directory in all binary packages
 +    (except libwine) be a symlink to /usr/share/doc/libwine. (All binary
 +    packages already do have a strict dependency on the same libwine
 +    binary version as themselves, so this should be in line with
 +    policy.) Since Debian Wine is made up of many binary packages, this
 +    should reduce the .deb package sizes and disk usage somewhat.
 +  * Merged fixes from lenny branch:
 +    - Recommend ttf-liberation, and changed msttcorefonts suggestion to
 +      ttf-mscorefonts-installer. Closes: #490861.
 +    - Removed application/x-zip-compressed from wine.desktop.
 +      Closes: #452957.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Thu, 21 May 2009 22:27:09 +0200
 +
 +wine (1.1.18-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.18, released Mar 27, 2009.
 +    - RPC over HTTP support.
 +    - Improved support for upgrades in MSI.
 +    - Debug symbols in WineDbg on Mac OS X.
 +    - Many Direct3D code cleanups.
 +    - Various bug fixes.
 +  * Changed section of libwine-dbg to the new "debug" section.
 +  * The logic for only installing binaries that are actually built is
 +    now in separate shell scripts (prep-install.sh, clean-install.sh).
 +  * Instead of splitting up libwine with a long list of "mv" commands in
 +    debian/rules, the list of files and packages to split into is now in
 +    a separate libwine.split file, which is processed by a shell script
 +    (split.sh).
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 19 May 2009 20:59:50 +0200
 +
 +wine (1.1.17-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.17, released Mar 13, 2009.
 +    - Joystick support on Mac OS X.
 +    - Implementation of iphlpapi on Solaris.
 +    - A number of 64-bit improvements.
 +    - Obsolete LinuxThreads support has been removed.
 +    - Many fixes to the regression tests on Windows.
 +    - Various bug fixes.
 +  * README.twain is no more, was removed upstream.
 +  * Permanently removed the amd64 binaries-in-diff hack.
 +  * Worked on the experimental 64-bit support in debian/rules a bit.
 +    Since gcc-4.4 is now in Debian, the 64-bit build rules will now use
 +    that. Properly packaging the result will take a bit more work,
 +    though...
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 16 May 2009 11:15:41 +0200
 +
 +wine (1.1.16-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.16, released Feb 27, 2009.
 +    - Improved SANE scanner support.
 +    - Support for digital CD audio playback.
 +    - Improved cookies management in Wininet.
 +    - Support for building stand-alone 16-bit modules.
 +    - Many fixes to the regression tests on Windows.
 +    - Various bug fixes.
 +  * Try to install *.vxd.so only if they were built. (Closes: #517886)
 +  * Changed "git-cat-file" to "git cat-file" in debian/maint/import.
 +  * Changed uninstaller.desktop to execute "wine uninstaller".
 +  * Wine no longer installs progman, uninstaller, and winebrowser as
 +    their own binaries. Thus, removed these from the packaging, along
 +    with their man pages. (The programs can still be run through the
 +    "wine" command, e.g. "wine uninstaller".)
 +  * Install stand-alone 16-bit modules (if they were built) into
 +    libwine.
 +  * Installed lodctr.exe.so, unlodctr.exe.so, and cacls.exe.so into
 +    wine-bin.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 13 May 2009 19:46:01 +0200
 +
 +wine (1.1.15-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.15, released Feb 13, 2009.
 +    - Gecko engine update.
 +    - Better region support in GdiPlus.
 +    - Support for cross-compilation in winegcc.
 +    - Beginnings of MS Text Framework support.
 +    - Many fixes to the regression tests on Windows.
 +    - Various bug fixes.
 +  * Added build-dependency alternative libjack-dev.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 21 Feb 2009 00:54:23 +0100
 +
 +wine (1.1.14-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.14, released Jan 30, 2009.
 +    - Various bug fixes for Internet Explorer 7.
 +    - Many crypt32 improvements, including new export wizard.
 +    - Better support for windowless Richedit.
 +    - Improvements to the print dialog.
 +    - Many fixes to the regression tests on Windows.
 +    - Various bug fixes.
 +  * Try to fix a PowerPC build failure (reported but not fixed upstream yet).
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 18 Feb 2009 13:31:53 +0100
 +
 +wine (1.1.13-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.13, released Jan 16, 2009.
 +    - Freedesktop.org-compliant startup notifications.
 +    - Many fixes for 64-bit application support.
 +    - Improved graphics support in Internet Explorer.
 +    - Various Richedit improvements.
 +    - Better certificate manager dialog.
 +    - Various bug fixes.
 +  * Fix a minor copy&paste error I did for copying wine-preloader etc
 +    into the packages (should use install, not mv, in the binary-arch
 +    target).
 +  * Install control panel modules into wine-bin. (Currently there's only
 +    one - Add/Remove Programs.) (Closes: #511266)
 +  * Added a more general way to only install certain binaries into
 +    libwine if they were actually built; it now also works for wine-bin,
 +    where winevdm.exe.so is now in the list of optional binaries.
 +  * Installed clock.exe.so and icinfo.exe.so into the wine-utils
 +    package, for some kind of completeness's sake.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sat, 17 Jan 2009 15:02:33 +0100
 +
 +wine (1.1.12-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.12, released Jan 2, 2009.
 +    - Some simple 64-bit apps should now run.
 +    - Support for subpixel font rendering.
 +    - 64-bit code generation in the IDL compiler.
 +    - New version of the Gecko engine.
 +    - Various bug fixes.
 +  * I will note that Wine's 64-bit support requires gcc 4.4 features
 +    (and there's no gcc 4.4 in Debian yet). It's now possible to build
 +    64-bit Wine using gcc-snapshot, but packaging isn't possible yet.
 +    And anyway, there appears to not yet be any pre-made code to detect
 +    whether a particular .exe is 64-bit or 32-bit, and thus which
 +    Wine to run it with. (In a pinch, I suppose using "file" in the
 +    wrapper script would do the trick, though...)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Thu, 08 Jan 2009 15:58:00 +0100
 +
 +wine (1.1.11-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.11, released Dec 20, 2008.
 +    - Numerous fixes for IE7 support.
 +    - Support for 64-bit cross-compile using Mingw64.
 +    - User interface support for crypto certificates.
 +    - Better support for MSI installation patches.
 +    - Various Direct3D optimizations.
 +    - Various bug fixes.
 +  * Add dh_installman to debian/rules.
 +  * Added manpages written by Francois Wendling. (Closes: #284295,
 +    #284297, #284300, #284301, #284302, #284303, #284304, #284305,
 +    #83263, #83265, #83268, #83269, #83270, #83271)
 +  * Try to install wine-kthread, wine-pthread, and wine-preloader only
 +    if they were built (basically only on i386 systems with glibc).
 +    Closes: #511077.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Wed, 07 Jan 2009 19:10:30 +0100
 +
 +wine (1.1.10-1) experimental; urgency=low
 +
 +  * New upstream release 1.1.10, released Dec 5, 2008.
 +    - Support for virtual memory write watches.
 +    - Workarounds for the WINAPI compiler bug on Mac OS.
 +    - Several fixes for the 64-bit build.
 +    - Some more GdiPlus functions.
 +    - Various bug fixes.
 +  * Try again to run debian/maint/import's date in the C locale.
 +  * Comment out currently-unnecessary mensis invocation in debian/rules.
 +    Closes: #510762.
 +  * Removed unneeded dh_testroot from the clean-arch32/arch64 rules.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 06 Jan 2009 13:56:41 +0100
 +
 +wine (1.1.9-1) experimental; urgency=low
 +
 +  * 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.
 +  * Made the debian/maint/import script run date in the C locale.
 +  * Upstream added a --disable-tests configure option. Since the Debian
 +    packaging currently makes no use of the tests (the buildds probably
 +    couldn't run them anyway since they probably need an X display),
 +    I'll use this option, to shorten the build time a little bit.
 +  * Support the "parallel" option of DEB_BUILD_OPTIONS.
 +    Upgraded Standards-Version to 3.8.0.
 +  * The wineshelllink script has been obsoleted. Thus, it's no longer
 +    packaged, and bugs about it no longer applies.
 +    (Closes: #480069, #83259)
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 04 Jan 2009 09:35:46 +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 into wine-bin, and the last
 +    into wine-utils, previously I've also put much from the middle category
 +    into wine-utils. I'm thinking I should perhaps put that into wine-bin
 +    instead, to make wine-utils a little more useless, and hence, the
 +    package split a little more useful.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 17 Dec 2007 03:38:47 +0100
 +
 +wine (0.9.49-2) unstable; urgency=low
 +
 +  * When creating the diff to update the source package, suppress
 +    the timestamps. Closes: #456422.
 +  * Change the Recommends on msttcorefonts to Suggests.
 +    Closes: #360610.
 +  * Add Build-Depends for libpng12-dev and libxcomposite-dev.
 +  * Replaced the debian/rules hacks that I've used to e.g. force
 +    libwine-print to depend on cups and stuff with a more general
 +    mechanism, where I can put libraries I want packages to depend
 +    on into <package>.deps files, and then arrange for dh_shlibdeps
 +    to determine the appropriate dependency, by having a shell
 +    script compile some dummy executables before invoking it.
 +  * Decided to remove libwine-capi dependency from wine metapackage.
 +  * Removed mention of libwine-arts from README.Debian, since it
 +    no longer exists.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Sun, 16 Dec 2007 04:38:26 +0100
 +
 +wine (0.9.49-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.49.
 +    - Many copy protection fixes.
 +    - GLSL is now the default for Direct3D.
 +    - Lots of memory errors fixed thanks to Valgrind.
 +    - Support for TOPMOST windows.
 +    - Beginnings of an inetcomm dll implementation.
 +    - Lots of bug fixes.
 +  * This version was released Nov 9, 2007.
 +  * Added debian/tmp to all file paths in debian/*.install,
 +    so I don't have to use dh_install's --sourcedir anymore.
 +    Tweaked things a bit so almost everything I'm including
 +    in the packaging is installed with dh_install instead of
 +    with "install"/"cp" commands in debian/rules.
 +  * On amd64, no longer explicitly add dependencies on libfreetype6,
 +    libcupsys2, and libjack0.100.0-0; after all, wine needs the 32-bit
 +    libraries in ia32-libs, not these 64-bit ones.
 +  * Also moved the generation of the amd64.tar.lzma.uu further up in the
 +    build process, before the dh_makeshlibs/dh_installdeb/dh_shlibdeps,
 +    so that maintainer scripts and dependencies should be generated a bit
 +    more like they would if the binaries were compiled directly on amd64.
 +  * Deleted debian/shlibs.local, I doubt this hack is needed anymore.
 +    (It contained overrides for GL and OSMesa dependencies, other OpenGL
 +    packages (like nvidia-glx) probably have proper shlibs by now.)
 +  * Updated -l option for dh_shlibdeps to properly handle the way recent
 +    Wine versions are built. Added -L libwine, too.
 +  * After generating amd64.tar.lzma.uu, debian/rules will now try to update
 +    the source package with it if I set the DEB_FIXDIFF environment variable.
 +    That means I only have to rebuild the package once, not twice, before
 +    I can upload it. Yay.
 +  * And I can set DEB_SAVEBUILD to avoid having to recompile everything
 +    if I want to tweak the packaging further... double-yay.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Fri, 14 Dec 2007 07:24:02 +0100
 +
 +wine (0.9.48-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.48.
 +    - Still more fixes for regression test failures.
 +    - Much more complete cryptnet implementation.
 +    - WIDL is now able to generate the oleaut32 proxy code.
 +    - Lots of bug fixes.
 +  * This version was released Oct 26, 2007.
 +  * Upgraded debhelper compatibility level from 3 to 4.
 +  * Renamed debian/*.files to debian/*.install, and use
 +    dh_install instead of dh_movefiles in debian/rules.
 +  * Added some ia32 compatibility libraries to Build-Deps, for amd64.
 +  * Tweaked debian/rules to build 32-bit Wine and 64-bit Wine
 +    in separate directories. This won't do much yet, though;
 +    since I haven't yet researched how to actually *install*
 +    both versions so they will work together, Win64 support
 +    isn't enabled yet.
 +  * However, I did set up debian/rules so that if you delete the
 +    debian/amd64.tar.lzma.uu file after unpacking the Wine source
 +    package, 32-bit Wine will automatically be built from source,
 +    using the system's 32-bit cross compiler and libraries.
 +    This may result in a Wine package with reduced functionality
 +    compared to a natively-built 32-bit Wine, but is an option
 +    for whoever may prefer it this way.
 +    (If you leave the file there, and you're building on amd64,
 +    32-bit Wine will be unpacked from there instead of compiled,
 +    which should preserve all the natively-built features.)
 +  * Moved the d3d10, d3dim, d3drm, and d3dxof DLLs to libwine-gl.
 +  * Added a couple of previously missing Replaces to debian/control
 +    while at it.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 10 Dec 2007 02:28:02 +0100
 +
 +wine (0.9.47-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.47.
 +    - New scheme for OpenGL support in child windows.
 +    - Lots of fixes for regression test failures.
 +    - A Tahoma replacement font.
 +    - Lots of bug fixes.
 +  * This version was released Oct 12, 2007.
 +  * The inclusion of Tahoma should fix some font issues.
 +    Closes: #454178.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Tue, 04 Dec 2007 16:43:28 +0100
 +
 +wine (0.9.46-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.46.
 +    - A variety of fixes to improve Photoshop CS2 support.
 +    - More complete support for device installation in setupapi.
 +    - New Bidi text implementation that doesn't depend on libicu.
 +    - The usual assortment of Direct3D improvements.
 +    - Beginning of I/O completion ports support.
 +    - Lots of bug fixes.
 +  * This version was released Sep 28, 2007.
 +  * Removed libicu*-dev from Build-Depends.
 +    (Bah, figures that they'd remove the ICU dependency now,
 +    after all that effort spent on ICU in Debian...)
 +  * bin2res no longer exists, so not installed into wine-utils
 +    anymore.
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 03 Dec 2007 00:38:25 +0100
 +
 +wine (0.9.45-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.45.
 +    - Many improvements to the crypto dlls (should make iTunes work).
 +    - The usual assortment of Direct3D improvements.
 +    - A number of fixes to sound support.
 +    - Many more WordPad features.
 +    - Lots of bug fixes.
 +  * This version was released Sep 14, 2007.
 +  * After losing access to my other workstations, I haven't had
 +    access to a Debian system for a while. However, now I've
 +    installed a VMware virtual machine with Debian on a Windows
 +    laptop, and appear to be able to build packages inside it...
 +  * Fixed grep-dctrl build-dependency (that package was renamed
 +    to dctrl-tools long ago).
 +
 + -- Ove Kaaven <ovek at arcticnet.no>  Mon, 26 Nov 2007 01:57:43 +0100
 +
 +wine (0.9.44-1) unstable; urgency=low
 +
 +  * New upstream release 0.9.44. (Closes: #421510, #433064.)
 +    - Better heuristics for making windows managed.
 +    - Automatic detection of timezone parameters.
 +    - Improvements to the builtin WordPad.
 +    - Better signatures support in crypt32.
 +    - Still more gdiplus functions.
 +    - Lots of bug fixes.
 +  * This version was released Aug 24, 2007.
 +  * Applied patch to debian/rules for parallelized builds.
 +    Closes: #440937.
 +  * Adjusted architecture field on libwine-capi to match
 +    the list on libwine-alsa.
 +  * Made the wine metapackage only depend on libwine-capi
 +    on architectures where it's actually built.
 +  * Updated the package list in README.Debian since the main
 +    binary package was renamed to wine-bin. Also deleted the
 +    section about the removal of wine.conf, as that's many
 +    years ago.
 +  * Upgraded debhelper compatibility level from 2 to 3.
 +    (I might go on to 4 when I'm sure that this level works).
 +  * Deleted ldconfig from the libwine postinst and postrm
 +    scripts, depending on debhelper to autogenerate them
 +    instead. Deleted the files since there was nothing
 +    left in them.
 +  * Deleted wine-bin.install. Install the two files that
 +    were listed there directly from debian/rules along with
 +    all the other manually-installed files of a similar nature.
 +    (This is to make a future transition from dh_movefiles
 +    to dh_install easier. The manual install rules could be
 +    cleaned up (moved back into .install files) afterwards,
 +    but right now I don't want them complicating things.)
 +  * Upgraded Standards-Version to 3.6.2
 +    (the wineserver is already in /usr/lib/wine, as it
 +    should be according to policy).
 +  * Fixed the unsubstituted @libdir@ in the wine manpage
 +    (should now properly say /usr/lib/wine/wineserver,
 +    instead of @libdir@/wine/wineserver).
 +  * Installed the net.exe application into wine-utils.
 +  * Installed the ntoskrnl.exe DLL into libwine.
 +  * Installed the winedevice.exe service into wine.
 +  * Building the package on a different computer; seems the
 +    hard drive on my regular system is starting to fail
 +    and I cannot rule out the possibility that my 0.9.43
 +    upload contained partially corrupted binaries.
 +
 + -- Ove Kaav