[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

aCaB acab at clamav.net
Sun Apr 4 00:59:30 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit bd3d39858f6e08ffc54f3c11908904fff5bffe01
Merge: a866b077aab87568e6313218527dc0a52203c845 ed91ea51a5f8987c5a7ecb0845d365c33ddf08f0
Author: aCaB <acab at clamav.net>
Date:   Thu Aug 6 01:00:28 2009 +0200

    Merge branch '7z'

diff --combined configure
index 914b238,597d752..e9cc4f0
--- 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 clamav devel.
+ # Generated by GNU Autoconf 2.64 for clamav devel.
  #
  # Report bugs to <http://bugs.clamav.net/>.
  #
  # 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
-   :
+ 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 as_func_ret_success failed.
- fi
- 
- if as_func_ret_failure; then
-   exitcode=1
-   echo as_func_ret_failure succeeded.
+   as_have_required=no
  fi
+   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
  
- 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; }
- ") 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: http://bugs.clamav.net/ about your system, including
+ $0: any error possibly output before this message. Then
+ $0: install a modern shell, or manually run the script
+ $0: under such a 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'"
  
  
- 
  lt_ltdl_dir='libltdl'
  
  
@@@ -742,7 -696,6 +696,6 @@@ cross_compiling=n
  subdirs=
  MFLAGS=
  MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
  
  # Identity of this package.
  PACKAGE_NAME='clamav'
@@@ -750,6 -703,7 +703,7 @@@ PACKAGE_TARNAME='clamav
  PACKAGE_VERSION='devel'
  PACKAGE_STRING='clamav devel'
  PACKAGE_BUGREPORT='http://bugs.clamav.net/'
+ PACKAGE_URL=''
  
  ac_unique_file="clamscan/clamscan.c"
  # Factoring default headers for most tests.
@@@ -956,6 -910,7 +910,7 @@@ bindi
  program_transform_name
  prefix
  exec_prefix
+ PACKAGE_URL
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
@@@ -1134,8 -1089,7 +1089,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
@@@ -1161,8 -1115,7 +1115,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
@@@ -1366,8 -1319,7 +1319,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
@@@ -1383,8 -1335,7 +1335,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
@@@ -1414,17 -1365,17 +1365,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 ;;
  
@@@ -1441,15 -1392,13 +1392,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
@@@ -1472,8 -1421,7 +1421,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'
@@@ -1503,11 -1451,9 +1451,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.
@@@ -1546,13 -1492,11 +1492,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
@@@ -1800,21 -1744,471 +1744,471 @@@ test -n "$ac_init_help" && exit $ac_sta
  if $ac_init_version; then
    cat <<\_ACEOF
  clamav configure devel
- generated by GNU Autoconf 2.63
+ 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_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_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_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_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_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_decl LINENO SYMBOL VAR
+ # ------------------------------------
+ # Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ ac_fn_c_check_decl ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+ $as_echo_n "checking whether $2 is declared... " >&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
+ int
+ main ()
+ {
+ #ifndef $2
+   (void) $2;
+ #endif
+ 
+   ;
+   return 0;
+ }
+ _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_decl
+ 
+ # 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
+ 
+ # 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 http://bugs.clamav.net/ ##
+ ## -------------------------------------- ##
+ _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
  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 clamav $as_me devel, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
  
@@@ -1850,8 -2244,8 +2244,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
@@@ -1888,9 -2282,9 +2282,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
@@@ -1906,13 -2300,13 +2300,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
@@@ -1937,13 -2331,13 +2331,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
@@@ -2015,39 -2409,41 +2409,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.
@@@ -2066,7 -2462,7 +2462,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"
@@@ -2077,7 -2473,7 +2473,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";;
@@@ -2085,7 -2481,7 +2481,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
@@@ -2100,11 -2496,11 +2496,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=: ;;
      ,);;
@@@ -2114,17 -2510,17 +2510,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
@@@ -2136,43 -2532,20 +2532,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'
@@@ -2184,24 -2557,16 +2557,16 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  ac_aux_dir=
  for ac_dir in config "$srcdir"/config; 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 config \"$srcdir\"/config" >&5
- $as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
  fi
  
  # These three variables are undocumented and unsupported,
@@@ -2220,35 -2585,27 +2585,27 @@@ ac_config_headers="$ac_config_headers c
  
  # 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='-'
@@@ -2264,28 -2621,24 +2621,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='-'
@@@ -2301,28 -2654,24 +2654,24 @@@ IFS=$ac_save_IF
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
- { $as_echo "$as_me:$LINENO: checking target system type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
  $as_echo_n "checking target system type... " >&6; }
- if test "${ac_cv_target+set}" = set; then
+ if test "${ac_cv_target+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test "x$target_alias" = x; then
    ac_cv_target=$ac_cv_host
  else
    ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-     { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
- $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
  fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
  $as_echo "$ac_cv_target" >&6; }
  case $ac_cv_target in
  *-*-*) ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
- $as_echo "$as_me: error: invalid value of canonical target" >&2;}
-    { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
@@@ -2345,6 -2694,7 +2694,7 @@@ test -n "$target_alias" &
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
+ 
  target_cpu_arch="unknown"
  case $target_cpu in
   i386*|i486*|i586*|i686*|i786*) target_cpu_arch=i386 ;;
@@@ -2401,7 -2751,7 +2751,7 @@@ target_cpu_arch0=`echo "$target_cpu_arc
  #
  #
  if $ac_need_target_h_file_new ; then
- { $as_echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_need_target_h_file - canonical system defines" >&5
  $as_echo "creating $ac_need_target_h_file - canonical system defines" >&6; }
  echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file
  echo /'*' on `date` '*'/ >>$ac_need_target_h_file
@@@ -2475,7 -2825,7 +2825,7 @@@ host_cpu_arch0=`echo "$host_cpu_arch" 
  #
  #
  if $ac_need_target_h_file_new ; then
- { $as_echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_need_target_h_file - canonical system defines" >&5
  $as_echo "creating $ac_need_target_h_file - canonical system defines" >&6; }
  echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file
  echo /'*' on `date` '*'/ >>$ac_need_target_h_file
@@@ -2548,10 -2898,10 +2898,10 @@@ am__api_version='1.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
@@@ -2559,11 -2909,11 +2909,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.
@@@ -2600,7 -2950,7 +2950,7 @@@
      ;;
  esac
  
- done
+   done
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
@@@ -2616,7 -2966,7 +2966,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}.
@@@ -2627,7 -2977,7 +2977,7 @@@ test -z "$INSTALL_SCRIPT" && INSTALL_SC
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
- { $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
@@@ -2651,11 -3001,8 +3001,8 @@@ if 
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
-       { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&5
- $as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&2;}
-    { (exit 1); exit 1; }; }
+       as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
     fi
  
     test "$2" = conftest.file
@@@ -2664,13 -3011,10 +3011,10 @@@ the
     # Ok.
     :
  else
-    { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
- Check your system clock" >&5
- $as_echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
+    as_fn_error "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@@ -2691,14 -3035,14 +3035,14 @@@ if eval "$MISSING --run true"; the
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
-   { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  if test -z "$MKDIR_P"; then
-   if test "${ac_cv_path_mkdir+set}" = set; then
+   if test "${ac_cv_path_mkdir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@@ -2706,7 -3050,7 +3050,7 @@@ for as_dir in $PATH$PATH_SEPARATOR/opt/
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in mkdir gmkdir; do
+     for ac_prog in mkdir gmkdir; do
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@@ -2718,7 -3062,7 +3062,7 @@@
  	   esac
  	 done
         done
- done
+   done
  IFS=$as_save_IFS
  
  fi
@@@ -2734,7 -3078,7 +3078,7 @@@
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
@@@ -2747,9 -3091,9 +3091,9 @@@ for ac_prog in gawk mawk nawk aw
  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_AWK+set}" = set; then
+ if test "${ac_cv_prog_AWK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
@@@ -2760,24 -3104,24 +3104,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_AWK="$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
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
-   { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
  $as_echo "$AWK" >&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
  
@@@ -2785,11 -3129,11 +3129,11 @@@
    test -n "$AWK" && break
  done
  
- { $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
@@@ -2807,11 -3151,11 +3151,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
@@@ -2831,9 -3175,7 +3175,7 @@@ if test "`cd $srcdir && pwd`" != "`pwd`
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
-     { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
    fi
  fi
  
@@@ -2878,9 -3220,9 +3220,9 @@@ if test "$cross_compiling" != no; the
    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
@@@ -2891,24 -3233,24 +3233,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
  
@@@ -2918,9 -3260,9 +3260,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
@@@ -2931,24 -3273,24 +3273,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
  
@@@ -2957,7 -3299,7 +3299,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
@@@ -2984,9 -3326,7 +3326,7 @@@ am__tar='${AMTAR} chof - "$$tardir"'; a
  
  
  
- cat >>confdefs.h <<\_ACEOF
- #define PACKAGE PACKAGE_NAME
- _ACEOF
+ $as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
  
  
  VERSION="devel-`date +%Y%m%d`"
@@@ -3006,9 -3346,9 +3346,9 @@@ for ac_prog in gawk mawk nawk aw
  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_AWK+set}" = set; then
+ if test "${ac_cv_prog_AWK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
@@@ -3019,24 -3359,24 +3359,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_AWK="$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
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
-   { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
  $as_echo "$AWK" >&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
  
@@@ -3044,115 -3384,23 +3384,23 @@@
    test -n "$AWK" && break
  done
  
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
- # SysV /etc/install, /usr/sbin/install
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
- # AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
- # Reject install programs that cannot install multiple files.
- { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- 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/* | \
-   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-   /usr/ucb/* ) ;;
-   *)
-     # OSF1 and SCO ODT 3.0 have their own names for install.
-     # Don't use installbsd from OSF since it installs stuff as root
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
- 	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
- 	    :
- 	  elif test $ac_prog = install &&
- 	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
- 	    rm -rf conftest.one conftest.two conftest.dir
- 	    echo one > conftest.one
- 	    echo two > conftest.two
- 	    mkdir conftest.dir
- 	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- 	      test -s conftest.one && test -s conftest.two &&
- 	      test -s conftest.dir/conftest.one &&
- 	      test -s conftest.dir/conftest.two
- 	    then
- 	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- 	      break 3
- 	    fi
- 	  fi
- 	fi
-       done
-     done
-     ;;
- esac
- 
- done
- IFS=$as_save_IFS
- 
- rm -rf conftest.one conftest.two conftest.dir
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
-     # As a last resort, use the slow shell script.  Don't cache a
-     # value for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
- { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
- $as_echo "$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- { $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 ${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
@@@ -3170,11 -3418,11 +3418,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
@@@ -3190,7 -3438,7 +3438,7 @@@
  
  case `pwd` in
    *\ * | *\	*)
-     { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
@@@ -3225,7 -3473,7 +3473,7 @@@ am__doit
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
- { $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
@@@ -3253,12 -3501,12 +3501,12 @@@ if test "$am__include" = "#"; the
  fi
  
  
- { $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  $as_echo "$_am_result" >&6; }
  rm -f confinc confmf
  
  # Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
+ if test "${enable_dependency_tracking+set}" = set; then :
    enableval=$enable_dependency_tracking;
  fi
  
@@@ -3283,9 -3531,9 +3531,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
@@@ -3296,24 -3544,24 +3544,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
  
@@@ -3323,9 -3571,9 +3571,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
@@@ -3336,24 -3584,24 +3584,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
  
@@@ -3362,7 -3610,7 +3610,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
@@@ -3376,9 -3624,9 +3624,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
@@@ -3389,24 -3637,24 +3637,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
  
@@@ -3416,9 -3664,9 +3664,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
@@@ -3430,18 -3678,18 +3678,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
@@@ -3460,10 -3708,10 +3708,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
  
@@@ -3475,9 -3723,9 +3723,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
@@@ -3488,24 -3736,24 +3736,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
  
@@@ -3519,9 -3767,9 +3767,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
@@@ -3532,24 -3780,24 +3780,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
  
@@@ -3562,7 -3810,7 +3810,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
@@@ -3573,73 -3821,55 +3821,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"
+ 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 --version >&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); }
- { (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[^ ]*//'`
  
@@@ -3656,17 -3886,17 +3886,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,
@@@ -3683,7 -3913,7 +3913,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
@@@ -3702,84 -3932,75 +3932,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
@@@ -3794,32 -4015,24 +4015,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
@@@ -3831,17 -4044,17 +4044,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
@@@ -3854,31 -4067,23 +4067,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
@@@ -3892,37 -4097,16 +4097,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
@@@ -3931,20 -4115,16 +4115,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
@@@ -3955,35 -4135,11 +4135,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
@@@ -3994,36 -4150,12 +4150,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
@@@ -4034,42 -4166,17 +4166,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
@@@ -4086,18 -4193,14 +4193,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>
@@@ -4154,32 -4257,9 +4257,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
@@@ -4190,17 -4270,19 +4270,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'
@@@ -4210,9 -4292,9 +4292,9 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  depcc="$CC"   am_compiler_list=
  
- { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  $as_echo_n "checking dependency style of $depcc... " >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@@ -4301,7 -4383,7 +4383,7 @@@ els
  fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
@@@ -4316,9 -4398,9 +4398,9 @@@ els
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
- if test "${ac_cv_path_SED+set}" = set; then
+ if test "${ac_cv_path_SED+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@@ -4326,7 -4408,7 +4408,7 @@@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-      $as_unset ac_script || ac_script=
+      { ac_script=; unset ac_script;}
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
@@@ -4335,7 -4417,7 +4417,7 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in sed gsed; do
+     for ac_prog in sed gsed; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@@ -4355,7 -4437,7 +4437,7 @@@ case `"$ac_path_SED" --version 2>&1` i
      $as_echo '' >> "conftest.nl"
      "$ac_path_SED" -f conftest.sed < "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_SED_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_SED="$ac_path_SED"
@@@ -4370,19 -4452,17 +4452,17 @@@ esa
        $ac_path_SED_found && break 3
      done
    done
- done
+   done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_SED"; then
-     { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
- $as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
    fi
  else
    ac_cv_path_SED=$SED
  fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
@@@ -4400,9 -4480,9 +4480,9 @@@ Xsed="$SED -e 1s/^X//
  
  
  
- { $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
@@@ -4413,7 -4493,7 +4493,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
@@@ -4433,7 -4513,7 +4513,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"
@@@ -4448,26 -4528,24 +4528,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
@@@ -4481,7 -4559,7 +4559,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
@@@ -4501,7 -4579,7 +4579,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"
@@@ -4516,12 -4594,10 +4594,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
@@@ -4529,14 -4605,14 +4605,14 @@@ 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"
  
  
- { $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  $as_echo_n "checking for fgrep... " >&6; }
- if test "${ac_cv_path_FGREP+set}" = set; then
+ if test "${ac_cv_path_FGREP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@@ -4550,7 -4626,7 +4626,7 @@@ for as_dir in $PATH$PATH_SEPARATOR/usr/
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in fgrep; do
+     for ac_prog in fgrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@@ -4570,7 -4646,7 +4646,7 @@@ case `"$ac_path_FGREP" --version 2>&1` 
      $as_echo 'FGREP' >> "conftest.nl"
      "$ac_path_FGREP" FGREP < "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_FGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_FGREP="$ac_path_FGREP"
@@@ -4585,12 -4661,10 +4661,10 @@@ esa
        $ac_path_FGREP_found && break 3
      done
    done
- done
+   done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_FGREP"; then
-     { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- $as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_FGREP=$FGREP
@@@ -4598,7 -4672,7 +4672,7 @@@ f
  
     fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
@@@ -4624,7 -4698,7 +4698,7 @@@ test -z "$GREP" && GREP=gre
  
  
  # Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
+ if test "${with_gnu_ld+set}" = set; then :
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
@@@ -4633,7 -4707,7 +4707,7 @@@ f
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
-   { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
@@@ -4663,13 -4737,13 +4737,13 @@@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
-   { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
  $as_echo_n "checking for GNU ld... " >&6; }
  else
-   { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
  $as_echo_n "checking for non-GNU ld... " >&6; }
  fi
- if test "${lt_cv_path_LD+set}" = set; then
+ if test "${lt_cv_path_LD+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
@@@ -4700,18 -4774,16 +4774,16 @@@ f
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
-   { $as_echo "$as_me:$LINENO: result: $LD" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
  $as_echo "$LD" >&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
- test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- $as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- { $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+ test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
  $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@@ -4724,7 -4796,7 +4796,7 @@@ case `$LD -v 2>&1 </dev/null` i
    ;;
  esac
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
@@@ -4736,9 -4808,9 +4808,9 @@@
  
  
  
- { $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
  $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
+ if test "${lt_cv_path_NM+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
@@@ -4785,7 -4857,7 +4857,7 @@@ els
    : ${lt_cv_path_NM=no}
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
@@@ -4796,9 -4868,9 +4868,9 @@@ els
    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_DUMPBIN+set}" = set; then
+ if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
@@@ -4809,24 -4881,24 +4881,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_DUMPBIN="$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
  DUMPBIN=$ac_cv_prog_DUMPBIN
  if test -n "$DUMPBIN"; then
-   { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
  $as_echo "$DUMPBIN" >&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
  
@@@ -4840,9 -4912,9 +4912,9 @@@ if test -z "$DUMPBIN"; 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_DUMPBIN+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
@@@ -4853,24 -4925,24 +4925,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_DUMPBIN="$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_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
  if test -n "$ac_ct_DUMPBIN"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
  $as_echo "$ac_ct_DUMPBIN" >&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
  
@@@ -4883,7 -4955,7 +4955,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
@@@ -4903,33 -4975,33 +4975,33 @@@ test -z "$NM" && NM=n
  
  
  
- { $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
  $as_echo_n "checking the name lister ($NM) interface... " >&6; }
- if test "${lt_cv_nm_interface+set}" = set; then
+ if test "${lt_cv_nm_interface+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
-   (eval echo "\"\$as_me:4913: $ac_compile\"" >&5)
+   (eval echo "\"\$as_me:4985: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
-   (eval echo "\"\$as_me:4916: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval echo "\"\$as_me:4988: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
-   (eval echo "\"\$as_me:4919: output\"" >&5)
+   (eval echo "\"\$as_me:4991: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
    fi
    rm -f conftest*
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
  $as_echo "$lt_cv_nm_interface" >&6; }
  
  # find the maximum length of command line arguments
- { $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
  $as_echo_n "checking the maximum length of command line arguments... " >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
      i=0
@@@ -5047,10 -5119,10 +5119,10 @@@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
-   { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
  $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: none" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
@@@ -5064,7 -5136,7 +5136,7 @@@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
- { $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
@@@ -5074,17 -5146,17 +5146,17 @@@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
- { $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
  $as_echo "$xsi_shell" >&6; }
  
  
- { $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
  $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
  lt_shell_append=no
  ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
      >/dev/null 2>&1 \
    && lt_shell_append=yes
- { $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
  $as_echo "$lt_shell_append" >&6; }
  
  
@@@ -5119,14 -5191,14 +5191,14 @@@ esa
  
  
  
- { $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
+ if test "${lt_cv_ld_reload_flag+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_reload_flag='-r'
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
@@@ -5155,9 -5227,9 +5227,9 @@@ esa
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+set}" = set; then
+ if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
@@@ -5168,24 -5240,24 +5240,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_OBJDUMP="${ac_tool_prefix}objdump"
-     $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
  OBJDUMP=$ac_cv_prog_OBJDUMP
  if test -n "$OBJDUMP"; then
-   { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
  $as_echo "$OBJDUMP" >&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
  
@@@ -5195,9 -5267,9 +5267,9 @@@ if test -z "$ac_cv_prog_OBJDUMP"; the
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; 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_OBJDUMP+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
@@@ -5208,24 -5280,24 +5280,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_OBJDUMP="objdump"
-     $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_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
  if test -n "$ac_ct_OBJDUMP"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
  $as_echo "$ac_ct_OBJDUMP" >&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
  
@@@ -5234,7 -5306,7 +5306,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
@@@ -5254,9 -5326,9 +5326,9 @@@ test -z "$OBJDUMP" && OBJDUMP=objdum
  
  
  
- { $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
  $as_echo_n "checking how to recognize dependent libraries... " >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
+ if test "${lt_cv_deplibs_check_method+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
@@@ -5450,7 -5522,7 +5522,7 @@@ tpf*
  esac
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
@@@ -5470,9 -5542,9 +5542,9 @@@ test -z "$deplibs_check_method" && depl
  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_AR+set}" = set; then
+ if test "${ac_cv_prog_AR+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
@@@ -5483,24 -5555,24 +5555,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}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
  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
  
@@@ -5510,9 -5582,9 +5582,9 @@@ if test -z "$ac_cv_prog_AR"; the
    ac_ct_AR=$AR
    # 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_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
@@@ -5523,24 -5595,24 +5595,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="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_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
  
@@@ -5549,7 -5621,7 +5621,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
@@@ -5575,9 -5647,9 +5647,9 @@@ test -z "$AR_FLAGS" && AR_FLAGS=cr
  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
@@@ -5588,24 -5660,24 +5660,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
  
@@@ -5615,9 -5687,9 +5687,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
@@@ -5628,24 -5700,24 +5700,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
  
@@@ -5654,7 -5726,7 +5726,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
@@@ -5674,9 -5746,9 +5746,9 @@@ test -z "$STRIP" && STRIP=
  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
@@@ -5687,24 -5759,24 +5759,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
  
@@@ -5714,9 -5786,9 +5786,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
@@@ -5727,24 -5799,24 +5799,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
  
@@@ -5753,7 -5825,7 +5825,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
@@@ -5831,9 -5903,9 +5903,9 @@@ compiler=$C
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
- { $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
  $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
@@@ -5949,18 -6021,18 +6021,18 @@@ void nm_test_func(void){
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      # Now try to grab the symbols.
      nlist=conftest.nm
-     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s "$nlist"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s "$nlist"; then
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
@@@ -6013,11 -6085,11 +6085,11 @@@ _LT_EO
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
@@@ -6051,10 -6123,10 +6123,10 @@@ if test -z "$lt_cv_sys_global_symbol_pi
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-   { $as_echo "$as_me:$LINENO: result: failed" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
  $as_echo "failed" >&6; }
  else
-   { $as_echo "$as_me:$LINENO: result: ok" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  fi
  
@@@ -6081,7 -6153,7 +6153,7 @@@
  
  
  # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
+ if test "${enable_libtool_lock+set}" = set; then :
    enableval=$enable_libtool_lock;
  fi
  
@@@ -6093,11 -6165,11 +6165,11 @@@ case $host i
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
@@@ -6111,12 -6183,12 +6183,12 @@@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
-   echo '#line 6114 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo '#line 6186 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
@@@ -6150,11 -6222,11 +6222,11 @@@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|pp
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
@@@ -6203,9 -6275,9 +6275,9 @@@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
-   { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
  $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
+ if test "${lt_cv_cc_needs_belf+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
@@@ -6214,11 -6286,7 +6286,7 @@@ ac_compile='$CC -c $CFLAGS $CPPFLAGS co
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-      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
@@@ -6229,38 -6297,13 +6297,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
+ if ac_fn_c_try_link "$LINENO"; then :
    lt_cv_cc_needs_belf=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	lt_cv_cc_needs_belf=no
+   lt_cv_cc_needs_belf=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
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@@ -6268,7 -6311,7 +6311,7 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
  $as_echo "$lt_cv_cc_needs_belf" >&6; }
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@@ -6278,11 -6321,11 +6321,11 @@@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
@@@ -6308,9 -6351,9 +6351,9 @@@ need_locks="$enable_libtool_lock
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+set}" = set; then
+ if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
@@@ -6321,24 -6364,24 +6364,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_DSYMUTIL="${ac_tool_prefix}dsymutil"
-     $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
  DSYMUTIL=$ac_cv_prog_DSYMUTIL
  if test -n "$DSYMUTIL"; then
-   { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
  $as_echo "$DSYMUTIL" >&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
  
@@@ -6348,9 -6391,9 +6391,9 @@@ if test -z "$ac_cv_prog_DSYMUTIL"; the
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; 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_DSYMUTIL+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
@@@ -6361,24 -6404,24 +6404,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_DSYMUTIL="dsymutil"
-     $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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
  if test -n "$ac_ct_DSYMUTIL"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
  $as_echo "$ac_ct_DSYMUTIL" >&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
  
@@@ -6387,7 -6430,7 +6430,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
@@@ -6400,9 -6443,9 +6443,9 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+set}" = set; then
+ if test "${ac_cv_prog_NMEDIT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
@@@ -6413,24 -6456,24 +6456,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_NMEDIT="${ac_tool_prefix}nmedit"
-     $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
  NMEDIT=$ac_cv_prog_NMEDIT
  if test -n "$NMEDIT"; then
-   { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
  $as_echo "$NMEDIT" >&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
  
@@@ -6440,9 -6483,9 +6483,9 @@@ if test -z "$ac_cv_prog_NMEDIT"; the
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; 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_NMEDIT+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
@@@ -6453,24 -6496,24 +6496,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_NMEDIT="nmedit"
-     $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_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  if test -n "$ac_ct_NMEDIT"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
  $as_echo "$ac_ct_NMEDIT" >&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
  
@@@ -6479,7 -6522,7 +6522,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
@@@ -6492,9 -6535,9 +6535,9 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  set dummy ${ac_tool_prefix}lipo; 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_LIPO+set}" = set; then
+ if test "${ac_cv_prog_LIPO+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
@@@ -6505,24 -6548,24 +6548,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_LIPO="${ac_tool_prefix}lipo"
-     $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
  LIPO=$ac_cv_prog_LIPO
  if test -n "$LIPO"; then
-   { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
  $as_echo "$LIPO" >&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
  
@@@ -6532,9 -6575,9 +6575,9 @@@ if test -z "$ac_cv_prog_LIPO"; the
    ac_ct_LIPO=$LIPO
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; 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_LIPO+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
@@@ -6545,24 -6588,24 +6588,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_LIPO="lipo"
-     $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_LIPO=$ac_cv_prog_ac_ct_LIPO
  if test -n "$ac_ct_LIPO"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
  $as_echo "$ac_ct_LIPO" >&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
  
@@@ -6571,7 -6614,7 +6614,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
@@@ -6584,9 -6627,9 +6627,9 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool; 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_OTOOL+set}" = set; then
+ if test "${ac_cv_prog_OTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
@@@ -6597,24 -6640,24 +6640,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_OTOOL="${ac_tool_prefix}otool"
-     $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
  OTOOL=$ac_cv_prog_OTOOL
  if test -n "$OTOOL"; then
-   { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
  $as_echo "$OTOOL" >&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
  
@@@ -6624,9 -6667,9 +6667,9 @@@ if test -z "$ac_cv_prog_OTOOL"; the
    ac_ct_OTOOL=$OTOOL
    # Extract the first word of "otool", so it can be a program name with args.
  set dummy otool; 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_OTOOL+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
@@@ -6637,24 -6680,24 +6680,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_OTOOL="otool"
-     $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_OTOOL=$ac_cv_prog_ac_ct_OTOOL
  if test -n "$ac_ct_OTOOL"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
  $as_echo "$ac_ct_OTOOL" >&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
  
@@@ -6663,7 -6706,7 +6706,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
@@@ -6676,9 -6719,9 +6719,9 @@@ f
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+set}" = set; then
+ if test "${ac_cv_prog_OTOOL64+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
@@@ -6689,24 -6732,24 +6732,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_OTOOL64="${ac_tool_prefix}otool64"
-     $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
  OTOOL64=$ac_cv_prog_OTOOL64
  if test -n "$OTOOL64"; then
-   { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
  $as_echo "$OTOOL64" >&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
  
@@@ -6716,9 -6759,9 +6759,9 @@@ if test -z "$ac_cv_prog_OTOOL64"; the
    ac_ct_OTOOL64=$OTOOL64
    # Extract the first word of "otool64", so it can be a program name with args.
  set dummy otool64; 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_OTOOL64+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
@@@ -6729,24 -6772,24 +6772,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_OTOOL64="otool64"
-     $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_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
  if test -n "$ac_ct_OTOOL64"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
  $as_echo "$ac_ct_OTOOL64" >&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
  
@@@ -6755,7 -6798,7 +6798,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
@@@ -6791,9 -6834,9 +6834,9 @@@ f
  
  
  
-     { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
  $as_echo_n "checking for -single_module linker flag... " >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
@@@ -6818,22 -6861,18 +6861,18 @@@
  	rm -f conftest.*
        fi
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
  $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-     { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
  $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_exported_symbols_list=no
        save_LDFLAGS=$LDFLAGS
        echo "_main" > conftest.sym
        LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-       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
@@@ -6844,42 -6883,17 +6883,17 @@@ 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 :
    lt_cv_ld_exported_symbols_list=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	lt_cv_ld_exported_symbols_list=no
+   lt_cv_ld_exported_symbols_list=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
  	LDFLAGS="$save_LDFLAGS"
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
@@@ -6921,14 -6935,14 +6935,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
@@@ -6943,11 -6957,7 +6957,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>
@@@ -6956,78 -6966,34 +6966,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
  
@@@ -7039,7 -7005,7 +7005,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
@@@ -7050,11 -7016,7 +7016,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>
@@@ -7063,87 -7025,40 +7025,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
@@@ -7153,16 -7068,12 +7068,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>
@@@ -7177,48 -7088,23 +7088,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
@@@ -7228,18 -7114,14 +7114,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
@@@ -7249,14 -7131,10 +7131,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>
@@@ -7283,118 -7161,34 +7161,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
@@@ -7404,62 -7198,13 +7198,13 @@@ f
  done
  
  
- 
  for ac_header in dlfcn.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 :
+   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
+ if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_DLFCN_H 1
  _ACEOF
  
  fi
@@@ -7478,7 -7223,7 +7223,7 @@@ enable_dlopen=ye
  
  
              # Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
+ if test "${enable_shared+set}" = set; then :
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
@@@ -7509,7 -7254,7 +7254,7 @@@ f
  
  
    # Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
+ if test "${enable_static+set}" = set; then :
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
@@@ -7541,7 -7286,7 +7286,7 @@@ f
  
  
  # Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
+ if test "${with_pic+set}" = set; then :
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
@@@ -7557,7 -7302,7 +7302,7 @@@ test -z "$pic_mode" && pic_mode=defaul
  
  
    # Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
+ if test "${enable_fast_install+set}" = set; then :
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
@@@ -7638,9 -7383,9 +7383,9 @@@ if test -n "${ZSH_VERSION+set}" ; the
     setopt NO_GLOB_SUBST
  fi
  
- { $as_echo "$as_me:$LINENO: checking for objdir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
  $as_echo_n "checking for objdir... " >&6; }
- if test "${lt_cv_objdir+set}" = set; then
+ if test "${lt_cv_objdir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
@@@ -7653,7 -7398,7 +7398,7 @@@ els
  fi
  rmdir .libs 2>/dev/null
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
@@@ -7746,9 -7491,9 +7491,9 @@@ test -z "$MAGIC_CMD" && MAGIC_CMD=fil
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-     { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
  $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
@@@ -7799,10 -7544,10 +7544,10 @@@ f
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
-   { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
  $as_echo "$MAGIC_CMD" >&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
  
@@@ -7812,9 -7557,9 +7557,9 @@@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
-     { $as_echo "$as_me:$LINENO: checking for file" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
  $as_echo_n "checking for file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
@@@ -7865,10 -7610,10 +7610,10 @@@ f
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
-   { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
  $as_echo "$MAGIC_CMD" >&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
  
@@@ -7949,9 -7694,9 +7694,9 @@@ lt_prog_compiler_no_builtin_flag
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
-   { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
@@@ -7967,11 -7712,11 +7712,11 @@@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:7970: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:7715: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:7974: \$? = $ac_status" >&5
+    echo "$as_me:7719: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@@ -7984,7 -7729,7 +7729,7 @@@
     $RM conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@@ -8004,7 -7749,7 +7749,7 @@@ f
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
- { $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
@@@ -8276,7 -8021,7 +8021,7 @@@ case $host_os i
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
- { $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
@@@ -8288,9 -8033,9 +8033,9 @@@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
-   { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
@@@ -8306,11 -8051,11 +8051,11 @@@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:8309: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8054: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:8313: \$? = $ac_status" >&5
+    echo "$as_me:8058: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@@ -8323,7 -8068,7 +8068,7 @@@
     $RM conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@@ -8347,9 -8092,9 +8092,9 @@@ f
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
@@@ -8375,7 -8120,7 +8120,7 @@@
     LDFLAGS="$save_LDFLAGS"
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@@ -8390,9 -8135,9 +8135,9 @@@ f
  
  
  
-   { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
  $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
@@@ -8411,11 -8156,11 +8156,11 @@@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:8414: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8159: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:8418: \$? = $ac_status" >&5
+    echo "$as_me:8163: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@@ -8437,7 -8182,7 +8182,7 @@@
     $RM conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
@@@ -8445,9 -8190,9 +8190,9 @@@
  
  
  
-   { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
  $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
@@@ -8466,11 -8211,11 +8211,11 @@@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:8469: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8214: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:8473: \$? = $ac_status" >&5
+    echo "$as_me:8218: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@@ -8492,7 -8237,7 +8237,7 @@@
     $RM conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
@@@ -8501,7 -8246,7 +8246,7 @@@
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
-   { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
@@@ -8509,10 -8254,10 +8254,10 @@@
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
  $as_echo "$hard_links" >&6; }
    if test "$hard_links" = no; then
-     { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
@@@ -8525,7 -8270,7 +8270,7 @@@ f
  
  
  
-   { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
@@@ -8971,11 -8716,7 +8716,7 @@@ _LT_EO
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
-         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
@@@ -8986,27 -8727,7 +8727,7 @@@ 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 :
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
@@@ -9020,16 -8741,9 +8741,9 @@@ aix_libpath=`dump -H conftest$ac_exeex
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
- 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
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@@ -9042,11 -8756,7 +8756,7 @@@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
- 	 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
@@@ -9057,27 -8767,7 +8767,7 @@@ 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 :
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
@@@ -9091,16 -8781,9 +8781,9 @@@ aix_libpath=`dump -H conftest$ac_exeex
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
- 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
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@@ -9312,42 -8995,16 +8995,16 @@@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-         cat >conftest.$ac_ext <<_ACEOF
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  int foo(void) {}
  _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 :
    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  
- 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
          LDFLAGS="$save_LDFLAGS"
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@@ -9603,7 -9260,7 +9260,7 @@@
      fi
    fi
  
- { $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
@@@ -9640,16 -9297,16 +9297,16 @@@ x|xyes
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
-       { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
  $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
        $RM conftest*
        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } 2>conftest.err; then
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
@@@ -9663,11 -9320,11 +9320,11 @@@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
    (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
          then
  	  archive_cmds_need_lc=no
          else
@@@ -9678,7 -9335,7 +9335,7 @@@
          cat conftest.err 1>&5
        fi
        $RM conftest*
-       { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
@@@ -9842,7 -9499,7 +9499,7 @@@ esa
  
  
  
-   { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
@@@ -10264,11 -9921,7 +9921,7 @@@ linux* | k*bsd*-gnu
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-   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
@@@ -10279,41 -9932,13 +9932,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
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ if ac_fn_c_try_link "$LINENO"; then :
+   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
    shlibpath_overrides_runpath=yes
  fi
- 
- 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
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
@@@ -10537,7 -10162,7 +10162,7 @@@ uts4*
    dynamic_linker=no
    ;;
  esac
- { $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
@@@ -10639,7 -10264,7 +10264,7 @@@ f
  
  
  
-   { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
@@@ -10664,7 -10289,7 +10289,7 @@@ els
    # directories.
    hardcode_action=unsupported
  fi
- { $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
@@@ -10709,18 -10334,14 +10334,14 @@@ els
  
    darwin*)
    # if libdl is installed we need to link against it
-     { $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.
@@@ -10738,43 -10359,18 +10359,18 @@@ 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
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
@@@ -10787,106 -10383,18 +10383,18 @@@ f
      ;;
  
    *)
-     { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
- $as_echo_n "checking for shl_load... " >&6; }
- if test "${ac_cv_func_shl_load+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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define shl_load innocuous_shl_load
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shl_load (); 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 shl_load
- 
- /* 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 shl_load ();
- /* 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_shl_load || defined __stub___shl_load
- choke me
- #endif
- 
- int
- main ()
- {
- return shl_load ();
-   ;
-   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_shl_load=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_shl_load=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_shl_load" >&5
- $as_echo "$ac_cv_func_shl_load" >&6; }
- if test "x$ac_cv_func_shl_load" = x""yes; then
+     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+ if test "x$ac_cv_func_shl_load" = x""yes; then :
    lt_cv_dlopen="shl_load"
  else
-   { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
  $as_echo_n "checking for shl_load in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $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.
@@@ -10904,145 -10412,32 +10412,32 @@@ return shl_load ()
    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_dld_shl_load=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_shl_load=no
+   ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
  $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
- if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+ if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  else
-   { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
- $as_echo_n "checking for dlopen... " >&6; }
- if test "${ac_cv_func_dlopen+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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define dlopen innocuous_dlopen
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlopen (); 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 dlopen
- 
- /* 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 dlopen ();
- /* 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_dlopen || defined __stub___dlopen
- choke me
- #endif
- 
- int
- main ()
- {
- 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
-   ac_cv_func_dlopen=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_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
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- $as_echo "$ac_cv_func_dlopen" >&6; }
- if test "x$ac_cv_func_dlopen" = x""yes; then
+   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+ if test "x$ac_cv_func_dlopen" = x""yes; then :
    lt_cv_dlopen="dlopen"
  else
-   { $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.
@@@ -11060,57 -10455,28 +10455,28 @@@ 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
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-   { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
  $as_echo_n "checking for dlopen in -lsvld... " >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsvld  $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.
@@@ -11128,57 -10494,28 +10494,28 @@@ 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_svld_dlopen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_svld_dlopen=no
+   ac_cv_lib_svld_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_svld_dlopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
  $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
- if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+ if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
  else
-   { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
  $as_echo_n "checking for dld_link in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $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.
@@@ -11196,43 -10533,18 +10533,18 @@@ return dld_link ()
    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_dld_dld_link=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_dld_link=no
+   ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
  $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
- if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+ if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
@@@ -11271,9 -10583,9 +10583,9 @@@ f
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
-     { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
  $as_echo_n "checking whether a program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
+ if test "${lt_cv_dlopen_self+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
@@@ -11282,7 -10594,7 +10594,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 11285 "configure"
+ #line 10597 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -11341,11 -10653,11 +10653,11 @@@ int main (
    return status;
  }
  _LT_EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
@@@ -11362,14 -10674,14 +10674,14 @@@ rm -fr conftest
  
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
  $as_echo "$lt_cv_dlopen_self" >&6; }
  
      if test "x$lt_cv_dlopen_self" = xyes; then
        wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
  $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
+ if test "${lt_cv_dlopen_self_static+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
@@@ -11378,7 -10690,7 +10690,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 11381 "configure"
+ #line 10693 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -11437,11 -10749,11 +10749,11 @@@ int main (
    return status;
  }
  _LT_EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
@@@ -11458,7 -10770,7 +10770,7 @@@ rm -fr conftest
  
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
@@@ -11497,12 -10809,12 +10809,12 @@@ f
  
  striplib=
  old_striplib=
- { $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
  $as_echo_n "checking whether stripping libraries is possible... " >&6; }
  if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
    test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
    test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
@@@ -11511,15 -10823,15 +10823,15 @@@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
-       { $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" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
      fi
      ;;
    *)
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
      ;;
    esac
@@@ -11537,12 -10849,12 +10849,12 @@@ f
  
  
    # Report which library types will actually be built
-   { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
  $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-   { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
  $as_echo "$can_build_shared" >&6; }
  
-   { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
@@@ -11563,14 -10875,14 +10875,14 @@@
      fi
      ;;
    esac
-   { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
  $as_echo "$enable_shared" >&6; }
  
-   { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
  $as_echo_n "checking whether to build static libraries... " >&6; }
    # Make sure either enable_shared or enable_static is yes.
    test "$enable_shared" = yes || enable_static=yes
-   { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
  $as_echo "$enable_static" >&6; }
  
  
@@@ -11605,9 -10917,9 +10917,9 @@@ CC="$lt_save_CC
  # Only expand once:
  
  
- { $as_echo "$as_me:$LINENO: checking which extension is used for runtime loadable modules" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which extension is used for runtime loadable modules" >&5
  $as_echo_n "checking which extension is used for runtime loadable modules... " >&6; }
- if test "${libltdl_cv_shlibext+set}" = set; then
+ if test "${libltdl_cv_shlibext+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
@@@ -11615,7 -10927,7 +10927,7 @@@ module=ye
  eval libltdl_cv_shlibext=$shrext_cmds
  
  fi
- { $as_echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_shlibext" >&5
  $as_echo "$libltdl_cv_shlibext" >&6; }
  if test -n "$libltdl_cv_shlibext"; then
  
@@@ -11625,14 -10937,14 +10937,14 @@@ _ACEO
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking which variable specifies run-time module search path" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variable specifies run-time module search path" >&5
  $as_echo_n "checking which variable specifies run-time module search path... " >&6; }
- if test "${lt_cv_module_path_var+set}" = set; then
+ if test "${lt_cv_module_path_var+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_module_path_var="$shlibpath_var"
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_module_path_var" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_module_path_var" >&5
  $as_echo "$lt_cv_module_path_var" >&6; }
  if test -n "$lt_cv_module_path_var"; then
  
@@@ -11642,14 -10954,14 +10954,14 @@@ _ACEO
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for the default library search path" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the default library search path" >&5
  $as_echo_n "checking for the default library search path... " >&6; }
- if test "${lt_cv_sys_dlsearch_path+set}" = set; then
+ if test "${lt_cv_sys_dlsearch_path+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_dlsearch_path" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_dlsearch_path" >&5
  $as_echo "$lt_cv_sys_dlsearch_path" >&6; }
  if test -n "$lt_cv_sys_dlsearch_path"; then
    sys_dlsearch_path=
@@@ -11679,17 -10991,13 +10991,13 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  
  LIBADD_DLOPEN=
- { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
  $as_echo_n "checking for library containing dlopen... " >&6; }
- if test "${ac_cv_search_dlopen+set}" = set; then
+ if test "${ac_cv_search_dlopen+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.
@@@ -11714,59 -11022,30 +11022,30 @@@ for ac_lib in '' dl; 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_dlopen=$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_dlopen+set}" = set; then
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_dlopen+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_dlopen+set}" = set; then
-   :
+ if test "${ac_cv_search_dlopen+set}" = set; then :
+ 
  else
    ac_cv_search_dlopen=no
  fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
  $as_echo "$ac_cv_search_dlopen" >&6; }
  ac_res=$ac_cv_search_dlopen
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
+ $as_echo "#define HAVE_LIBDL 1" >>confdefs.h
  
  	if test "$ac_cv_search_dlopen" != "none required" ; then
  	  LIBADD_DLOPEN="-ldl"
@@@ -11774,11 -11053,7 +11053,7 @@@
  	libltdl_cv_lib_dl_dlopen="yes"
  	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
  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.  */
  #if HAVE_DLFCN_H
  #  include <dlfcn.h>
@@@ -11792,50 -11067,21 +11067,21 @@@ dlopen(0, 0)
    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_LIBDL 1
- _ACEOF
+ $as_echo "#define HAVE_LIBDL 1" >>confdefs.h
  
  	    libltdl_cv_func_dlopen="yes"
  	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	{ $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
  $as_echo_n "checking for dlopen in -lsvld... " >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsvld  $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.
@@@ -11853,159 -11099,40 +11099,40 @@@ 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_svld_dlopen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_svld_dlopen=no
+   ac_cv_lib_svld_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_svld_dlopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
  $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
- if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+ if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
+ $as_echo "#define HAVE_LIBDL 1" >>confdefs.h
  
  	        LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
  		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
  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
  fi
  
  if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
  then
    lt_save_LIBS="$LIBS"
    LIBS="$LIBS $LIBADD_DLOPEN"
- 
- for ac_func in dlerror
- 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 dlerror
+ do :
+   ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror"
+ if test "x$ac_cv_func_dlerror" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_DLERROR 1
  _ACEOF
  
  fi
@@@ -12016,111 -11143,21 +11143,21 @@@ f
  
  
  LIBADD_SHL_LOAD=
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
- $as_echo_n "checking for shl_load... " >&6; }
- if test "${ac_cv_func_shl_load+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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define shl_load innocuous_shl_load
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shl_load (); 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 shl_load
- 
- /* 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 shl_load ();
- /* 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_shl_load || defined __stub___shl_load
- choke me
- #endif
- 
- int
- main ()
- {
- return shl_load ();
-   ;
-   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_shl_load=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_shl_load=no
- fi
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+ if test "x$ac_cv_func_shl_load" = 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_shl_load" >&5
- $as_echo "$ac_cv_func_shl_load" >&6; }
- if test "x$ac_cv_func_shl_load" = x""yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SHL_LOAD 1
- _ACEOF
+ $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
  
  	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
  else
-   { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
  $as_echo_n "checking for shl_load in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $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.
@@@ -12138,47 -11175,20 +11175,20 @@@ return shl_load ()
    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_dld_shl_load=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_shl_load=no
+   ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
  $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
- if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+ if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SHL_LOAD 1
- _ACEOF
+ $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
  
  	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
  	    LIBADD_SHL_LOAD="-ldld"
@@@ -12191,96 -11201,10 +11201,10 @@@ f
  case $host_os in
  darwin[1567].*)
  # We only want this for pre-Mac OS X 10.4.
-   { $as_echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
- $as_echo_n "checking for _dyld_func_lookup... " >&6; }
- if test "${ac_cv_func__dyld_func_lookup+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 _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define _dyld_func_lookup innocuous__dyld_func_lookup
- 
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _dyld_func_lookup (); 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
+   ac_fn_c_check_func "$LINENO" "_dyld_func_lookup" "ac_cv_func__dyld_func_lookup"
+ if test "x$ac_cv_func__dyld_func_lookup" = x""yes; then :
  
- #undef _dyld_func_lookup
- 
- /* 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 _dyld_func_lookup ();
- /* 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__dyld_func_lookup || defined __stub____dyld_func_lookup
- choke me
- #endif
- 
- int
- main ()
- {
- return _dyld_func_lookup ();
-   ;
-   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__dyld_func_lookup=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func__dyld_func_lookup=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__dyld_func_lookup" >&5
- $as_echo "$ac_cv_func__dyld_func_lookup" >&6; }
- if test "x$ac_cv_func__dyld_func_lookup" = x""yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DYLD 1
- _ACEOF
+ $as_echo "#define HAVE_DYLD 1" >>confdefs.h
  
  	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"
  fi
@@@ -12290,92 -11214,30 +11214,30 @@@ beos*
    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
    ;;
  cygwin* | mingw* | os2* | pw32*)
-   { $as_echo "$as_me:$LINENO: checking whether cygwin_conv_path is declared" >&5
- $as_echo_n "checking whether cygwin_conv_path is declared... " >&6; }
- if test "${ac_cv_have_decl_cygwin_conv_path+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/cygwin.h>
- 
- int
- main ()
- {
- #ifndef cygwin_conv_path
-   (void) cygwin_conv_path;
- #endif
- 
-   ;
-   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_have_decl_cygwin_conv_path=yes
+   ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h>
+ "
+ if test "x$ac_cv_have_decl_cygwin_conv_path" = x""yes; then :
+   ac_have_decl=1
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_decl_cygwin_conv_path=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_have_decl=0
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_cygwin_conv_path" >&5
- $as_echo "$ac_cv_have_decl_cygwin_conv_path" >&6; }
- if test "x$ac_cv_have_decl_cygwin_conv_path" = x""yes; then
  
  cat >>confdefs.h <<_ACEOF
- #define HAVE_DECL_CYGWIN_CONV_PATH 1
+ #define HAVE_DECL_CYGWIN_CONV_PATH $ac_have_decl
  _ACEOF
  
- 
- else
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_DECL_CYGWIN_CONV_PATH 0
- _ACEOF
- 
- 
- fi
- 
- 
    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
    ;;
  esac
  
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
  $as_echo_n "checking for dld_link in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $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.
@@@ -12393,47 -11255,20 +11255,20 @@@ return dld_link ()
    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_dld_dld_link=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_dld_link=no
+   ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
  $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
- if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+ if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLD 1
- _ACEOF
+ $as_echo "#define HAVE_DLD 1" >>confdefs.h
  
  		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"
  fi
@@@ -12448,9 -11283,7 +11283,7 @@@ the
      LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
    done
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBDLLOADER 1
- _ACEOF
+ $as_echo "#define HAVE_LIBDLLOADER 1" >>confdefs.h
  
  fi
  
@@@ -12465,9 -11298,9 +11298,9 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
- { $as_echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix in compiled symbols" >&5
  $as_echo_n "checking for _ prefix in compiled symbols... " >&6; }
- if test "${lt_cv_sys_symbol_underscore+set}" = set; then
+ if test "${lt_cv_sys_symbol_underscore+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    lt_cv_sys_symbol_underscore=no
@@@ -12475,18 -11308,18 +11308,18 @@@
  void nm_test_func(){}
  int main(){nm_test_func;return 0;}
  _LT_EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&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
      # Now try to grab the symbols.
      ac_nlist=conftest.nm
-     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
+     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\""; } >&5
    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s "$ac_nlist"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s "$ac_nlist"; then
        # See whether the symbols have a leading underscore.
        if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
          lt_cv_sys_symbol_underscore=yes
@@@ -12507,7 -11340,7 +11340,7 @@@
    rm -rf conftest*
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_symbol_underscore" >&5
  $as_echo "$lt_cv_sys_symbol_underscore" >&6; }
    sys_symbol_underscore=$lt_cv_sys_symbol_underscore
  
@@@ -12515,9 -11348,9 +11348,9 @@@
  if test x"$lt_cv_sys_symbol_underscore" = xyes; then
    if test x"$libltdl_cv_func_dlopen" = xyes ||
       test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
- 	{ $as_echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have to add an underscore for dlsym" >&5
  $as_echo_n "checking whether we have to add an underscore for dlsym... " >&6; }
- if test "${libltdl_cv_need_uscore+set}" = set; then
+ if test "${libltdl_cv_need_uscore+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    libltdl_cv_need_uscore=unknown
@@@ -12529,7 -11362,7 +11362,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 12532 "configure"
+ #line 11365 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -12588,11 -11421,11 +11421,11 @@@ int main (
    return status;
  }
  _LT_EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
@@@ -12610,22 -11443,20 +11443,20 @@@ rm -fr conftest
  	  LIBS="$save_LIBS"
  
  fi
- { $as_echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_need_uscore" >&5
  $as_echo "$libltdl_cv_need_uscore" >&6; }
    fi
  fi
  
  if test x"$libltdl_cv_need_uscore" = xyes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define NEED_USCORE 1
- _ACEOF
+ $as_echo "#define NEED_USCORE 1" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether deplibs are loaded by dlopen" >&5
  $as_echo_n "checking whether deplibs are loaded by dlopen... " >&6; }
- if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then
+ if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    # PORTME does your system automatically load deplibs for dlopen?
@@@ -12717,74 -11548,23 +11548,23 @@@
    esac
  
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_dlopen_deplibs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_dlopen_deplibs" >&5
  $as_echo "$lt_cv_sys_dlopen_deplibs" >&6; }
  if test "$lt_cv_sys_dlopen_deplibs" != yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define LTDL_DLOPEN_DEPLIBS 1
- _ACEOF
+ $as_echo "#define LTDL_DLOPEN_DEPLIBS 1" >>confdefs.h
  
  fi
  
  :
  
- 
  for ac_header in argz.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 :
+   ac_fn_c_check_header_compile "$LINENO" "argz.h" "ac_cv_header_argz_h" "$ac_includes_default
+ "
+ if test "x$ac_cv_header_argz_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_ARGZ_H 1
  _ACEOF
  
  fi
@@@ -12792,107 -11572,11 +11572,11 @@@
  done
  
  
- { $as_echo "$as_me:$LINENO: checking for error_t" >&5
- $as_echo_n "checking for error_t... " >&6; }
- if test "${ac_cv_type_error_t+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_type_error_t=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #if defined(HAVE_ARGZ_H)
- #  include <argz.h>
- #endif
- 
- int
- main ()
- {
- if (sizeof (error_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.  */
- #if defined(HAVE_ARGZ_H)
+ ac_fn_c_check_type "$LINENO" "error_t" "ac_cv_type_error_t" "#if defined(HAVE_ARGZ_H)
  #  include <argz.h>
  #endif
- 
- int
- main ()
- {
- if (sizeof ((error_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_error_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_error_t" >&5
- $as_echo "$ac_cv_type_error_t" >&6; }
- if test "x$ac_cv_type_error_t" = x""yes; then
+ "
+ if test "x$ac_cv_type_error_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_ERROR_T 1
@@@ -12901,120 -11585,22 +11585,22 @@@ _ACEO
  
  else
  
- cat >>confdefs.h <<\_ACEOF
- #define error_t int
- _ACEOF
+ $as_echo "#define error_t int" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define __error_t_defined 1
- _ACEOF
+ $as_echo "#define __error_t_defined 1" >>confdefs.h
  
  fi
  
  
  ARGZ_H=
- 
- 
- 
- 
- 
- 
- 
  for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
  	argz_next argz_stringify
- 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
@@@ -13028,10 -11614,10 +11614,10 @@@ f
  done
  
  
- if test -z "$ARGZ_H"; then
-   { $as_echo "$as_me:$LINENO: checking if argz actually works" >&5
+ if test -z "$ARGZ_H"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if argz actually works" >&5
  $as_echo_n "checking if argz actually works... " >&6; }
- if test "${lt_cv_sys_argz_works+set}" = set; then
+ if test "${lt_cv_sys_argz_works+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $host_os in #(
@@@ -13060,13 -11646,11 +11646,11 @@@
  	 *) lt_cv_sys_argz_works=yes ;;
  	 esac
  fi
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_argz_works" >&5
  $as_echo "$lt_cv_sys_argz_works" >&6; }
-      if test $lt_cv_sys_argz_works = yes; then
+      if test $lt_cv_sys_argz_works = yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_WORKING_ARGZ 1
- _ACEOF
+ $as_echo "#define HAVE_WORKING_ARGZ 1" >>confdefs.h
  
  else
    ARGZ_H=argz.h
@@@ -13075,15 -11659,13 +11659,13 @@@
    _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
  
  fi
- 
  fi
  
  
  
- 
- { $as_echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libtool supports -dlopen/-dlpreopen" >&5
  $as_echo_n "checking whether libtool supports -dlopen/-dlpreopen... " >&6; }
- if test "${libltdl_cv_preloaded_symbols+set}" = set; then
+ if test "${libltdl_cv_preloaded_symbols+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$lt_cv_sys_global_symbol_pipe"; then
@@@ -13093,13 -11675,11 +11675,11 @@@
    fi
  
  fi
- { $as_echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_preloaded_symbols" >&5
  $as_echo "$libltdl_cv_preloaded_symbols" >&6; }
  if test x"$libltdl_cv_preloaded_symbols" = xyes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRELOADED_SYMBOLS 1
- _ACEOF
+ $as_echo "#define HAVE_PRELOADED_SYMBOLS 1" >>confdefs.h
  
  fi
  
@@@ -13116,7 -11696,7 +11696,7 @@@
  
  
  # Check whether --with-included_ltdl was given.
- if test "${with_included_ltdl+set}" = set; then
+ if test "${with_included_ltdl+set}" = set; then :
    withval=$with_included_ltdl;
  fi
  
@@@ -13124,121 -11704,22 +11704,22 @@@
  if test "x$with_included_ltdl" != xyes; then
    # We are not being forced to use the included libltdl sources, so
    # decide whether there is a useful installed version we can use.
-   { $as_echo "$as_me:$LINENO: checking for ltdl.h" >&5
- $as_echo_n "checking for ltdl.h... " >&6; }
- if test "${ac_cv_header_ltdl_h+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
+   ac_fn_c_check_header_compile "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default
  
- 
- #include <ltdl.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_cv_header_ltdl_h=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_ltdl_h=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
- $as_echo "$ac_cv_header_ltdl_h" >&6; }
- if test "x$ac_cv_header_ltdl_h" = x""yes; then
-   { $as_echo "$as_me:$LINENO: checking whether lt_dlinterface_register is declared" >&5
- $as_echo_n "checking whether lt_dlinterface_register is declared... " >&6; }
- if test "${ac_cv_have_decl_lt_dlinterface_register+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
+ "
+ if test "x$ac_cv_header_ltdl_h" = x""yes; then :
+   ac_fn_c_check_decl "$LINENO" "lt_dlinterface_register" "ac_cv_have_decl_lt_dlinterface_register" "$ac_includes_default
  	    #include <ltdl.h>
- 
- int
- main ()
- {
- #ifndef lt_dlinterface_register
-   (void) lt_dlinterface_register;
- #endif
- 
-   ;
-   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_have_decl_lt_dlinterface_register=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_decl_lt_dlinterface_register=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_lt_dlinterface_register" >&5
- $as_echo "$ac_cv_have_decl_lt_dlinterface_register" >&6; }
- if test "x$ac_cv_have_decl_lt_dlinterface_register" = x""yes; then
-   { $as_echo "$as_me:$LINENO: checking for lt_dladvise_preload in -lltdl" >&5
+ "
+ if test "x$ac_cv_have_decl_lt_dlinterface_register" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dladvise_preload in -lltdl" >&5
  $as_echo_n "checking for lt_dladvise_preload in -lltdl... " >&6; }
- if test "${ac_cv_lib_ltdl_lt_dladvise_preload+set}" = set; then
+ if test "${ac_cv_lib_ltdl_lt_dladvise_preload+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lltdl  $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.
@@@ -13256,43 -11737,18 +11737,18 @@@ return lt_dladvise_preload ()
    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_ltdl_lt_dladvise_preload=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_ltdl_lt_dladvise_preload=no
+   ac_cv_lib_ltdl_lt_dladvise_preload=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_ltdl_lt_dladvise_preload" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dladvise_preload" >&5
  $as_echo "$ac_cv_lib_ltdl_lt_dladvise_preload" >&6; }
- if test "x$ac_cv_lib_ltdl_lt_dladvise_preload" = x""yes; then
+ if test "x$ac_cv_lib_ltdl_lt_dladvise_preload" = x""yes; then :
    with_included_ltdl=no
  else
    with_included_ltdl=yes
@@@ -13313,7 -11769,7 +11769,7 @@@ f
  
  
  # Check whether --with-ltdl_include was given.
- if test "${with_ltdl_include+set}" = set; then
+ if test "${with_ltdl_include+set}" = set; then :
    withval=$with_ltdl_include;
  fi
  
@@@ -13321,9 -11777,7 +11777,7 @@@
  if test -n "$with_ltdl_include"; then
    if test -f "$with_ltdl_include/ltdl.h"; then :
    else
-     { { $as_echo "$as_me:$LINENO: error: invalid ltdl include directory: \`$with_ltdl_include'" >&5
- $as_echo "$as_me: error: invalid ltdl include directory: \`$with_ltdl_include'" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5
    fi
  else
    with_ltdl_include=no
@@@ -13331,7 -11785,7 +11785,7 @@@ f
  
  
  # Check whether --with-ltdl_lib was given.
- if test "${with_ltdl_lib+set}" = set; then
+ if test "${with_ltdl_lib+set}" = set; then :
    withval=$with_ltdl_lib;
  fi
  
@@@ -13339,9 -11793,7 +11793,7 @@@
  if test -n "$with_ltdl_lib"; then
    if test -f "$with_ltdl_lib/libltdl.la"; then :
    else
-     { { $as_echo "$as_me:$LINENO: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&5
- $as_echo "$as_me: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "invalid ltdl library directory: \`$with_ltdl_lib'" "$LINENO" 5
    fi
  else
    with_ltdl_lib=no
@@@ -13350,9 -11802,7 +11802,7 @@@ f
  case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
    ,yes,no,no,)
  	case $enable_ltdl_convenience in
-   no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
- $as_echo "$as_me: error: this package needs a convenience libltdl" >&2;}
-    { (exit 1); exit 1; }; } ;;
+   no) as_fn_error "this package needs a convenience libltdl" "$LINENO" 5 ;;
    "") enable_ltdl_convenience=yes
        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
  esac
@@@ -13373,18 -11823,14 +11823,14 @@@ INCLTDL="$LTDLINCL
  	# If the included ltdl is not to be used, then use the
  	# preinstalled libltdl we found.
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LTDL 1
- _ACEOF
+ $as_echo "#define HAVE_LTDL 1" >>confdefs.h
  
  	LIBLTDL=-lltdl
  	LTDLDEPS=
  	LTDLINCL=
  	;;
    ,no*,no,*)
- 	{ { $as_echo "$as_me:$LINENO: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&5
- $as_echo "$as_me: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&2;}
-    { (exit 1); exit 1; }; }
+ 	as_fn_error "\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" "$LINENO" 5
  	;;
    *)	with_included_ltdl=no
  	LIBLTDL="-L$with_ltdl_lib -lltdl"
@@@ -13395,19 -11841,19 +11841,19 @@@ esa
  INCLTDL="$LTDLINCL"
  
  # Report our decision...
- { $as_echo "$as_me:$LINENO: checking where to find libltdl headers" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find libltdl headers" >&5
  $as_echo_n "checking where to find libltdl headers... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $LTDLINCL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTDLINCL" >&5
  $as_echo "$LTDLINCL" >&6; }
- { $as_echo "$as_me:$LINENO: checking where to find libltdl library" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find libltdl library" >&5
  $as_echo_n "checking where to find libltdl library... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $LIBLTDL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBLTDL" >&5
  $as_echo "$LIBLTDL" >&6; }
  
  
  
  # Check whether --enable-ltdl-install was given.
- if test "${enable_ltdl_install+set}" = set; then
+ if test "${enable_ltdl_install+set}" = set; then :
    enableval=$enable_ltdl_install;
  fi
  
@@@ -13446,65 -11892,13 +11892,13 @@@ f
  
  
  
- 
- 
- 
- 
- 
- 
  for ac_header in unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.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
@@@ -13514,102 -11908,12 +11908,12 @@@ f
  done
  
  
- 
- 
- 
  for ac_func in closedir opendir readdir
- 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
@@@ -13622,101 -11926,12 +11926,12 @@@ els
  fi
  done
  
- 
- 
  for ac_func in strlcat strlcpy
- 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
@@@ -13764,21 -11979,17 +11979,17 @@@ cat >>confdefs.h <<_ACEO
  _ACEOF
  
  
- cat >>confdefs.h <<\_ACEOF
- #define SCANBUFF 131072
- _ACEOF
+ $as_echo "#define SCANBUFF 131072" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define FILEBUFF 8192
- _ACEOF
+ $as_echo "#define FILEBUFF 8192" >>confdefs.h
  
  
  
  	# Only modify libdir if user has not overriden it
  	default_libdir='${exec_prefix}/lib'
  	if test "$libdir" = "$default_libdir"; then
- 		{ $as_echo "$as_me:$LINENO: checking for multiarch libdir" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch libdir" >&5
  $as_echo_n "checking for multiarch libdir... " >&6; }
  		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html
  		if test "$GCC" = yes; then
@@@ -13794,7 -12005,7 +12005,7 @@@
  			*)                 acl_libdirstem=lib/$ac_multilibdir ;;
  		esac
  		libdir='${exec_prefix}/'$acl_libdirstem
- 		{ $as_echo "$as_me:$LINENO: result: $libdir" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libdir" >&5
  $as_echo "$libdir" >&6; }
  	else
  		acl_libdirstem=lib
@@@ -13810,16 -12021,12 +12021,12 @@@
  	fi
  
  
- { $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>
@@@ -13834,48 -12041,23 +12041,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
@@@ -13885,18 -12067,14 +12067,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
@@@ -13906,14 -12084,10 +12084,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>
@@@ -13940,67 -12114,34 +12114,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
  
- { $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
  $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
- if test "${ac_cv_c_restrict+set}" = set; then
+ if test "${ac_cv_c_restrict+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_restrict=no
     # The order here caters to the fact that C++ does not require restrict.
     for ac_kw in __restrict __restrict__ _Restrict restrict; 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.  */
  typedef int * int_ptr;
  	int foo (int_ptr $ac_kw ip) {
@@@ -14017,46 -12158,20 +12158,20 @@@ int s[1]
    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_restrict=$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_restrict" != no && break
     done
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
  $as_echo "$ac_cv_c_restrict" >&6; }
  
- 
   case $ac_cv_c_restrict in
     restrict) ;;
-    no) cat >>confdefs.h <<\_ACEOF
- #define restrict /**/
- _ACEOF
+    no) $as_echo "#define restrict /**/" >>confdefs.h
   ;;
     *)  cat >>confdefs.h <<_ACEOF
  #define restrict $ac_cv_c_restrict
@@@ -14064,16 -12179,12 +12179,12 @@@ _ACEO
   ;;
   esac
  
- { $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
@@@ -14133,56 -12244,29 +12244,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;
@@@ -14191,41 -12275,17 +12275,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) ;;
    *)
@@@ -14241,15 -12301,15 +12301,15 @@@ _ACEO
      ;;
  esac
  
- { $as_echo "$as_me:$LINENO: checking whether FPU byte ordering is bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FPU byte ordering is bigendian" >&5
  $as_echo_n "checking whether FPU byte ordering is bigendian... " >&6; }
- if test "${ac_cv_c_fpu_bigendian+set}" = set; then
+ if test "${ac_cv_c_fpu_bigendian+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_fpu_bigendian=auto
  
  # Check whether --with-fpu-words-bigendian was given.
- if test "${with_fpu_words_bigendian+set}" = set; then
+ if test "${with_fpu_words_bigendian+set}" = set; then :
    withval=$with_fpu_words_bigendian; ac_cv_c_fpu_bigendian=$with_fpu_words_bigendian
  else
    ac_cv_c_fpu_bigendian=auto
@@@ -14257,32 -12317,11 +12317,11 @@@ f
  
  
  if test $ac_cv_c_fpu_bigendian = auto; 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.  */
  double d = 3815911171354501045744583353695226502220105394563506259449467213186125718792664588210662403287568710818873279842508553551908601408568128557088985172985437412593385138085986771664896.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 :
  
  if ${GREP-grep} emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
  	ac_cv_c_fpu_bigendian=yes
@@@ -14291,53 -12330,38 +12330,38 @@@ if ${GREP-grep} elleemme conftest.$ac_o
  	ac_cv_c_fpu_bigendian=no
  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
  
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_fpu_bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_fpu_bigendian" >&5
  $as_echo "$ac_cv_c_fpu_bigendian" >&6; }
  case $ac_cv_c_fpu_bigendian in
  	yes)
  
- cat >>confdefs.h <<\_ACEOF
- #define FPU_WORDS_BIGENDIAN 1
- _ACEOF
+ $as_echo "#define FPU_WORDS_BIGENDIAN 1" >>confdefs.h
  
  		;;
  	no)
  
- cat >>confdefs.h <<\_ACEOF
- #define FPU_WORDS_BIGENDIAN 0
- _ACEOF
+ $as_echo "#define FPU_WORDS_BIGENDIAN 0" >>confdefs.h
  
  		;;
  	*)
- 		{ $as_echo "$as_me:$LINENO: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
  $as_echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&2;}
  esac
  
- 
-  { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
+ if test "${ac_cv_c_bigendian+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_bigendian=unknown
      # See if we're dealing with a universal compiler.
-     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 __APPLE_CC__
  	       not a universal capable compiler
@@@ -14345,46 -12369,34 +12369,34 @@@
  	     typedef int dummy;
  
  _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 :
  
  	# Check for potential -arch flags.  It is not universal unless
- 	# there are some -arch flags.  Note that *ppc* also matches
- 	# ppc64.  This check is also rather less than ideal.
- 	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
- 	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- 	esac
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+ 	# there are at least two -arch flags with different values.
+ 	ac_arch=
+ 	ac_prev=
+ 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ 	 if test -n "$ac_prev"; then
+ 	   case $ac_word in
+ 	     i?86 | x86_64 | ppc | ppc64)
+ 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ 		 ac_arch=$ac_word
+ 	       else
+ 		 ac_cv_c_bigendian=universal
+ 		 break
+ 	       fi
+ 	       ;;
+ 	   esac
+ 	   ac_prev=
+ 	 elif test "x$ac_word" = "x-arch"; then
+ 	   ac_prev=arch
+ 	 fi
+        done
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      if test $ac_cv_c_bigendian = unknown; then
        # See if sys/param.h defines the BYTE_ORDER macro.
-       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/param.h>
@@@ -14402,30 -12414,9 +12414,9 @@@ 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 :
    # It does; now see whether it defined to BIG_ENDIAN or not.
- 	 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/param.h>
@@@ -14441,49 -12432,18 +12432,18 @@@ 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_bigendian=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_bigendian=no
+   ac_cv_c_bigendian=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      fi
      if test $ac_cv_c_bigendian = unknown; then
        # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-       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 <limits.h>
  
@@@ -14498,30 -12458,9 +12458,9 @@@ 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 :
    # It does; now see whether it defined to _BIG_ENDIAN or not.
- 	 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 <limits.h>
  
@@@ -14536,51 -12475,20 +12475,20 @@@ 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_bigendian=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_bigendian=no
+   ac_cv_c_bigendian=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      fi
      if test $ac_cv_c_bigendian = unknown; then
        # Compile a test program.
-       if test "$cross_compiling" = yes; then
+       if test "$cross_compiling" = yes; then :
    # Try to guess by grepping values from an object file.
- 	 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.  */
  short int ascii_mm[] =
  		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@@ -14606,24 -12514,7 +12514,7 @@@ return use_ascii (foo) == use_ebcdic (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
+ if ac_fn_c_try_compile "$LINENO"; then :
    if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
  	      ac_cv_c_bigendian=yes
  	    fi
@@@ -14635,20 -12526,10 +12526,10 @@@
  		ac_cv_c_bigendian=unknown
  	      fi
  	    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
  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.  */
  $ac_includes_default
  int
@@@ -14668,78 -12549,42 +12549,42 @@@ 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
+ if ac_fn_c_try_run "$LINENO"; then :
    ac_cv_c_bigendian=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_bigendian=yes
+   ac_cv_c_bigendian=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
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
  $as_echo "$ac_cv_c_bigendian" >&6; }
   case $ac_cv_c_bigendian in #(
     yes)
-      cat >>confdefs.h <<\_ACEOF
- #define WORDS_BIGENDIAN 1
- _ACEOF
+      $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
  ;; #(
     no)
        ;; #(
     universal)
  
- cat >>confdefs.h <<\_ACEOF
- #define AC_APPLE_UNIVERSAL_BUILD 1
- _ACEOF
+ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  
       ;; #(
     *)
-      { { $as_echo "$as_me:$LINENO: error: unknown endianness
-  presetting ac_cv_c_bigendian=no (or yes) will help" >&5
- $as_echo "$as_me: error: unknown endianness
-  presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-    { (exit 1); exit 1; }; } ;;
+      as_fn_error "unknown endianness
+  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
   esac
  
  if test $ac_cv_c_bigendian = no; then
-     cat >>confdefs.h <<\_ACEOF
- #define WORDS_BIGENDIAN 0
- _ACEOF
+     $as_echo "#define WORDS_BIGENDIAN 0" >>confdefs.h
  
  fi
  
  # Check whether --enable-gcc-vcheck was given.
- if test "${enable_gcc_vcheck+set}" = set; then
+ if test "${enable_gcc_vcheck+set}" = set; then :
    enableval=$enable_gcc_vcheck; gcc_check=$enableval
  else
    gcc_check="yes"
@@@ -14750,19 -12595,17 +12595,17 @@@ msg_gcc_check="use --disable-gcc-vchec
  VERSION_SUFFIX=
  if test "$gcc_check" = "yes"; then
  	if test "x$ac_compiler_gnu" = "xyes"; then
- 		{ $as_echo "$as_me:$LINENO: checking for a supported version of gcc" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a supported version of gcc" >&5
  $as_echo_n "checking for a supported version of gcc... " >&6; }
  		gcc_version=`${CC} -dumpversion`
  		case "${gcc_version}" in
  			4.1.0*)
- 				{ $as_echo "$as_me:$LINENO: result: no (${gcc_version})" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${gcc_version})" >&5
  $as_echo "no (${gcc_version})" >&6; }
- 				{ { $as_echo "$as_me:$LINENO: error: gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" >&5
- $as_echo "$as_me: error: gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" >&2;}
-    { (exit 1); exit 1; }; }
+ 				as_fn_error "gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" "$LINENO" 5
  				;;
  			*)
- 				{ $as_echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gcc_version})" >&5
  $as_echo "ok (${gcc_version})" >&6; }
  				;;
  		esac
@@@ -14798,17 -12641,13 +12641,13 @@@ f
  
  
  
- { $as_echo "$as_me:$LINENO: checking for gcc bug PR27603" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc bug PR27603" >&5
  $as_echo_n "checking for gcc bug PR27603... " >&6; }
- if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assumed ok" >&5
  $as_echo "cross-compiling, assumed ok" >&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.  */
  
  /* (C) Richard Guenther */
@@@ -14828,57 -12667,24 +12667,24 @@@ int main(void
  }
  
  _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: ok, bug not present" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
  $as_echo "ok, bug not present" >&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: error: your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603" >&5
- $as_echo "$as_me: error: your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603" "$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
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for gcc bug PR26763-2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc bug PR26763-2" >&5
  $as_echo_n "checking for gcc bug PR26763-2... " >&6; }
- if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assumed ok" >&5
  $as_echo "cross-compiling, assumed ok" >&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.  */
  
  /* (C) Richard Guenther */
@@@ -14900,57 -12706,24 +12706,24 @@@ int main(void
  }
  
  _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: ok, bug not present" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
  $as_echo "ok, bug not present" >&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: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&5
- $as_echo "$as_me: error: your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" "$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
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for valid code generation of CLI_ISCONTAINED" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid code generation of CLI_ISCONTAINED" >&5
  $as_echo_n "checking for valid code generation of CLI_ISCONTAINED... " >&6; }
- if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assumed ok" >&5
  $as_echo "cross-compiling, assumed ok" >&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 <stdio.h>
@@@ -15011,57 -12784,24 +12784,24 @@@ int main(void
  }
  
  _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: ok, bug not present" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
  $as_echo "ok, bug not present" >&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: error: your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&5
- $as_echo "$as_me: error: your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" "$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
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for gcc bug PR28045" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc bug PR28045" >&5
  $as_echo_n "checking for gcc bug PR28045... " >&6; }
- if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assumed ok" >&5
  $as_echo "cross-compiling, assumed ok" >&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.  */
  
  /* (C) Andrew Pinski */
@@@ -15086,57 -12826,24 +12826,24 @@@ int main (void
  }
  
  _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: ok, bug not present" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
  $as_echo "ok, bug not present" >&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: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&5
- $as_echo "$as_me: error: your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" "$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
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for gcc bug PR37573" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc bug PR37573" >&5
  $as_echo_n "checking for gcc bug PR37573... " >&6; }
- if test "$cross_compiling" = yes; then
-   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assumed ok" >&5
  $as_echo "cross-compiling, assumed ok" >&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>
@@@ -15215,49 -12922,20 +12922,20 @@@ main (void
  
  
  _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: ok, bug not present" >&5
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
  $as_echo "ok, bug not present" >&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: error: your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" >&5
- $as_echo "$as_me: error: your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" "$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
  
  
- 
- { $as_echo "$as_me:$LINENO: checking for ld --version-script" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --version-script" >&5
  $as_echo_n "checking for ld --version-script... " >&6; }
- if test "${ac_cv_ld_version_script+set}" = set; then
+ if test "${ac_cv_ld_version_script+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
      cat > conftest.c <<EOF
@@@ -15284,11 -12962,11 +12962,11 @@@ EO
  				-o conftest.so conftest.c
  				-Wl,--version-script,conftest.map
  		       1>&5'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; };
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; };
    then
        VERSIONSCRIPTFLAG=--version-script
        ac_cv_ld_version_script=yes
@@@ -15297,11 -12975,11 +12975,11 @@@
  				-o conftest.so conftest.c
  				-Wl,-M,conftest.map
  			1>&5'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; };
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; };
  	then
  		VERSIONSCRIPTFLAG=-M
  		ac_cv_ld_version_script=yes;
@@@ -15311,7 -12989,7 +12989,7 @@@
    fi
   rm -f conftest*
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_version_script" >&5
  $as_echo "$ac_cv_ld_version_script" >&6; }
  
   if test "x$ac_cv_ld_version_script" = "xyes"; then
@@@ -15329,172 -13007,12 +13007,12 @@@ GPERF=${GPERF-"${am_missing_run}gperf"
  
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.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 http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _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
@@@ -15503,244 -13021,18 +13021,18 @@@ f
  
  done
  
- if test "${ac_cv_header_syslog_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for syslog.h" >&5
- $as_echo_n "checking for syslog.h... " >&6; }
- if test "${ac_cv_header_syslog_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
- $as_echo "$ac_cv_header_syslog_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking syslog.h usability" >&5
- $as_echo_n "checking syslog.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 <syslog.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 syslog.h presence" >&5
- $as_echo_n "checking syslog.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 <syslog.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: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: syslog.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: syslog.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: syslog.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: syslog.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: syslog.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for syslog.h" >&5
- $as_echo_n "checking for syslog.h... " >&6; }
- if test "${ac_cv_header_syslog_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_syslog_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
- $as_echo "$ac_cv_header_syslog_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_syslog_h" = x""yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
+ if test "x$ac_cv_header_syslog_h" = x""yes; then :
  
- cat >>confdefs.h <<\_ACEOF
- #define USE_SYSLOG 1
- _ACEOF
+ $as_echo "#define USE_SYSLOG 1" >>confdefs.h
  
  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
+ 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 :
  
- 
- 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
-   :
  else
  
  cat >>confdefs.h <<_ACEOF
@@@ -15749,17 -13041,13 +13041,13 @@@ _ACEO
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking size of short" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
  $as_echo_n "checking size of short... " >&6; }
- if test "${ac_cv_sizeof_short+set}" = set; then
+ if test "${ac_cv_sizeof_short+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
-   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 "confdefs.h"
  #include <sys/types.h>
@@@ -15773,32 -13061,9 +13061,9 @@@ switch (0) case 0: case (sizeof (short
    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_sizeof_short=$ac_size
- 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
    if test x$ac_cv_sizeof_short != x ; then break; fi
  done
@@@ -15806,11 -13071,9 +13071,9 @@@
  fi
  
  if test x$ac_cv_sizeof_short = x ; then
-   { { $as_echo "$as_me:$LINENO: error: cannot determine a size for short" >&5
- $as_echo "$as_me: error: cannot determine a size for short" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot determine a size for short" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
  $as_echo "$ac_cv_sizeof_short" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15818,17 -13081,13 +13081,13 @@@
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking size of int" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
  $as_echo_n "checking size of int... " >&6; }
- if test "${ac_cv_sizeof_int+set}" = set; then
+ if test "${ac_cv_sizeof_int+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
-   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 "confdefs.h"
  #include <sys/types.h>
@@@ -15842,32 -13101,9 +13101,9 @@@ switch (0) case 0: case (sizeof (int) =
    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_sizeof_int=$ac_size
- 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
    if test x$ac_cv_sizeof_int != x ; then break; fi
  done
@@@ -15875,11 -13111,9 +13111,9 @@@
  fi
  
  if test x$ac_cv_sizeof_int = x ; then
-   { { $as_echo "$as_me:$LINENO: error: cannot determine a size for int" >&5
- $as_echo "$as_me: error: cannot determine a size for int" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot determine a size for int" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
  $as_echo "$ac_cv_sizeof_int" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15887,17 -13121,13 +13121,13 @@@
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking size of long" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
  $as_echo_n "checking size of long... " >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
+ if test "${ac_cv_sizeof_long+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
-   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 "confdefs.h"
  #include <sys/types.h>
@@@ -15911,32 -13141,9 +13141,9 @@@ switch (0) case 0: case (sizeof (long) 
    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_sizeof_long=$ac_size
- 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
    if test x$ac_cv_sizeof_long != x ; then break; fi
  done
@@@ -15944,11 -13151,9 +13151,9 @@@
  fi
  
  if test x$ac_cv_sizeof_long = x ; then
-   { { $as_echo "$as_me:$LINENO: error: cannot determine a size for long" >&5
- $as_echo "$as_me: error: cannot determine a size for long" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot determine a size for long" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
  $as_echo "$ac_cv_sizeof_long" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -15956,17 -13161,13 +13161,13 @@@
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking size of long long" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
  $as_echo_n "checking size of long long... " >&6; }
- if test "${ac_cv_sizeof_long_long+set}" = set; then
+ if test "${ac_cv_sizeof_long_long+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
-   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 "confdefs.h"
  #include <sys/types.h>
@@@ -15980,32 -13181,9 +13181,9 @@@ switch (0) case 0: case (sizeof (long l
    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_sizeof_long_long=$ac_size
- 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
    if test x$ac_cv_sizeof_long_long != x ; then break; fi
  done
@@@ -16013,11 -13191,9 +13191,9 @@@
  fi
  
  if test x$ac_cv_sizeof_long_long = x ; then
-   { { $as_echo "$as_me:$LINENO: error: cannot determine a size for long long" >&5
- $as_echo "$as_me: error: cannot determine a size for long long" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot determine a size for long long" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
  $as_echo "$ac_cv_sizeof_long_long" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16025,17 -13201,13 +13201,13 @@@
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking size of void *" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
  $as_echo_n "checking size of void *... " >&6; }
- if test "${ac_cv_sizeof_void_p+set}" = set; then
+ if test "${ac_cv_sizeof_void_p+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
-   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 "confdefs.h"
  #include <sys/types.h>
@@@ -16049,32 -13221,9 +13221,9 @@@ switch (0) case 0: case (sizeof (void *
    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_sizeof_void_p=$ac_size
- 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
    if test x$ac_cv_sizeof_void_p != x ; then break; fi
  done
@@@ -16082,11 -13231,9 +13231,9 @@@
  fi
  
  if test x$ac_cv_sizeof_void_p = x ; then
-   { { $as_echo "$as_me:$LINENO: error: cannot determine a size for void *" >&5
- $as_echo "$as_me: error: cannot determine a size for void *" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "cannot determine a size for void *" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
  $as_echo "$ac_cv_sizeof_void_p" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -16096,7 -13243,7 +13243,7 @@@ _ACEO
  
  
  # Check whether --enable-experimental was given.
- if test "${enable_experimental+set}" = set; then
+ if test "${enable_experimental+set}" = set; then :
    enableval=$enable_experimental; enable_experimental=$enableval
  else
    enable_experimental="no"
@@@ -16105,25 -13252,19 +13252,19 @@@ f
  
  if test "$enable_experimental" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_EXPERIMENTAL 1
- _ACEOF
+ $as_echo "#define CL_EXPERIMENTAL 1" >>confdefs.h
  
    VERSION_SUFFIX="$VERSION_SUFFIX-exp"
  fi
  
- { $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
  $as_echo_n "checking for bind in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_bind+set}" = set; then
+ if test "${ac_cv_lib_socket_bind+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $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.
@@@ -16141,57 -13282,28 +13282,28 @@@ return bind ()
    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_bind=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_socket_bind=no
+   ac_cv_lib_socket_bind=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_bind" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
  $as_echo "$ac_cv_lib_socket_bind" >&6; }
- if test "x$ac_cv_lib_socket_bind" = x""yes; then
+ if test "x$ac_cv_lib_socket_bind" = x""yes; then :
    LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"
  fi
  
- { $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostent" >&5
  $as_echo_n "checking for library containing gethostent... " >&6; }
- if test "${ac_cv_search_gethostent+set}" = set; then
+ if test "${ac_cv_search_gethostent+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.
@@@ -16216,167 -13328,38 +13328,38 @@@ 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_gethostent=$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_gethostent+set}" = set; then
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_gethostent+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_gethostent+set}" = set; then
-   :
+ if test "${ac_cv_search_gethostent+set}" = set; then :
+ 
  else
    ac_cv_search_gethostent=no
  fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostent" >&5
  $as_echo "$ac_cv_search_gethostent" >&6; }
  ac_res=$ac_cv_search_gethostent
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    (LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")
  fi
  
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo
- 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
@@@ -16384,17 -13367,13 +13367,13 @@@
  fi
  done
  
- { $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
- if test "${ac_cv_sys_largefile_source+set}" = set; then
+ if test "${ac_cv_sys_largefile_source+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    while :; 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.  */
  #include <sys/types.h> /* for off_t */
       #include <stdio.h>
@@@ -16407,43 -13386,12 +13386,12 @@@ int (*fp) (FILE *, off_t, int) = fseeko
    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_sys_largefile_source=no; break
- 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
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
  #include <sys/types.h> /* for off_t */
@@@ -16457,43 -13405,16 +13405,16 @@@ int (*fp) (FILE *, off_t, int) = fseeko
    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_sys_largefile_source=1; break
- 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
    ac_cv_sys_largefile_source=unknown
    break
  done
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
  $as_echo "$ac_cv_sys_largefile_source" >&6; }
  case $ac_cv_sys_largefile_source in #(
    no | unknown) ;;
@@@ -16510,28 -13431,22 +13431,22 @@@ rm -rf conftest
  # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
  if test $ac_cv_sys_largefile_source != unknown; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FSEEKO 1
- _ACEOF
+ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
  
  fi
  
  
  
- 	{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
  $as_echo_n "checking for working mmap... " >&6; }
- if test "${ac_cv_c_mmap_private+set}" = set; then
+ if test "${ac_cv_c_mmap_private+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
- 		if test "$cross_compiling" = yes; then
+ 		if test "$cross_compiling" = yes; then :
    ac_cv_c_mmap_private=no
  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 <unistd.h>
@@@ -16593,67 -13508,34 +13508,34 @@@ int main(void
  	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_mmap_private=yes
  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_mmap_private=no
+   ac_cv_c_mmap_private=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
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_mmap_private" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_mmap_private" >&5
  $as_echo "$ac_cv_c_mmap_private" >&6; }
  if test $ac_cv_c_mmap_private = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MMAP 1
- _ACEOF
+ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
  
  fi
  rm -f conftest.mmap
  
  
  ac_cv_c_can_get_pagesize="no"
- { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_PAGESIZE)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_PAGESIZE)" >&5
  $as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
- if test "${ac_cv_c_sysconf_sc_pagesize+set}" = set; then
+ if test "${ac_cv_c_sysconf_sc_pagesize+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>
@@@ -16668,61 -13550,30 +13550,30 @@@ int x = sysconf(_SC_PAGESIZE)
    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_sysconf_sc_pagesize=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_sysconf_sc_pagesize=no
+   ac_cv_c_sysconf_sc_pagesize=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_sysconf_sc_pagesize" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_sysconf_sc_pagesize" >&5
  $as_echo "$ac_cv_c_sysconf_sc_pagesize" >&6; }
  if test "$ac_cv_c_sysconf_sc_pagesize" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYSCONF_SC_PAGESIZE 1
- _ACEOF
+ $as_echo "#define HAVE_SYSCONF_SC_PAGESIZE 1" >>confdefs.h
  
  	ac_cv_c_can_get_pagesize="yes"
  fi
- { $as_echo "$as_me:$LINENO: checking for getpagesize()" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize()" >&5
  $as_echo_n "checking for getpagesize()... " >&6; }
- if test "${ac_cv_c_getpagesize+set}" = set; then
+ if test "${ac_cv_c_getpagesize+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.  */
  
  #if HAVE_UNISTD_H
@@@ -16736,53 -13587,26 +13587,26 @@@ int x = getpagesize()
    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_getpagesize=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_getpagesize=no
+   ac_cv_c_getpagesize=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_getpagesize" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_getpagesize" >&5
  $as_echo "$ac_cv_c_getpagesize" >&6; }
  if test "$ac_cv_c_getpagesize" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETPAGESIZE 1
- _ACEOF
+ $as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h
  
  	ac_cv_c_can_get_pagesize="yes"
  fi
  
  # Check whether --enable-mempool was given.
- if test "${enable_mempool+set}" = set; then
+ if test "${enable_mempool+set}" = set; then :
    enableval=$enable_mempool; enable_mempool=$enableval
  else
    enable_mempool="yes"
@@@ -16790,26 -13614,22 +13614,22 @@@ f
  
  if test "$enable_mempool" = "yes"; then
  	if test "$ac_cv_c_mmap_private" != "yes"; then
- 		{ $as_echo "$as_me:$LINENO: ****** mempool support disabled (mmap not available or not usable)" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: ****** mempool support disabled (mmap not available or not usable)" >&5
  $as_echo "$as_me: ****** mempool support disabled (mmap not available or not usable)" >&6;}
  	else
  		if test "$ac_cv_c_can_get_pagesize" != "yes"; then
- 			{ $as_echo "$as_me:$LINENO: ****** mempool support disabled (pagesize cannot be determined)" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: ****** mempool support disabled (pagesize cannot be determined)" >&5
  $as_echo "$as_me: ****** mempool support disabled (pagesize cannot be determined)" >&6;}
  		else
  
- 	{ $as_echo "$as_me:$LINENO: checking for MAP_ANON(YMOUS)" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5
  $as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; }
- if test "${ac_cv_c_mmap_anonymous+set}" = set; then
+ if test "${ac_cv_c_mmap_anonymous+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  		ac_cv_c_mmap_anonymous='no'
- 		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/mman.h>
  int
@@@ -16820,35 -13640,11 +13640,11 @@@ mmap((void *)0, 0, PROT_READ | PROT_WRI
    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_mmap_anonymous='MAP_ANONYMOUS'
  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.  */
  
  /* OPENBSD WORKAROUND - DND*/
@@@ -16864,47 -13660,19 +13660,19 @@@ mmap((void *)0, 0, PROT_READ | PROT_WRI
    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_mmap_anonymous='MAP_ANON'
  
- 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
  
  
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_mmap_anonymous" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_mmap_anonymous" >&5
  $as_echo "$ac_cv_c_mmap_anonymous" >&6; }
  	if test "$ac_cv_c_mmap_anonymous" != "no"; then
  
@@@ -16915,13 -13683,11 +13683,11 @@@ _ACEO
  	fi
  
  			if test "$ac_cv_c_mmap_anonymous" = "no"; then
- 				{ $as_echo "$as_me:$LINENO: ****** mempool support disabled (anonymous mmap not available)" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: ****** mempool support disabled (anonymous mmap not available)" >&5
  $as_echo "$as_me: ****** mempool support disabled (anonymous mmap not available)" >&6;}
  			else
  
- cat >>confdefs.h <<\_ACEOF
- #define USE_MPOOL 1
- _ACEOF
+ $as_echo "#define USE_MPOOL 1" >>confdefs.h
  
  			fi
  		fi
@@@ -16931,7 -13697,7 +13697,7 @@@ f
  enable_check_ut=auto
  enable_ut_install=no
  # Check whether --enable-check was given.
- if test "${enable_check+set}" = set; then
+ if test "${enable_check+set}" = set; then :
    enableval=$enable_check; enable_check_ut=$enableval
  else
    enable_check_ut="auto"
@@@ -16957,7 -13723,7 +13723,7 @@@ if test "$enable_check_ut" != "no" ; th
  
  
  # Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
+ if test "${with_gnu_ld+set}" = set; then :
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
@@@ -16979,7 -13745,7 +13745,7 @@@ f
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
-   { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
  $as_echo_n "checking for ld used by GCC... " >&6; }
    case $host in
    *-*-mingw*)
@@@ -17009,13 -13775,13 +13775,13 @@@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
-   { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
  $as_echo_n "checking for GNU ld... " >&6; }
  else
-   { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
  $as_echo_n "checking for non-GNU ld... " >&6; }
  fi
- if test "${acl_cv_path_LD+set}" = set; then
+ if test "${acl_cv_path_LD+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
@@@ -17043,18 -13809,16 +13809,16 @@@ f
  
  LD="$acl_cv_path_LD"
  if test -n "$LD"; then
-   { $as_echo "$as_me:$LINENO: result: $LD" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
  $as_echo "$LD" >&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
- test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- $as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- { $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+ test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
  $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${acl_cv_prog_gnu_ld+set}" = set; then
+ if test "${acl_cv_prog_gnu_ld+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@@ -17065,16 -13829,16 +13829,16 @@@ case `$LD -v 2>&1 </dev/null` i
    acl_cv_prog_gnu_ld=no ;;
  esac
  fi
- { $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
  $as_echo "$acl_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$acl_cv_prog_gnu_ld
  
  
  
  
-                                                 { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
  $as_echo_n "checking for shared library run path origin... " >&6; }
- if test "${acl_cv_rpath+set}" = set; then
+ if test "${acl_cv_rpath+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
@@@ -17085,7 -13849,7 +13849,7 @@@
      acl_cv_rpath=done
  
  fi
- { $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
  $as_echo "$acl_cv_rpath" >&6; }
    wl="$acl_cv_wl"
    acl_libext="$acl_cv_libext"
@@@ -17097,7 -13861,7 +13861,7 @@@
    acl_hardcode_direct="$acl_cv_hardcode_direct"
    acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
      # Check whether --enable-rpath was given.
- if test "${enable_rpath+set}" = set; then
+ if test "${enable_rpath+set}" = set; then :
    enableval=$enable_rpath; :
  else
    enable_rpath=yes
@@@ -17133,7 -13897,7 +13897,7 @@@ f
  
  
  # Check whether --with-libcheck-prefix was given.
- if test "${with_libcheck_prefix+set}" = set; then
+ if test "${with_libcheck_prefix+set}" = set; then :
    withval=$with_libcheck_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
@@@ -17563,139 -14327,8 +14327,8 @@@ f
    fi
  
  		CPPFLAGS="$CPPFLAGS $INCCHECK"
- 		if test "${ac_cv_header_check_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for check.h" >&5
- $as_echo_n "checking for check.h... " >&6; }
- if test "${ac_cv_header_check_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_check_h" >&5
- $as_echo "$ac_cv_header_check_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking check.h usability" >&5
- $as_echo_n "checking check.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 <check.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 check.h presence" >&5
- $as_echo_n "checking check.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 <check.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: check.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: check.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: check.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: check.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: check.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: check.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: check.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: check.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: check.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: check.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for check.h" >&5
- $as_echo_n "checking for check.h... " >&6; }
- if test "${ac_cv_header_check_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_check_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_check_h" >&5
- $as_echo "$ac_cv_header_check_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_check_h" = x""yes; then
+ 		ac_fn_c_check_header_mongrel "$LINENO" "check.h" "ac_cv_header_check_h" "$ac_includes_default"
+ if test "x$ac_cv_header_check_h" = x""yes; then :
    have_header=yes
  else
    have_header=no
@@@ -17705,16 -14338,12 +14338,12 @@@ f
  		ac_cv_findlib_CHECK_libs=
  		ac_cv_findlib_CHECK_ltlibs=
  		ac_cv_findlib_CHECK_inc=
- 		if test "$have_header" = "yes"; then
+ 		if test "$have_header" = "yes"; then :
  
  				LIBS="$LIBS $LIBCHECK"
- 				{ $as_echo "$as_me:$LINENO: checking linking with check" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking with check" >&5
  $as_echo_n "checking linking with check... " >&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 <check.h>
  int
@@@ -17725,64 -14354,34 +14354,34 @@@ srunner_create(0
    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_findlib_CHECK_libs="$LIBCHECK"
  					ac_cv_findlib_CHECK_ltlibs="$LTLIBCHECK"
  					ac_cv_findlib_CHECK_inc="$INCCHECK"
- 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  
- 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
  
  fi
- 
  		CPPFLAGS="$save_CPPFLAGS"
  		LIBS="$save_LIBS"
- 	if test "X$ac_cv_findlib_CHECK_libs" = "X"; then
+ 	if test "X$ac_cv_findlib_CHECK_libs" = "X"; then :
  
- 			{ $as_echo "$as_me:$LINENO: unable to compile/link with check" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: unable to compile/link with check" >&5
  $as_echo "$as_me: unable to compile/link with check" >&6;}
  			HAVE_LIBCHECK=no
  
  
  else
  
- 			{ $as_echo "$as_me:$LINENO: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&5
  $as_echo "$as_me: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&6;}
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBCHECK 1
- _ACEOF
+ $as_echo "#define HAVE_LIBCHECK 1" >>confdefs.h
  
  			HAVE_LIBCHECK=yes
  			LIBCHECK="$ac_cv_findlib_CHECK_libs"
@@@ -17793,7 -14392,6 +14392,6 @@@
  fi
  
  
- 
  fi
  
  
@@@ -17807,19 -14405,14 +14405,14 @@@ f
  
  
  if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
-     { { $as_echo "$as_me:$LINENO: error:
+     as_fn_error "
  
  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
- " >&5
- $as_echo "$as_me: error:
- 
- ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
- " >&2;}
-    { (exit 1); exit 1; }; }
+ " "$LINENO" 5
  fi
  
  # Check whether --enable-coverage was given.
- if test "${enable_coverage+set}" = set; then
+ if test "${enable_coverage+set}" = set; then :
    enableval=$enable_coverage; enable_cov=$enableval
  else
    enable_cov="no"
@@@ -17828,14 -14421,10 +14421,10 @@@ f
  
  if test "x$enable_coverage" = "xyes"; then
  	if test "x$CHECK_LIBS" = "x"; then
- 		{ { $as_echo "$as_me:$LINENO: error: Coverage testing required, but unit tests not enabled!" >&5
- $as_echo "$as_me: error: Coverage testing required, but unit tests not enabled!" >&2;}
-    { (exit 1); exit 1; }; }
+ 		as_fn_error "Coverage testing required, but unit tests not enabled!" "$LINENO" 5
  	fi
  	if test "x$ac_compiler_gnu" != "xyes"; then
- 		{ { $as_echo "$as_me:$LINENO: error: coverage testing only works if gcc is used" >&5
- $as_echo "$as_me: error: coverage testing only works if gcc is used" >&2;}
-    { (exit 1); exit 1; }; }
+ 		as_fn_error "coverage testing only works if gcc is used" "$LINENO" 5
  	fi
  
  	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
@@@ -17844,9 -14433,9 +14433,9 @@@
  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_GCOV+set}" = set; then
+ if test "${ac_cv_prog_GCOV+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$GCOV"; then
@@@ -17857,24 -14446,24 +14446,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_GCOV="$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
  GCOV=$ac_cv_prog_GCOV
  if test -n "$GCOV"; then
-   { $as_echo "$as_me:$LINENO: result: $GCOV" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5
  $as_echo "$GCOV" >&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
  
@@@ -17887,9 -14476,9 +14476,9 @@@ test -n "$GCOV" || GCOV="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_LCOV+set}" = set; then
+ if test "${ac_cv_prog_LCOV+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LCOV"; then
@@@ -17900,24 -14489,24 +14489,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_LCOV="$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
  LCOV=$ac_cv_prog_LCOV
  if test -n "$LCOV"; then
-   { $as_echo "$as_me:$LINENO: result: $LCOV" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
  $as_echo "$LCOV" >&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
  
@@@ -17930,9 -14519,9 +14519,9 @@@ test -n "$LCOV" || LCOV="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_GENHTML+set}" = set; then
+ if test "${ac_cv_prog_GENHTML+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$GENHTML"; then
@@@ -17943,24 -14532,24 +14532,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_GENHTML="$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
  GENHTML=$ac_cv_prog_GENHTML
  if test -n "$GENHTML"; then
-   { $as_echo "$as_me:$LINENO: result: $GENHTML" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
  $as_echo "$GENHTML" >&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
  
@@@ -17981,154 -14570,23 +14570,23 @@@ f
  
  
  have_pthreads=no
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
- $as_echo_n "checking for pthread.h... " >&6; }
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- $as_echo "$ac_cv_header_pthread_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
- $as_echo_n "checking pthread.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 <pthread.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 pthread.h presence" >&5
- $as_echo_n "checking pthread.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 <pthread.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: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
- $as_echo_n "checking for pthread.h... " >&6; }
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_pthread_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- $as_echo "$ac_cv_header_pthread_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_pthread_h" = x""yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+ if test "x$ac_cv_header_pthread_h" = x""yes; then :
    have_pthreads=yes
  fi
  
  
  
- { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
      # 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; USE_MAINTAINER_MODE=$enableval
  else
    USE_MAINTAINER_MODE=no
  fi
  
-   { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
@@@ -18141,15 -14599,15 +14599,15 @@@ f
    MAINT=$MAINTAINER_MODE_TRUE
  
  
- { $as_echo "$as_me:$LINENO: checking for zlib installation" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib installation" >&5
  $as_echo_n "checking for zlib installation... " >&6; }
  
  # Check whether --with-zlib was given.
- if test "${with_zlib+set}" = set; then
+ if test "${with_zlib+set}" = set; then :
    withval=$with_zlib;
  if test "$withval"; then
    ZLIB_HOME="$withval"
-   { $as_echo "$as_me:$LINENO: result: using $ZLIB_HOME" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $ZLIB_HOME" >&5
  $as_echo "using $ZLIB_HOME" >&6; }
  fi
  
@@@ -18160,14 -14618,14 +14618,14 @@@ if test ! -f "$ZLIB_HOME/include/zlib.h
  then
    ZLIB_HOME=/usr
  fi
- { $as_echo "$as_me:$LINENO: result: $ZLIB_HOME" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZLIB_HOME" >&5
  $as_echo "$ZLIB_HOME" >&6; }
  
  fi
  
  
  # Check whether --enable-zlib-vcheck was given.
- if test "${enable_zlib_vcheck+set}" = set; then
+ if test "${enable_zlib_vcheck+set}" = set; then :
    enableval=$enable_zlib_vcheck; zlib_check=$enableval
  else
    zlib_check="yes"
@@@ -18176,9 -14634,7 +14634,7 @@@ f
  
  if test ! -f "$ZLIB_HOME/include/zlib.h"
  then
-     { { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- $as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
  else
  
      vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
@@@ -18188,15 -14644,13 +14644,13 @@@
  
      if test -n "$vuln"; then
  	if test "$zlib_check" = "yes"; then
- 	    { { $as_echo "$as_me:$LINENO: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" >&5
- $as_echo "$as_me: error: The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" >&2;}
-    { (exit 1); exit 1; }; }
+ 	    as_fn_error "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5
  	else
- 	    { $as_echo "$as_me:$LINENO: WARNING: ****** This ClamAV installation may be linked against" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** This ClamAV installation may be linked against" >&5
  $as_echo "$as_me: WARNING: ****** This ClamAV installation may be linked against" >&2;}
- 	    { $as_echo "$as_me:$LINENO: WARNING: ****** a broken zlib version. Please DO NOT report any" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** a broken zlib version. Please DO NOT report any" >&5
  $as_echo "$as_me: WARNING: ****** a broken zlib version. Please DO NOT report any" >&2;}
- 	    { $as_echo "$as_me:$LINENO: WARNING: ****** stability problems to the ClamAV developers!" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** stability problems to the ClamAV developers!" >&5
  $as_echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!" >&2;}
  	fi
      fi
@@@ -18206,18 -14660,14 +14660,14 @@@
  	save_LDFLAGS="$LDFLAGS"
  	save_LIBS="$LIBS"
  	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
- 	{ $as_echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
  $as_echo_n "checking for inflateEnd in -lz... " >&6; }
- if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
+ if test "${ac_cv_lib_z_inflateEnd+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.
@@@ -18235,63 -14685,31 +14685,31 @@@ return inflateEnd ()
    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_inflateEnd=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_inflateEnd=no
+   ac_cv_lib_z_inflateEnd=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_inflateEnd" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
  $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
- if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
+ if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"
  else
-   { { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- $as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
  fi
  
- 
- { $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
  $as_echo_n "checking for gzopen in -lz... " >&6; }
- if test "${ac_cv_lib_z_gzopen+set}" = set; then
+ if test "${ac_cv_lib_z_gzopen+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.
@@@ -18309,43 -14727,18 +14727,18 @@@ return gzopen ()
    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_gzopen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_gzopen=no
+   ac_cv_lib_z_gzopen=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_gzopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzopen" >&5
  $as_echo "$ac_cv_lib_z_gzopen" >&6; }
- if test "x$ac_cv_lib_z_gzopen" = x""yes; then
+ if test "x$ac_cv_lib_z_gzopen" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
@@@ -18353,26 -14746,20 +14746,20 @@@
    LIBS="-lz $LIBS"
  
  else
-   { { $as_echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5
- $as_echo "$as_me: error: Your zlib is missing gzopen()" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
  fi
  
  	LDFLAGS="$save_LDFLAGS"
  	LIBS="$save_LIBS"
      else
- 	{ $as_echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
  $as_echo_n "checking for inflateEnd in -lz... " >&6; }
- if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
+ if test "${ac_cv_lib_z_inflateEnd+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.
@@@ -18390,63 -14777,31 +14777,31 @@@ return inflateEnd ()
    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_inflateEnd=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_inflateEnd=no
+   ac_cv_lib_z_inflateEnd=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_inflateEnd" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
  $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
- if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
+ if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"
  else
-   { { $as_echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- $as_echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
  fi
  
- 
- { $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
  $as_echo_n "checking for gzopen in -lz... " >&6; }
- if test "${ac_cv_lib_z_gzopen+set}" = set; then
+ if test "${ac_cv_lib_z_gzopen+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.
@@@ -18464,43 -14819,18 +14819,18 @@@ return gzopen ()
    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_gzopen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_gzopen=no
+   ac_cv_lib_z_gzopen=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_gzopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzopen" >&5
  $as_echo "$ac_cv_lib_z_gzopen" >&6; }
- if test "x$ac_cv_lib_z_gzopen" = x""yes; then
+ if test "x$ac_cv_lib_z_gzopen" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
@@@ -18508,16 -14838,14 +14838,14 @@@
    LIBS="-lz $LIBS"
  
  else
-   { { $as_echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5
- $as_echo "$as_me: error: Your zlib is missing gzopen()" >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
  fi
  
      fi
  fi
  
  # Check whether --enable-bzip2 was given.
- if test "${enable_bzip2+set}" = set; then
+ if test "${enable_bzip2+set}" = set; then :
    enableval=$enable_bzip2; want_bzip2=$enableval
  else
    want_bzip2="yes"
@@@ -18531,9 -14859,9 +14859,9 @@@ the
  
  
  
-   { $as_echo "$as_me:$LINENO: checking how to link with libbz2" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libbz2" >&5
  $as_echo_n "checking how to link with libbz2... " >&6; }
- if test "${ac_cv_libbz2_libs+set}" = set; then
+ if test "${ac_cv_libbz2_libs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
@@@ -18556,7 -14884,7 +14884,7 @@@
  
  
  # Check whether --with-libbz2-prefix was given.
- if test "${with_libbz2_prefix+set}" = set; then
+ if test "${with_libbz2_prefix+set}" = set; then :
    withval=$with_libbz2_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
@@@ -18991,7 -15319,7 +15319,7 @@@ f
      ac_cv_libbz2_prefix="$LIBBZ2_PREFIX"
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_libbz2_libs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libbz2_libs" >&5
  $as_echo "$ac_cv_libbz2_libs" >&6; }
    LIBBZ2="$ac_cv_libbz2_libs"
    LTLIBBZ2="$ac_cv_libbz2_ltlibs"
@@@ -19031,18 -15359,14 +15359,14 @@@
      LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
  
      have_bzprefix="no"
-     { $as_echo "$as_me:$LINENO: checking for BZ2_bzReadOpen in -lbz2" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzReadOpen in -lbz2" >&5
  $as_echo_n "checking for BZ2_bzReadOpen in -lbz2... " >&6; }
- if test "${ac_cv_lib_bz2_BZ2_bzReadOpen+set}" = set; then
+ if test "${ac_cv_lib_bz2_BZ2_bzReadOpen+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbz2  $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.
@@@ -19060,204 -15384,42 +15384,42 @@@ return BZ2_bzReadOpen ()
    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_bz2_BZ2_bzReadOpen=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_bz2_BZ2_bzReadOpen=no
+   ac_cv_lib_bz2_BZ2_bzReadOpen=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_bz2_BZ2_bzReadOpen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzReadOpen" >&5
  $as_echo "$ac_cv_lib_bz2_BZ2_bzReadOpen" >&6; }
- if test "x$ac_cv_lib_bz2_BZ2_bzReadOpen" = x""yes; then
+ if test "x$ac_cv_lib_bz2_BZ2_bzReadOpen" = x""yes; then :
    have_bzprefix="yes"
  fi
  
      if test "x$have_bzprefix" = "xno"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define NOBZ2PREFIX 1
- _ACEOF
+ $as_echo "#define NOBZ2PREFIX 1" >>confdefs.h
  
      fi
      LDFLAGS="$save_LDFLAGS"
      if test "$HAVE_LIBBZ2" = "yes"; then
- 	if test "${ac_cv_header_bzlib_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
- $as_echo_n "checking for bzlib.h... " >&6; }
- if test "${ac_cv_header_bzlib_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
- $as_echo "$ac_cv_header_bzlib_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking bzlib.h usability" >&5
- $as_echo_n "checking bzlib.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 <bzlib.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 bzlib.h presence" >&5
- $as_echo_n "checking bzlib.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 <bzlib.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: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: bzlib.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for bzlib.h" >&5
- $as_echo_n "checking for bzlib.h... " >&6; }
- if test "${ac_cv_header_bzlib_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_bzlib_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
- $as_echo "$ac_cv_header_bzlib_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_bzlib_h" = x""yes; then
-   { $as_echo "$as_me:$LINENO: checking for CVE-2008-1372" >&5
+ 	ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
+ if test "x$ac_cv_header_bzlib_h" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CVE-2008-1372" >&5
  $as_echo_n "checking for CVE-2008-1372... " >&6; }
- if test "${ac_cv_c_cve_2008_1372+set}" = set; then
+ if test "${ac_cv_c_cve_2008_1372+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  save_LIBS="$LIBS"
  LIBS="$LIBCLAMAV_LIBS $LIBBZ2"
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
    ac_cv_c_cve_2008_1372=ok
  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>
@@@ -19316,35 -15478,9 +15478,9 @@@ int main (int argc, char **argv) 
  }
  
  _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_cve_2008_1372=ok
  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 )
  
  if test $? -gt 127; then
  	ac_cv_c_cve_2008_1372=bugged
@@@ -19353,15 -15489,14 +15489,14 @@@ els
  fi
  
  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
  
  LIBS="$save_LIBS"
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_c_cve_2008_1372" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_cve_2008_1372" >&5
  $as_echo "$ac_cv_c_cve_2008_1372" >&6; }
  
  else
@@@ -19370,21 -15505,21 +15505,21 @@@ f
  
  
  	if test "$ac_cv_c_cve_2008_1372" = "bugged"; then
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** bzip2 libraries are affected by the CVE-2008-1372 bug" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** bzip2 libraries are affected by the CVE-2008-1372 bug" >&5
  $as_echo "$as_me: WARNING: ****** bzip2 libraries are affected by the CVE-2008-1372 bug" >&2;}
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5." >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5." >&5
  $as_echo "$as_me: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5." >&2;}
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
  $as_echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
  	fi
  	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then
- 						{ $as_echo "$as_me:$LINENO: WARNING: ****** Unable to link bzip2 testcase" >&5
+ 						{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Unable to link bzip2 testcase" >&5
  $as_echo "$as_me: WARNING: ****** Unable to link bzip2 testcase" >&2;}
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&5
  $as_echo "$as_me: WARNING: ****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify" >&2;}
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&5
  $as_echo "$as_me: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&2;}
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
  $as_echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
  	fi
  
@@@ -19392,25 -15527,23 +15527,23 @@@
  	ok|bugged|linkfailed)
  		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_BZLIB_H 1
- _ACEOF
+ $as_echo "#define HAVE_BZLIB_H 1" >>confdefs.h
  
  		;;
  	*)
- 		{ $as_echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** bzip2 support disabled" >&5
  $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
  		;;
  	esac
  
      else
- 	{ $as_echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** bzip2 support disabled" >&5
  $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
      fi
  fi
  
  # Check whether --enable-unrar was given.
- if test "${enable_unrar+set}" = set; then
+ if test "${enable_unrar+set}" = set; then :
    enableval=$enable_unrar; want_unrar=$enableval
  else
    want_unrar="yes"
@@@ -19426,7 -15559,7 +15559,7 @@@ f
  
  
  # Check whether --enable-getaddrinfo was given.
- if test "${enable_getaddrinfo+set}" = set; then
+ if test "${enable_getaddrinfo+set}" = set; then :
    enableval=$enable_getaddrinfo; want_getaddrinfo=$enableval
  else
    want_getaddrinfo="yes"
@@@ -19435,20 -15568,16 +15568,16 @@@ f
  
  if test "$want_getaddrinfo" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
  $as_echo_n "checking for getaddrinfo... " >&6; }
-     if test "${have_cv_gai+set}" = set; then
+     if test "${have_cv_gai+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
- 		if test "$cross_compiling" = yes; then
+ 		if test "$cross_compiling" = yes; then :
    have_cv_gai=no
  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>
@@@ -19468,58 -15597,29 +15597,29 @@@
  		    }
  
  _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 :
    have_cv_gai=yes
  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 )
- have_cv_gai=no
+   have_cv_gai=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
  
-     { $as_echo "$as_me:$LINENO: result: $have_cv_gai" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_gai" >&5
  $as_echo "$have_cv_gai" >&6; }
      if test "$have_cv_gai" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETADDRINFO 1
- _ACEOF
+ $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
  
      fi
  fi
  
  # Check whether --enable-ipv6 was given.
- if test "${enable_ipv6+set}" = set; then
+ if test "${enable_ipv6+set}" = set; then :
    enableval=$enable_ipv6; want_ipv6=$enableval
  else
    want_ipv6="yes"
@@@ -19528,20 -15628,16 +15628,16 @@@ f
  
  if test "$want_ipv6" = "yes"
  then
-     { $as_echo "$as_me:$LINENO: checking for IPv6 support" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
  $as_echo_n "checking for IPv6 support... " >&6; }
-     if test "${have_cv_ipv6+set}" = set; then
+     if test "${have_cv_ipv6+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
- 		if test "$cross_compiling" = yes; then
+ 		if test "$cross_compiling" = yes; then :
    have_cv_ipv6=no
  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>
@@@ -19566,52 -15662,23 +15662,23 @@@
  		    }
  
  _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 :
    have_cv_ipv6=yes
  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 )
- have_cv_ipv6=no
+   have_cv_ipv6=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
  
-     { $as_echo "$as_me:$LINENO: result: $have_cv_ipv6" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_ipv6" >&5
  $as_echo "$have_cv_ipv6" >&6; }
      if test "$have_cv_ipv6" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define SUPPORT_IPv6 1
- _ACEOF
+ $as_echo "#define SUPPORT_IPv6 1" >>confdefs.h
  
      fi
  fi
@@@ -19619,7 -15686,7 +15686,7 @@@
  
  
  # Check whether --enable-dns was given.
- if test "${enable_dns+set}" = set; then
+ if test "${enable_dns+set}" = set; then :
    enableval=$enable_dns; want_dns=$enableval
  else
    want_dns=yes
@@@ -19628,65 -15695,23 +15695,23 @@@ f
  
  if test $want_dns = yes; then
      ac_cv_have_lresolv=no
-     { $as_echo "$as_me:$LINENO: checking for resolv.h" >&5
- $as_echo_n "checking for resolv.h... " >&6; }
- if test "${ac_cv_header_resolv_h+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_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "
  #include <sys/types.h>
  #include <netinet/in.h>
  #include <arpa/nameser.h>
  
+ "
+ if test "x$ac_cv_header_resolv_h" = x""yes; then :
  
- #include <resolv.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_cv_header_resolv_h=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_resolv_h=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
- $as_echo "$ac_cv_header_resolv_h" >&6; }
- if test "x$ac_cv_header_resolv_h" = x""yes; then
- 
- 	    { $as_echo "$as_me:$LINENO: checking for dn_expand in std libs" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in std libs" >&5
  $as_echo_n "checking for dn_expand in std libs... " >&6; }
- if test "${ac_cv_have_lresolv_std+set}" = set; then
+ if test "${ac_cv_have_lresolv_std+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  	    	ac_cv_have_lresolv_std='no'
- 	        cat >conftest.$ac_ext <<_ACEOF
+ 	        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
  #include <sys/types.h>
  #include <netinet/in.h>
@@@ -19695,56 -15720,30 +15720,30 @@@
  int main() { return (long)dn_expand; }
  
  _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_lresolv_std='yes'
  		    ac_cv_have_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
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_std" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lresolv_std" >&5
  $as_echo "$ac_cv_have_lresolv_std" >&6; }
  	    if test "x$ac_cv_have_lresolv" = "xno"; then
  	    bklibs=$LIBS
  	    LIBS=-lresolv
- 	    { $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
  $as_echo_n "checking for dn_expand in -lresolv... " >&6; }
- if test "${ac_cv_have_lresolv_lresolv+set}" = set; then
+ if test "${ac_cv_have_lresolv_lresolv+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  		ac_cv_have_lresolv_lresolv='yes'
- 		cat >conftest.$ac_ext <<_ACEOF
+ 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
  #include <sys/types.h>
  #include <netinet/in.h>
@@@ -19753,44 -15752,17 +15752,17 @@@
  int main() { return (long)dn_expand; }
  
  _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_lresolv_lresolv='yes'
  		    ac_cv_have_lresolv=' -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
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_lresolv" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lresolv_lresolv" >&5
  $as_echo "$ac_cv_have_lresolv_lresolv" >&6; }
  	    LIBS=$bklibs;
  	    fi
@@@ -19803,12 -15775,10 +15775,10 @@@ f
      if test "x$ac_cv_have_lresolv" != "xno"; then
      	FRESHCLAM_LIBS="$FRESHCLAM_LIBS$ac_cv_have_lresolv"
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_RESOLV_H 1
- _ACEOF
+ $as_echo "#define HAVE_RESOLV_H 1" >>confdefs.h
  
      else
- 	{ $as_echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** DNS support disabled" >&5
  $as_echo "$as_me: WARNING: ****** DNS support disabled" >&2;}
      fi
  fi
@@@ -19816,7 -15786,7 +15786,7 @@@
  
  
  # Check whether --enable-clamuko was given.
- if test "${enable_clamuko+set}" = set; then
+ if test "${enable_clamuko+set}" = set; then :
    enableval=$enable_clamuko; want_clamuko=$enableval
  else
    want_clamuko="yes"
@@@ -19824,21 -15794,15 +15794,15 @@@ f
  
  
  if test "$cross_compiling" = no; then
-  { $as_echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
  $as_echo_n "checking whether setpgrp takes no argument... " >&6; }
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
+ if test "${ac_cv_func_setpgrp_void+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   if test "$cross_compiling" = yes; then
-   { { $as_echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
- $as_echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
+   if test "$cross_compiling" = yes; then :
+   as_fn_error "cannot check setpgrp when cross compiling" "$LINENO" 5
  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.  */
  $ac_includes_default
  int
@@@ -19852,64 -15816,31 +15816,31 @@@ 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
+ if ac_fn_c_try_run "$LINENO"; then :
    ac_cv_func_setpgrp_void=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_func_setpgrp_void=yes
+   ac_cv_func_setpgrp_void=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_func_setpgrp_void" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5
  $as_echo "$ac_cv_func_setpgrp_void" >&6; }
  if test $ac_cv_func_setpgrp_void = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define SETPGRP_VOID 1
- _ACEOF
+ $as_echo "#define SETPGRP_VOID 1" >>confdefs.h
  
  fi
  
  else
-  { $as_echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
  $as_echo_n "checking whether setpgrp takes no argument... " >&6; }
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
+ if test "${ac_cv_func_setpgrp_void+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 <unistd.h>
@@@ -19927,46 -15858,23 +15858,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_func_setpgrp_void=no
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_setpgrp_void=yes
+   ac_cv_func_setpgrp_void=yes
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5
  $as_echo "$ac_cv_func_setpgrp_void" >&6; }
  if test $ac_cv_func_setpgrp_void = yes; then
-  cat >>confdefs.h <<\_ACEOF
- #define SETPGRP_VOID 1
- _ACEOF
+  $as_echo "#define SETPGRP_VOID 1" >>confdefs.h
  
  fi
  fi
  
  # Check whether --enable-milter was given.
- if test "${enable_milter+set}" = set; then
+ if test "${enable_milter+set}" = set; then :
    enableval=$enable_milter; have_milter=$enableval
  else
    have_milter="no"
@@@ -19976,22 -15884,18 +15884,18 @@@ f
  have_system_tommath=no
  
  # Check whether --with-system-tommath was given.
- if test "${with_system_tommath+set}" = set; then
+ if test "${with_system_tommath+set}" = set; then :
    withval=$with_system_tommath;
  	case "$withval" in
  	yes)
- 		{ $as_echo "$as_me:$LINENO: checking for mp_mul_2d in -ltommath" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mul_2d in -ltommath" >&5
  $as_echo_n "checking for mp_mul_2d in -ltommath... " >&6; }
- if test "${ac_cv_lib_tommath_mp_mul_2d+set}" = set; then
+ if test "${ac_cv_lib_tommath_mp_mul_2d+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ltommath  $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.
@@@ -20009,63 -15913,34 +15913,34 @@@ return mp_mul_2d ()
    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_tommath_mp_mul_2d=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_tommath_mp_mul_2d=no
+   ac_cv_lib_tommath_mp_mul_2d=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_tommath_mp_mul_2d" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tommath_mp_mul_2d" >&5
  $as_echo "$ac_cv_lib_tommath_mp_mul_2d" >&6; }
- if test "x$ac_cv_lib_tommath_mp_mul_2d" = x""yes; then
+ if test "x$ac_cv_lib_tommath_mp_mul_2d" = x""yes; then :
  
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYSTEM_TOMMATH 1
- _ACEOF
+ $as_echo "#define HAVE_SYSTEM_TOMMATH 1" >>confdefs.h
  
  				LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ltommath"
  				have_system_tommath=yes
  
  else
-   { $as_echo "$as_me:$LINENO: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&5
  $as_echo "$as_me: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&2;}
  
  fi
  
  	;;
  	no) ;;
- 	*) { { $as_echo "$as_me:$LINENO: error: --with-system-tommath does not take an argument" >&5
- $as_echo "$as_me: error: --with-system-tommath does not take an argument" >&2;}
-    { (exit 1); exit 1; }; } ;;
+ 	*) as_fn_error "--with-system-tommath does not take an argument" "$LINENO" 5 ;;
  	esac
  
  fi
@@@ -20082,31 -15957,25 +15957,25 @@@ f
  
  
  # Check whether --with-iconv was given.
- if test "${with_iconv+set}" = set; then
+ if test "${with_iconv+set}" = set; then :
    withval=$with_iconv;
   case "$withval" in
  	 yes|no) wiconv="$withval";;
- 	 *) { { $as_echo "$as_me:$LINENO: error: --with-iconv does not take an argument" >&5
- $as_echo "$as_me: error: --with-iconv does not take an argument" >&2;}
-    { (exit 1); exit 1; }; };;
+ 	 *) as_fn_error "--with-iconv does not take an argument" "$LINENO" 5;;
   esac
  else
     wiconv=auto
  fi
  
  if test "X$wiconv" != "Xno"; then
- 	{ $as_echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
  $as_echo_n "checking for libiconv_open in -liconv... " >&6; }
- if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
+ if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-liconv  $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.
@@@ -20124,55 -15993,26 +15993,26 @@@ return libiconv_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_iconv_libiconv_open=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_iconv_libiconv_open=no
+   ac_cv_lib_iconv_libiconv_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_iconv_libiconv_open" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
  $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }
- if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then
+ if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then :
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"
  fi
  
- 	{ $as_echo "$as_me:$LINENO: checking for iconv" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
  $as_echo_n "checking for iconv... " >&6; }
  	save_LIBS="$LIBS"
  	LIBS="$LIBCLAMAV_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 <iconv.h>
@@@ -20192,66 -16032,39 +16032,39 @@@ 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 :
  
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
+ $as_echo "#define HAVE_ICONV 1" >>confdefs.h
  
  
  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; }
  
  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="$save_LIBS"
  fi
  
  # Check whether --enable-pthreads was given.
- if test "${enable_pthreads+set}" = set; then
+ if test "${enable_pthreads+set}" = set; then :
    enableval=$enable_pthreads; have_pthreads=$enableval
  fi
  
  
  # Check whether --enable-cr was given.
- if test "${enable_cr+set}" = set; then
+ if test "${enable_cr+set}" = set; then :
    enableval=$enable_cr; use_cr=$enableval
  fi
  
  
  # Check whether --enable-id-check was given.
- if test "${enable_id_check+set}" = set; then
+ if test "${enable_id_check+set}" = set; then :
    enableval=$enable_id_check; use_id=$enableval
  else
    use_id="no"
@@@ -20259,7 -16072,7 +16072,7 @@@ f
  
  
  # Check whether --enable-yp-check was given.
- if test "${enable_yp_check+set}" = set; then
+ if test "${enable_yp_check+set}" = set; then :
    enableval=$enable_yp_check; use_yp=$enableval
  else
    use_yp="no"
@@@ -20268,7 -16081,7 +16081,7 @@@ f
  
  
  # Check whether --with-user was given.
- if test "${with_user+set}" = set; then
+ if test "${with_user+set}" = set; then :
    withval=$with_user; clamav_user="$withval"
  else
    clamav_user="clamav"
@@@ -20277,7 -16090,7 +16090,7 @@@ f
  
  
  # Check whether --with-group was given.
- if test "${with_group+set}" = set; then
+ if test "${with_group+set}" = set; then :
    withval=$with_group; clamav_group="$withval"
  else
    clamav_group="clamav"
@@@ -20296,7 -16109,7 +16109,7 @@@ _ACEO
  
  
  # Check whether --enable-clamav was given.
- if test "${enable_clamav+set}" = set; then
+ if test "${enable_clamav+set}" = set; then :
    enableval=$enable_clamav; test_clamav=$enableval
  else
    test_clamav=yes
@@@ -20304,7 -16117,7 +16117,7 @@@ f
  
  
  # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
+ if test "${enable_debug+set}" = set; then :
    enableval=$enable_debug; enable_debug=$enableval
  else
    enable_debug="no"
@@@ -20313,20 -16126,16 +16126,16 @@@ f
  
  if test "$enable_debug" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_DEBUG 1
- _ACEOF
+ $as_echo "#define CL_DEBUG 1" >>confdefs.h
  
  else
  
- cat >>confdefs.h <<\_ACEOF
- #define NDEBUG 1
- _ACEOF
+ $as_echo "#define NDEBUG 1" >>confdefs.h
  
  fi
  
  # Check whether --enable-no-cache was given.
- if test "${enable_no_cache+set}" = set; then
+ if test "${enable_no_cache+set}" = set; then :
    enableval=$enable_no_cache; enable_nocache=$enableval
  else
    enable_nocache="no"
@@@ -20335,14 -16144,12 +16144,12 @@@ f
  
  if test "$enable_nocache" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define FRESHCLAM_NO_CACHE 1
- _ACEOF
+ $as_echo "#define FRESHCLAM_NO_CACHE 1" >>confdefs.h
  
  fi
  
  # Check whether --enable-dns-fix was given.
- if test "${enable_dns_fix+set}" = set; then
+ if test "${enable_dns_fix+set}" = set; then :
    enableval=$enable_dns_fix; enable_dnsfix=$enableval
  else
    enable_dnsfix="no"
@@@ -20351,14 -16158,12 +16158,12 @@@ f
  
  if test "$enable_dnsfix" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define FRESHCLAM_DNS_FIX 1
- _ACEOF
+ $as_echo "#define FRESHCLAM_DNS_FIX 1" >>confdefs.h
  
  fi
  
  # Check whether --enable-bigstack was given.
- if test "${enable_bigstack+set}" = set; then
+ if test "${enable_bigstack+set}" = set; then :
    enableval=$enable_bigstack; enable_bigstack=$enableval
  else
    enable_bigstack="no"
@@@ -20367,15 -16172,13 +16172,13 @@@ f
  
  if test "$enable_bigstack" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BIGSTACK 1
- _ACEOF
+ $as_echo "#define C_BIGSTACK 1" >>confdefs.h
  
  fi
  
  
  # Check whether --with-dbdir was given.
- if test "${with_dbdir+set}" = set; then
+ if test "${with_dbdir+set}" = set; then :
    withval=$with_dbdir; db_dir="$withval"
  else
    db_dir="_default_"
@@@ -20421,13 -16224,9 +16224,9 @@@ cat >>confdefs.h <<_ACEO
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking whether in_port_t is defined" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether in_port_t is defined" >&5
  $as_echo_n "checking whether in_port_t is defined... " >&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 <sys/types.h>
@@@ -20441,50 -16240,23 +16240,23 @@@ in_port_t pt; pt = 0; return pt
    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 :
  
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_IN_PORT_T 1
- _ACEOF
+ $as_echo "#define HAVE_IN_PORT_T 1" >>confdefs.h
  
  
  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; }
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- { $as_echo "$as_me:$LINENO: checking for in_addr_t definition" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t definition" >&5
  $as_echo_n "checking for in_addr_t definition... " >&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 <sys/types.h>
@@@ -20498,96 -16270,57 +16270,57 @@@ 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 :
  
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_IN_ADDR_T 1
- _ACEOF
+ $as_echo "#define HAVE_IN_ADDR_T 1" >>confdefs.h
  
  
  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; }
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  case "$target_os" in
  linux*)
  
- cat >>confdefs.h <<\_ACEOF
- #define C_LINUX 1
- _ACEOF
+ $as_echo "#define C_LINUX 1" >>confdefs.h
  
      if test "$have_pthreads" = "yes"; then
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  	if test "$want_clamuko" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CLAMUKO 1
- _ACEOF
+ $as_echo "#define CLAMUKO 1" >>confdefs.h
  
  	fi
      fi
      ;;
  kfreebsd*-gnu)
  
- cat >>confdefs.h <<\_ACEOF
- #define C_KFREEBSD_GNU 1
- _ACEOF
+ $as_echo "#define C_KFREEBSD_GNU 1" >>confdefs.h
  
      if test "$have_pthreads" = "yes"; then
         THREAD_LIBS="-lpthread"
         TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
         if test "$want_clamuko" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CLAMUKO 1
- _ACEOF
+ $as_echo "#define CLAMUKO 1" >>confdefs.h
  
         fi
      fi
@@@ -20600,20 -16333,14 +16333,14 @@@ solaris*
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_SOLARIS 1
- _ACEOF
+ $as_echo "#define C_SOLARIS 1" >>confdefs.h
  
      ;;
  freebsd[45]*)
@@@ -20621,27 -16348,19 +16348,19 @@@
  	THREAD_LIBS="-pthread -lc_r"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  	if test "$want_clamuko" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CLAMUKO 1
- _ACEOF
+ $as_echo "#define CLAMUKO 1" >>confdefs.h
  
  	fi
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20650,27 -16369,19 +16369,19 @@@ freebsd*
  	THREAD_LIBS="-lthr"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  	if test "$want_clamuko" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CLAMUKO 1
- _ACEOF
+ $as_echo "#define CLAMUKO 1" >>confdefs.h
  
  	fi
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20679,27 -16390,19 +16390,19 @@@ dragonfly*
  	THREAD_LIBS="-pthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  	if test "$want_clamuko" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CLAMUKO 1
- _ACEOF
+ $as_echo "#define CLAMUKO 1" >>confdefs.h
  
  	fi
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20710,20 -16413,14 +16413,14 @@@ openbsd*
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20732,20 -16429,14 +16429,14 @@@ bsdi*
  	THREAD_LIBS="-pthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20753,60 -16444,44 +16444,44 @@@ netbsd*
       if test "$have_pthreads" = "yes"; then
  	THREAD_LIBS="-lpthread"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
       fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
  bsd*)
-     { $as_echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown BSD detected. Disabling thread support." >&5
  $as_echo "Unknown BSD detected. Disabling thread support." >&6; }
      have_pthreads="no"
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
  beos*)
-     { $as_echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: BeOS detected. Disabling thread support." >&5
  $as_echo "BeOS detected. Disabling thread support." >&6; }
      have_pthreads="no"
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BEOS 1
- _ACEOF
+ $as_echo "#define C_BEOS 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
  darwin*)
  
- cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
+ $as_echo "#define C_BSD 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define C_DARWIN 1
- _ACEOF
+ $as_echo "#define C_DARWIN 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define BIND_8_COMPAT 1
- _ACEOF
+ $as_echo "#define BIND_8_COMPAT 1" >>confdefs.h
  
      use_netinfo="yes"
      use_gethostbyname_r="no"
@@@ -20819,20 -16494,14 +16494,14 @@@ os2*
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_OS2 1
- _ACEOF
+ $as_echo "#define C_OS2 1" >>confdefs.h
  
      ;;
  sco*)
@@@ -20842,20 -16511,14 +16511,14 @@@ hpux*
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_HPUX 1
- _ACEOF
+ $as_echo "#define C_HPUX 1" >>confdefs.h
  
      use_gethostbyname_r="no"
      ;;
@@@ -20864,25 -16527,17 +16527,17 @@@ aix*
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_AIX 1
- _ACEOF
+ $as_echo "#define C_AIX 1" >>confdefs.h
  
      ;;
  *-*-osf*)
@@@ -20890,44 -16545,30 +16545,30 @@@
  	THREAD_LIBS="-pthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _POSIX_PII_SOCKET 1
- _ACEOF
+ $as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h
  
      fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_OSF 1
- _ACEOF
+ $as_echo "#define C_OSF 1" >>confdefs.h
  
      ;;
  nto-qnx*)
       if test "$have_pthreads" = "yes"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
       fi
  
- cat >>confdefs.h <<\_ACEOF
- #define C_QNX6 1
- _ACEOF
+ $as_echo "#define C_QNX6 1" >>confdefs.h
  
      ;;
  irix*)
@@@ -20935,28 -16576,19 +16576,20 @@@
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
 +    LIBS="$LIBS -lgen"
  
- cat >>confdefs.h <<\_ACEOF
- #define C_IRIX 1
- _ACEOF
+ $as_echo "#define C_IRIX 1" >>confdefs.h
  
      ;;
  interix*)
  
- cat >>confdefs.h <<\_ACEOF
- #define C_INTERIX 1
- _ACEOF
+ $as_echo "#define C_INTERIX 1" >>confdefs.h
  
      if test "$test_clamav" = "yes"; then
  	if test ! -r /etc/passwd; then
@@@ -20967,35 -16599,25 +16600,25 @@@
  	THREAD_LIBS="-lpthread"
  	TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
      ;;
  gnu*)
  
- cat >>confdefs.h <<\_ACEOF
- #define C_GNU_HURD 1
- _ACEOF
+ $as_echo "#define C_GNU_HURD 1" >>confdefs.h
  
      if test "$have_pthreads" = "yes"; then
         THREAD_LIBS="-lpthread"
         TH_SAFE="-thread-safe"
  
- cat >>confdefs.h <<\_ACEOF
- #define CL_THREAD_SAFE 1
- _ACEOF
+ $as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
  
  
- cat >>confdefs.h <<\_ACEOF
- #define _REENTRANT 1
- _ACEOF
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
  
      fi
      ;;
@@@ -21018,18 -16640,14 +16641,14 @@@ if test "$have_milter" = "yes"; the
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
      fi
      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
-     { $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
- if test "${ac_cv_lib_milter_mi_stop+set}" = set; then
+ if test "${ac_cv_lib_milter_mi_stop+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmilter  $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.
@@@ -21047,57 -16665,28 +16666,28 @@@ return mi_stop ()
    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_milter_mi_stop=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_milter_mi_stop=no
+   ac_cv_lib_milter_mi_stop=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_milter_mi_stop" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter_mi_stop" >&5
  $as_echo "$ac_cv_lib_milter_mi_stop" >&6; }
- if test "x$ac_cv_lib_milter_mi_stop" = x""yes; then
+ if test "x$ac_cv_lib_milter_mi_stop" = x""yes; then :
    CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"
  else
  
- 		{ $as_echo "$as_me:$LINENO: checking for library containing strlcpy" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strlcpy" >&5
  $as_echo_n "checking for library containing strlcpy... " >&6; }
- if test "${ac_cv_search_strlcpy+set}" = set; then
+ if test "${ac_cv_search_strlcpy+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.
@@@ -21122,72 -16711,41 +16712,41 @@@ for ac_lib in '' sm smutil; 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_strlcpy=$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_strlcpy+set}" = set; then
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+   if test "${ac_cv_search_strlcpy+set}" = set; then :
    break
  fi
  done
- if test "${ac_cv_search_strlcpy+set}" = set; then
-   :
+ if test "${ac_cv_search_strlcpy+set}" = set; then :
+ 
  else
    ac_cv_search_strlcpy=no
  fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_search_strlcpy" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strlcpy" >&5
  $as_echo "$ac_cv_search_strlcpy" >&6; }
  ac_res=$ac_cv_search_strlcpy
- if test "$ac_res" != no; then
+ if test "$ac_res" != no; then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"
  fi
  
  	LIBS="$save_LIBS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"
  	$as_unset ac_cv_lib_milter_mi_stop
- 	{ $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
- if test "${ac_cv_lib_milter_mi_stop+set}" = set; then
+ if test "${ac_cv_lib_milter_mi_stop+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmilter  $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.
@@@ -21205,49 -16763,22 +16764,22 @@@ return mi_stop ()
    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_milter_mi_stop=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_milter_mi_stop=no
+   ac_cv_lib_milter_mi_stop=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_milter_mi_stop" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter_mi_stop" >&5
  $as_echo "$ac_cv_lib_milter_mi_stop" >&6; }
- if test "x$ac_cv_lib_milter_mi_stop" = x""yes; then
+ if test "x$ac_cv_lib_milter_mi_stop" = x""yes; then :
    CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
  else
  
- 	    { { $as_echo "$as_me:$LINENO: error: Cannot find libmilter" >&5
- $as_echo "$as_me: error: Cannot find libmilter" >&2;}
-    { (exit 1); exit 1; }; }
+ 	    as_fn_error "Cannot find libmilter" "$LINENO" 5
  
  fi
  
@@@ -21255,158 -16786,17 +16787,17 @@@
  fi
  
      LIBS="$save_LIBS"
- 
- for ac_header in libmilter/mfapi.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 http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _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 libmilter/mfapi.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
+ if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_LIBMILTER_MFAPI_H 1
  _ACEOF
   have_milter="yes"
  else
  
- 	{ { $as_echo "$as_me:$LINENO: error: Please install mfapi.h from the sendmail distribution" >&5
- $as_echo "$as_me: error: Please install mfapi.h from the sendmail distribution" >&2;}
-    { (exit 1); exit 1; }; }
+ 	as_fn_error "Please install mfapi.h from the sendmail distribution" "$LINENO" 5
  
  fi
  
@@@ -21435,101 -16825,12 +16826,12 @@@ if test "$have_pthreads" = "yes
  then
      save_LIBS="$LIBS"
      LIBS="$THREAD_LIBS $LIBS"
- 
- 
- for ac_func in sched_yield pthread_yield
- 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 sched_yield pthread_yield
+ 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
@@@ -21539,20 -16840,14 +16841,14 @@@ don
  
      LIBS="$save_LIBS"
  
- cat >>confdefs.h <<\_ACEOF
- #define BUILD_CLAMD 1
- _ACEOF
+ $as_echo "#define BUILD_CLAMD 1" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for gethostbyname_r" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r" >&5
  $as_echo_n "checking for gethostbyname_r... " >&6; }
  if test -z "$ac_cv_gethostbyname_args"; 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 <sys/types.h>
@@@ -21573,40 -16868,13 +16869,13 @@@ hp = gethostbyname_r(name, &h, buffer, 
    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_gethostbyname_args=5
- 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 -z "$ac_cv_gethostbyname_args"; 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 <sys/types.h>
@@@ -21626,40 -16894,13 +16895,13 @@@ rc = gethostbyname_r(name, &h, &hdata)
    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_gethostbyname_args=3
- 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 -z "$ac_cv_gethostbyname_args"; 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 <sys/types.h>
@@@ -21682,80 -16923,47 +16924,47 @@@ rc = gethostbyname_r(name, &h, buf, 10
    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_gethostbyname_args=6
- 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
  
  # Check whether --enable-gethostbyname_r was given.
- if test "${enable_gethostbyname_r+set}" = set; then
+ if test "${enable_gethostbyname_r+set}" = set; then :
    enableval=$enable_gethostbyname_r; use_gethostbyname_r=$enableval
  fi
  
  
  if test "$use_gethostbyname_r" = "no"; then
-     { $as_echo "$as_me:$LINENO: result: support disabled" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: support disabled" >&5
  $as_echo "support disabled" >&6; }
  elif test -z "$ac_cv_gethostbyname_args"; then
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  else
      if test "$ac_cv_gethostbyname_args" = 3; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETHOSTBYNAME_R_3 1
- _ACEOF
+ $as_echo "#define HAVE_GETHOSTBYNAME_R_3 1" >>confdefs.h
  
      elif test "$ac_cv_gethostbyname_args" = 5; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETHOSTBYNAME_R_5 1
- _ACEOF
+ $as_echo "#define HAVE_GETHOSTBYNAME_R_5 1" >>confdefs.h
  
      elif test "$ac_cv_gethostbyname_args" = 6; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETHOSTBYNAME_R_6 1
- _ACEOF
+ $as_echo "#define HAVE_GETHOSTBYNAME_R_6 1" >>confdefs.h
  
      fi
-     { $as_echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_gethostbyname_args arguments" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, and it takes $ac_cv_gethostbyname_args arguments" >&5
  $as_echo "yes, and it takes $ac_cv_gethostbyname_args arguments" >&6; }
  fi
  
  
- { $as_echo "$as_me:$LINENO: checking for readdir_r" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readdir_r" >&5
  $as_echo_n "checking for readdir_r... " >&6; }
  if test -z "$ac_cv_readdir_args"; 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 <sys/types.h>
@@@ -21773,40 -16981,13 +16982,13 @@@ 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_readdir_args=2
- 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 -z "$ac_cv_readdir_args"; 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 <sys/types.h>
@@@ -21825,37 -17006,14 +17007,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_readdir_args=3
- 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
  
  # Check whether --enable-readdir_r was given.
- if test "${enable_readdir_r+set}" = set; then
+ if test "${enable_readdir_r+set}" = set; then :
    enableval=$enable_readdir_r; enable_readdir_r=$enableval
  else
    enable_readdir_r="no"
@@@ -21863,37 -17021,29 +17022,29 @@@ f
  
  
  if test "$enable_readdir_r" = "no"; then
-     { $as_echo "$as_me:$LINENO: result: support disabled" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: support disabled" >&5
  $as_echo "support disabled" >&6; }
  elif test -z "$ac_cv_readdir_args"; then
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  else
      if test "$ac_cv_readdir_args" = 2; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_READDIR_R_2 1
- _ACEOF
+ $as_echo "#define HAVE_READDIR_R_2 1" >>confdefs.h
  
      elif test "$ac_cv_readdir_args" = 3; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_READDIR_R_3 1
- _ACEOF
+ $as_echo "#define HAVE_READDIR_R_3 1" >>confdefs.h
  
      fi
-     { $as_echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_readdir_args arguments" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, and it takes $ac_cv_readdir_args arguments" >&5
  $as_echo "yes, and it takes $ac_cv_readdir_args arguments" >&6; }
  fi
  
- { $as_echo "$as_me:$LINENO: checking for ctime_r" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ctime_r" >&5
  $as_echo_n "checking for ctime_r... " >&6; }
  if test "$ac_cv_func_ctime_r" = "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 <time.h>
@@@ -21910,64 -17060,35 +17061,35 @@@ 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_ctime_args=3
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CTIME_R_3 1
- _ACEOF
+ $as_echo "#define HAVE_CTIME_R_3 1" >>confdefs.h
  
  
  else
  
  	ac_cv_ctime_args=2
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CTIME_R_2 1
- _ACEOF
+ $as_echo "#define HAVE_CTIME_R_2 1" >>confdefs.h
  
  
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     { $as_echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_ctime_args arguments" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, and it takes $ac_cv_ctime_args arguments" >&5
  $as_echo "yes, and it takes $ac_cv_ctime_args arguments" >&6; }
  fi
  
- { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
  $as_echo_n "checking for socklen_t... " >&6; }
- if test "${ac_cv_socklen_t+set}" = set; then
+ if test "${ac_cv_socklen_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      ac_cv_socklen_t=no
-     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>
@@@ -21984,54 -17105,27 +17106,27 @@@ 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_socklen_t=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
  
- { $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_socklen_t" >&5
  $as_echo "$ac_cv_socklen_t" >&6; }
      if test $ac_cv_socklen_t = no; then
-     { $as_echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
  $as_echo_n "checking for socklen_t equivalent... " >&6; }
-     if test "${ac_cv_socklen_t_equiv+set}" = set; then
+     if test "${ac_cv_socklen_t_equiv+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  	ac_cv_socklen_t_equiv=int
          for t in int size_t unsigned long "unsigned long"; 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.  */
  
  		#include <sys/types.h>
@@@ -22048,41 -17142,18 +17143,18 @@@ 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_socklen_t_equiv="$t"
  		break
  
- 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
  	done
  
  fi
  
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t_equiv" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_socklen_t_equiv" >&5
  $as_echo "$ac_cv_socklen_t_equiv" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -22095,23 -17166,23 +17167,23 @@@ if test "$test_clamav" = "yes
  then
          if test "$use_id" = "no"
      then
- 	{ $as_echo "$as_me:$LINENO: checking for $clamav_user in /etc/passwd" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $clamav_user in /etc/passwd" >&5
  $as_echo_n "checking for $clamav_user in /etc/passwd... " >&6; }
  	if test -r /etc/passwd; then
  	    clamavuser=`cat /etc/passwd|grep "^$clamav_user:"`
  	    clamavgroup=`cat /etc/group|grep "^$clamav_group:"`
  	fi
      else
- 	{ $as_echo "$as_me:$LINENO: checking for $clamav_user using id" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $clamav_user using id" >&5
  $as_echo_n "checking for $clamav_user using id... " >&6; }
  	id $clamav_user > /dev/null 2>&1
  	if test "$?" = 0 ; then
  	    clamavuser=1
  	    # Extract the first word of "getent", so it can be a program name with args.
  set dummy getent; 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_GETENT+set}" = set; then
+ if test "${ac_cv_path_GETENT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $GETENT in
@@@ -22124,14 -17195,14 +17196,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_GETENT="$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
  
    ;;
@@@ -22139,10 -17210,10 +17211,10 @@@ esa
  fi
  GETENT=$ac_cv_path_GETENT
  if test -n "$GETENT"; then
-   { $as_echo "$as_me:$LINENO: result: $GETENT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETENT" >&5
  $as_echo "$GETENT" >&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
  
@@@ -22158,12 -17229,12 +17230,12 @@@
      if test "$use_netinfo" = "yes"
      then
  	if test -x /usr/bin/dscl; then
- 	    { $as_echo "$as_me:$LINENO: checking for $clamav_user using dscl" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $clamav_user using dscl" >&5
  $as_echo_n "checking for $clamav_user using dscl... " >&6; }
  	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
  	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
  	else
- 	    { $as_echo "$as_me:$LINENO: checking for $clamav_user using netinfo" >&5
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $clamav_user using netinfo" >&5
  $as_echo_n "checking for $clamav_user using netinfo... " >&6; }
  	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
  	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
@@@ -22172,7 -17243,7 +17244,7 @@@
  
      if test "$use_yp" = "yes"
      then
- 	{ $as_echo "$as_me:$LINENO: checking for $clamav_user using ypmatch" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $clamav_user using ypmatch" >&5
  $as_echo_n "checking for $clamav_user using ypmatch... " >&6; }
          clamavuser=`ypmatch ${clamav_user} passwd`
          clamavgroup=`ypmatch ${clamav_group} group`
@@@ -22180,13 -17251,11 +17252,11 @@@
  
      if test -z "$clamavuser" || test -z "$clamavgroup"
      then
- 	{ $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: User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" >&5
- $as_echo "$as_me: error: User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" >&2;}
-    { (exit 1); exit 1; }; }
+ 	as_fn_error "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
      else
- 	{ $as_echo "$as_me:$LINENO: result: yes, user $clamav_user and group $clamav_group" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user $clamav_user and group $clamav_group" >&5
  $as_echo "yes, user $clamav_user and group $clamav_group" >&6; }
          CLAMAVUSER="$clamav_user"
          CLAMAVGROUP="$clamav_group"
@@@ -22195,17 -17264,13 +17265,13 @@@
      fi
  fi
  
- { $as_echo "$as_me:$LINENO: checking for structure packing via __attribute__((packed))" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for structure packing via __attribute__((packed))" >&5
  $as_echo_n "checking for structure packing via __attribute__((packed))... " >&6; }
- if test "${have_cv_attrib_packed+set}" = set; then
+ if test "${have_cv_attrib_packed+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
@@@ -22220,60 -17285,32 +17286,32 @@@ 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 :
    have_cv_attrib_packed=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	have_cv_attrib_packed=no
+   have_cv_attrib_packed=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
- { $as_echo "$as_me:$LINENO: result: $have_cv_attrib_packed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_attrib_packed" >&5
  $as_echo "$have_cv_attrib_packed" >&6; }
  
  if test "$have_cv_attrib_packed" = no; then
- 	{ $as_echo "$as_me:$LINENO: checking for structure packing via pragma" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for structure packing via pragma" >&5
  $as_echo_n "checking for structure packing via pragma... " >&6; }
- 	if test "${have_cv_pragma_pack+set}" = set; then
+ 	if test "${have_cv_pragma_pack+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
- 		if test "$cross_compiling" = yes; then
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ 		if test "$cross_compiling" = yes; then :
+   { { $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 test program while cross compiling
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ as_fn_error "cannot run test program while cross compiling
+ See \`config.log' for more details." "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  			    int main(int argc, char **argv) {
@@@ -22281,74 -17318,38 +17319,38 @@@
  			struct { char c; long l; } s;
  			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; }
  _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 :
    have_cv_pragma_pack=yes
  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 )
- have_cv_pragma_pack=no
+   have_cv_pragma_pack=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
  
- 	{ $as_echo "$as_me:$LINENO: result: $have_cv_pragma_pack" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_pragma_pack" >&5
  $as_echo "$have_cv_pragma_pack" >&6; }
  	if test "$have_cv_pragma_pack" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRAGMA_PACK 1
- _ACEOF
+ $as_echo "#define HAVE_PRAGMA_PACK 1" >>confdefs.h
  
  	else
- 		{ $as_echo "$as_me:$LINENO: checking for structure packing via hppa/hp-ux pragma" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for structure packing via hppa/hp-ux pragma" >&5
  $as_echo_n "checking for structure packing via hppa/hp-ux pragma... " >&6; }
- 		if test "${have_cv_pragma_pack_hpux+set}" = set; then
+ 		if test "${have_cv_pragma_pack_hpux+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
- 			if test "$cross_compiling" = yes; then
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ 			if test "$cross_compiling" = yes; then :
+   { { $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 test program while cross compiling
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ as_fn_error "cannot run test program while cross compiling
+ See \`config.log' for more details." "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  			/* hppa/hp-ux wants pragma outside of function */
@@@ -22357,66 -17358,33 +17359,33 @@@
  			    int main(int argc, char **argv) {
  			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; }
  _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 :
    have_cv_pragma_pack_hpux=yes
  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 )
- have_cv_pragma_pack_hpux=no
+   have_cv_pragma_pack_hpux=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
  
- 		{ $as_echo "$as_me:$LINENO: result: $have_cv_pragma_pack_hpux" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_pragma_pack_hpux" >&5
  $as_echo "$have_cv_pragma_pack_hpux" >&6; }
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRAGMA_PACK_HPPA 1
- _ACEOF
+ $as_echo "#define HAVE_PRAGMA_PACK_HPPA 1" >>confdefs.h
  
  	fi
  fi
  
- { $as_echo "$as_me:$LINENO: checking for type aligning via __attribute__((aligned))" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type aligning via __attribute__((aligned))" >&5
  $as_echo_n "checking for type aligning via __attribute__((aligned))... " >&6; }
- if test "${have_cv_attrib_aligned+set}" = set; then
+ if test "${have_cv_attrib_aligned+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
@@@ -22427,92 -17395,55 +17396,55 @@@ typedef int cl_aligned_int __attribute_
    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 :
    have_cv_attrib_aligned=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	have_cv_attrib_aligned=no
+   have_cv_attrib_aligned=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
- { $as_echo "$as_me:$LINENO: result: $have_cv_attrib_aligned" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cv_attrib_aligned" >&5
  $as_echo "$have_cv_attrib_aligned" >&6; }
  
  if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
- 	{ { $as_echo "$as_me:$LINENO: error: Need to know how to pack structures with this compiler" >&5
- $as_echo "$as_me: error: Need to know how to pack structures with this compiler" >&2;}
-    { (exit 1); exit 1; }; }
+ 	as_fn_error "Need to know how to pack structures with this compiler" "$LINENO" 5
  fi
  
  if test "$have_cv_attrib_packed" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ATTRIB_PACKED 1
- _ACEOF
+ $as_echo "#define HAVE_ATTRIB_PACKED 1" >>confdefs.h
  
  fi
  
  if test "$have_cv_attrib_aligned" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ATTRIB_ALIGNED 1
- _ACEOF
+ $as_echo "#define HAVE_ATTRIB_ALIGNED 1" >>confdefs.h
  
  fi
  
- { $as_echo "$as_me:$LINENO: checking for fd_set" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5
  $as_echo_n "checking for fd_set... " >&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 <sys/select.h>
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "fd_mask" >/dev/null 2>&1; then
+   $EGREP "fd_mask" >/dev/null 2>&1; then :
    have_fd_set=yes
  fi
  rm -f conftest*
  
  if test "$have_fd_set" = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYS_SELECT_H 1
- _ACEOF
+ $as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
  
- 	{ $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5
  $as_echo "yes, found in sys/select.h" >&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/time.h>
  			#include <sys/types.h>
@@@ -22527,57 -17458,30 +17459,30 @@@ fd_set readMask, writeMask
    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 :
    have_fd_set=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	have_fd_set=no
+   have_fd_set=no
  fi
- 
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  	if test "$have_fd_set" = yes; then
- 		{ $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/types.h" >&5
  $as_echo "yes, found in sys/types.h" >&6; }
  	else
  
- cat >>confdefs.h <<\_ACEOF
- #define NO_FD_SET 1
- _ACEOF
+ $as_echo "#define NO_FD_SET 1" >>confdefs.h
  
- 		{ $as_echo "$as_me:$LINENO: result: no" >&5
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  	fi
  fi
  
- { $as_echo "$as_me:$LINENO: checking default FD_SETSIZE value" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking default FD_SETSIZE value" >&5
  $as_echo_n "checking default FD_SETSIZE value... " >&6; }
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
    DEFAULT_FD_SETSIZE=256
  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 <stdio.h>
@@@ -22605,43 -17509,16 +17510,16 @@@ int main(void) 
  }
  
  _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 :
    DEFAULT_FD_SETSIZE=`cat conftestval`
  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 )
- DEFAULT_FD_SETSIZE=256
+   DEFAULT_FD_SETSIZE=256
  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
  
- 
- { $as_echo "$as_me:$LINENO: result: $DEFAULT_FD_SETSIZE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_FD_SETSIZE" >&5
  $as_echo "$DEFAULT_FD_SETSIZE" >&6; }
  
  cat >>confdefs.h <<_ACEOF
@@@ -22649,161 -17526,39 +17527,39 @@@
  _ACEOF
  
  
- { $as_echo "$as_me:$LINENO: checking whether signed right shift is sign extended" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether signed right shift is sign extended" >&5
  $as_echo_n "checking whether signed right shift is sign extended... " >&6; }
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
    have_signed_rightshift_extended=no
  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 main(void){int a=-1;int b=a>>1;return(a!=b);}
  _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 :
    have_signed_rightshift_extended=yes
  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 )
- have_signed_rightshift_extended=no
+   have_signed_rightshift_extended=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
  
- 
  if test $have_signed_rightshift_extended = yes; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SAR 1
- _ACEOF
+ $as_echo "#define HAVE_SAR 1" >>confdefs.h
  
  fi
- { $as_echo "$as_me:$LINENO: result: $have_signed_rightshift_extended" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_signed_rightshift_extended" >&5
  $as_echo "$have_signed_rightshift_extended" >&6; };
  
  
- 
- 
  for ac_func in recvmsg sendmsg
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
- $as_echo_n "checking for $ac_func... " >&6; }
- 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
@@@ -22811,17 -17566,13 +17567,13 @@@
  fi
  done
  
- { $as_echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msg_control field in struct msghdr" >&5
  $as_echo_n "checking for msg_control field in struct msghdr... " >&6; }
- if test "${ac_cv_have_control_in_msghdr+set}" = set; then
+ if test "${ac_cv_have_control_in_msghdr+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.  */
  
  #define _XOPEN_SOURCE 500
@@@ -22848,48 -17599,25 +17600,25 @@@ 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
+ if ac_fn_c_try_compile "$LINENO"; then :
     ac_cv_have_control_in_msghdr="yes"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	 ac_cv_have_control_in_msghdr="no"
+    ac_cv_have_control_in_msghdr="no"
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_control_in_msghdr" >&5
  $as_echo "$ac_cv_have_control_in_msghdr" >&6; }
  if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CONTROL_IN_MSGHDR 1
- _ACEOF
+ $as_echo "#define HAVE_CONTROL_IN_MSGHDR 1" >>confdefs.h
  
  
-         { $as_echo "$as_me:$LINENO: checking BSD 4.4 / RFC2292 style fd passing" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking BSD 4.4 / RFC2292 style fd passing" >&5
  $as_echo_n "checking BSD 4.4 / RFC2292 style fd passing... " >&6; }
      # Check whether --enable-fdpassing was given.
- if test "${enable_fdpassing+set}" = set; then
+ if test "${enable_fdpassing+set}" = set; then :
    enableval=$enable_fdpassing; want_fdpassing=$enableval
  else
    want_fdpassing="yes"
@@@ -22897,18 -17625,14 +17626,14 @@@ f
  
  
      if test "x$want_fdpassing" = "xyes"; then
-                 if test "$cross_compiling" = yes; then
+                 if test "$cross_compiling" = yes; then :
    have_fdpass=0
  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.  */
  
  
+ 
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
@@@ -23059,55 -17783,24 +17784,24 @@@ int main(void
  
  
  _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 :
    have_fdpass=1; fdpass_need_xopen=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
- 
- ( exit $ac_status )
- have_fdpass=0
+   have_fdpass=0
  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
  
  
- 
          if test $have_fdpass = 0; then
-             if test "$cross_compiling" = yes; then
+             if test "$cross_compiling" = yes; then :
    have_fdpass=0
  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.  */
  
+ 
  #define _XOPEN_SOURCE 500
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
@@@ -23259,69 -17952,38 +17953,38 @@@ int main(void
  
  
  _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 :
    have_fdpass=1; fdpass_need_xopen=1
  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 )
- have_fdpass=0
+   have_fdpass=0
  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
  
          if test $have_fdpass = 1; then
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FD_PASSING 1
- _ACEOF
+ $as_echo "#define HAVE_FD_PASSING 1" >>confdefs.h
  
              if test $fdpass_need_xopen = 1; then
  
- cat >>confdefs.h <<\_ACEOF
- #define FDPASS_NEED_XOPEN 1
- _ACEOF
+ $as_echo "#define FDPASS_NEED_XOPEN 1" >>confdefs.h
  
-                 { $as_echo "$as_me:$LINENO: result: yes, by defining _XOPEN_SOURCE" >&5
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, by defining _XOPEN_SOURCE" >&5
  $as_echo "yes, by defining _XOPEN_SOURCE" >&6; }
              else
-                 { $as_echo "$as_me:$LINENO: result: yes" >&5
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
              fi
          else
-             { $as_echo "$as_me:$LINENO: result: no" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
          fi
  
      else
-         { $as_echo "$as_me:$LINENO: result: disabled" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
  $as_echo "disabled" >&6; }
      fi
  fi
@@@ -23334,7 -17996,7 +17997,7 @@@ _ACEO
  
  
  # Check whether --enable-clamdtop was given.
- if test "${enable_clamdtop+set}" = set; then
+ if test "${enable_clamdtop+set}" = set; then :
    enableval=$enable_clamdtop; enable_clamdtop=$enableval
  else
    enable_clamdtop="auto"
@@@ -23369,7 -18031,7 +18032,7 @@@ if test "$enable_clamdtop" != "no"; the
  
  
  # Check whether --with-libncurses-prefix was given.
- if test "${with_libncurses_prefix+set}" = set; then
+ if test "${with_libncurses_prefix+set}" = set; then :
    withval=$with_libncurses_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
@@@ -23799,139 -18461,8 +18462,8 @@@ f
    fi
  
  		CPPFLAGS="$CPPFLAGS $INCNCURSES"
- 		if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
- $as_echo_n "checking for ncurses/ncurses.h... " >&6; }
- if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
- $as_echo "$ac_cv_header_ncurses_ncurses_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking ncurses/ncurses.h usability" >&5
- $as_echo_n "checking ncurses/ncurses.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 <ncurses/ncurses.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 ncurses/ncurses.h presence" >&5
- $as_echo_n "checking ncurses/ncurses.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 <ncurses/ncurses.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: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
- $as_echo_n "checking for ncurses/ncurses.h... " >&6; }
- if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_ncurses_ncurses_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
- $as_echo "$ac_cv_header_ncurses_ncurses_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_ncurses_ncurses_h" = x""yes; then
+ 		ac_fn_c_check_header_mongrel "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"
+ if test "x$ac_cv_header_ncurses_ncurses_h" = x""yes; then :
    have_header=yes
  else
    have_header=no
@@@ -23941,16 -18472,12 +18473,12 @@@ f
  		ac_cv_findlib_NCURSES_libs=
  		ac_cv_findlib_NCURSES_ltlibs=
  		ac_cv_findlib_NCURSES_inc=
- 		if test "$have_header" = "yes"; then
+ 		if test "$have_header" = "yes"; then :
  
  				LIBS="$LIBS $LIBNCURSES"
- 				{ $as_echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking with ncurses" >&5
  $as_echo_n "checking linking with ncurses... " >&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 <ncurses/ncurses.h>
  int
@@@ -23961,64 -18488,34 +18489,34 @@@ initscr(); KEY_RESIZE
    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_findlib_NCURSES_libs="$LIBNCURSES"
  					ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
  					ac_cv_findlib_NCURSES_inc="$INCNCURSES"
- 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  
- 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
  
  fi
- 
  		CPPFLAGS="$save_CPPFLAGS"
  		LIBS="$save_LIBS"
- 	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
+ 	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then :
  
- 			{ $as_echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: unable to compile/link with ncurses" >&5
  $as_echo "$as_me: unable to compile/link with ncurses" >&6;}
  			HAVE_LIBNCURSES=no
  
  
  else
  
- 			{ $as_echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
  $as_echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBNCURSES 1
- _ACEOF
+ $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
  
  			HAVE_LIBNCURSES=yes
  			LIBNCURSES="$ac_cv_findlib_NCURSES_libs"
@@@ -24031,7 -18528,6 +18529,6 @@@ f
  
  
  
- 
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
  
@@@ -24060,7 -18556,7 +18557,7 @@@
  
  
  # Check whether --with-libncurses-prefix was given.
- if test "${with_libncurses_prefix+set}" = set; then
+ if test "${with_libncurses_prefix+set}" = set; then :
    withval=$with_libncurses_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
@@@ -24490,139 -18986,8 +18987,8 @@@ f
    fi
  
  		CPPFLAGS="$CPPFLAGS $INCNCURSES"
- 		if test "${ac_cv_header_ncurses_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for ncurses.h" >&5
- $as_echo_n "checking for ncurses.h... " >&6; }
- if test "${ac_cv_header_ncurses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
- $as_echo "$ac_cv_header_ncurses_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking ncurses.h usability" >&5
- $as_echo_n "checking ncurses.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 <ncurses.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 ncurses.h presence" >&5
- $as_echo_n "checking ncurses.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 <ncurses.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: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: ncurses.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: ncurses.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: ncurses.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: ncurses.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: ncurses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: ncurses.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: ncurses.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: ncurses.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for ncurses.h" >&5
- $as_echo_n "checking for ncurses.h... " >&6; }
- if test "${ac_cv_header_ncurses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_ncurses_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
- $as_echo "$ac_cv_header_ncurses_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_ncurses_h" = x""yes; then
+ 		ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+ if test "x$ac_cv_header_ncurses_h" = x""yes; then :
    have_header=yes
  else
    have_header=no
@@@ -24632,16 -18997,12 +18998,12 @@@ f
  		ac_cv_findlib_NCURSES_libs=
  		ac_cv_findlib_NCURSES_ltlibs=
  		ac_cv_findlib_NCURSES_inc=
- 		if test "$have_header" = "yes"; then
+ 		if test "$have_header" = "yes"; then :
  
  				LIBS="$LIBS $LIBNCURSES"
- 				{ $as_echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking with ncurses" >&5
  $as_echo_n "checking linking with ncurses... " >&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 <ncurses.h>
  int
@@@ -24652,64 -19013,34 +19014,34 @@@ initscr(); KEY_RESIZE
    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_findlib_NCURSES_libs="$LIBNCURSES"
  					ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
  					ac_cv_findlib_NCURSES_inc="$INCNCURSES"
- 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  
- 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
  
  fi
- 
  		CPPFLAGS="$save_CPPFLAGS"
  		LIBS="$save_LIBS"
- 	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
+ 	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then :
  
- 			{ $as_echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: unable to compile/link with ncurses" >&5
  $as_echo "$as_me: unable to compile/link with ncurses" >&6;}
  			HAVE_LIBNCURSES=no
  
  
  else
  
- 			{ $as_echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
  $as_echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBNCURSES 1
- _ACEOF
+ $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
  
  			HAVE_LIBNCURSES=yes
  			LIBNCURSES="$ac_cv_findlib_NCURSES_libs"
@@@ -24721,7 -19052,6 +19053,6 @@@
  fi
  
  
- 
  fi
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
@@@ -24751,7 -19081,7 +19082,7 @@@
  
  
  # Check whether --with-libpdcurses-prefix was given.
- if test "${with_libpdcurses_prefix+set}" = set; then
+ if test "${with_libpdcurses_prefix+set}" = set; then :
    withval=$with_libpdcurses_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
@@@ -25181,139 -19511,8 +19512,8 @@@ f
    fi
  
  		CPPFLAGS="$CPPFLAGS $INCPDCURSES"
- 		if test "${ac_cv_header_curses_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for curses.h" >&5
- $as_echo_n "checking for curses.h... " >&6; }
- if test "${ac_cv_header_curses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
- $as_echo "$ac_cv_header_curses_h" >&6; }
- else
-   # Is the header compilable?
- { $as_echo "$as_me:$LINENO: checking curses.h usability" >&5
- $as_echo_n "checking curses.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 <curses.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 curses.h presence" >&5
- $as_echo_n "checking curses.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 <curses.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: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- $as_echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
- $as_echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
- $as_echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
- $as_echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
- $as_echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
- $as_echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-     { $as_echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
- $as_echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
- { $as_echo "$as_me:$LINENO: checking for curses.h" >&5
- $as_echo_n "checking for curses.h... " >&6; }
- if test "${ac_cv_header_curses_h+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_header_curses_h=$ac_header_preproc
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
- $as_echo "$ac_cv_header_curses_h" >&6; }
- 
- fi
- if test "x$ac_cv_header_curses_h" = x""yes; then
+ 		ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+ if test "x$ac_cv_header_curses_h" = x""yes; then :
    have_header=yes
  else
    have_header=no
@@@ -25323,16 -19522,12 +19523,12 @@@ f
  		ac_cv_findlib_PDCURSES_libs=
  		ac_cv_findlib_PDCURSES_ltlibs=
  		ac_cv_findlib_PDCURSES_inc=
- 		if test "$have_header" = "yes"; then
+ 		if test "$have_header" = "yes"; then :
  
  				LIBS="$LIBS $LIBPDCURSES"
- 				{ $as_echo "$as_me:$LINENO: checking linking with pdcurses" >&5
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking with pdcurses" >&5
  $as_echo_n "checking linking with pdcurses... " >&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 <curses.h>
  int
@@@ -25343,65 -19538,35 +19539,35 @@@ initscr(); KEY_RESIZE
    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_findlib_PDCURSES_libs="$LIBPDCURSES"
  					ac_cv_findlib_PDCURSES_ltlibs="$LTLIBPDCURSES"
  					ac_cv_findlib_PDCURSES_inc="$INCPDCURSES"
- 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  
- 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
  
  fi
- 
  		CPPFLAGS="$save_CPPFLAGS"
  		LIBS="$save_LIBS"
- 	if test "X$ac_cv_findlib_PDCURSES_libs" = "X"; then
+ 	if test "X$ac_cv_findlib_PDCURSES_libs" = "X"; then :
  
- 			{ $as_echo "$as_me:$LINENO: unable to compile/link with pdcurses" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: unable to compile/link with pdcurses" >&5
  $as_echo "$as_me: unable to compile/link with pdcurses" >&6;}
  			HAVE_LIBPDCURSES=no
- 			{ $as_echo "$as_me:$LINENO: WARNING: ****** not building clamdtop: ncurses not found" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** not building clamdtop: ncurses not found" >&5
  $as_echo "$as_me: WARNING: ****** not building clamdtop: ncurses not found" >&2;}
  
  else
  
- 			{ $as_echo "$as_me:$LINENO: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&5
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&5
  $as_echo "$as_me: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&6;}
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBPDCURSES 1
- _ACEOF
+ $as_echo "#define HAVE_LIBPDCURSES 1" >>confdefs.h
  
  			HAVE_LIBPDCURSES=yes
  			LIBPDCURSES="$ac_cv_findlib_PDCURSES_libs"
@@@ -25414,19 -19579,13 +19580,13 @@@
  fi
  
  
  fi
  
  if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
-     { { $as_echo "$as_me:$LINENO: error:
- 
- ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
- " >&5
- $as_echo "$as_me: error:
+     as_fn_error "
  
  ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
- " >&2;}
-    { (exit 1); exit 1; }; }
+ " "$LINENO" 5
  fi
  
  fi
@@@ -25447,7 -19606,7 +19607,7 @@@ els
  fi
  
  
- ac_config_files="$ac_config_files libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
+ ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
@@@ -25476,13 -19635,13 +19636,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
@@@ -25490,8 -19649,8 +19650,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"
@@@ -25514,11 -19673,11 +19674,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
@@@ -25538,8 -19697,8 +19698,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
  
@@@ -25547,32 -19706,20 +19707,20 @@@ LTLIBOBJS=$ac_ltlibobj
  
  
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"INSTALL_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  LT_CONFIG_H=clamav-config.h
  
@@@ -25593,83 -19740,54 +19741,54 @@@
  
  
  if test -z "${DISTCHECK_ENABLE_FLAGS_TRUE}" && test -z "${DISTCHECK_ENABLE_FLAGS_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHECK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"HAVE_LIBCHECK\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"HAVE_LIBCHECK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UNRAR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"ENABLE_UNRAR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"ENABLE_UNRAR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"LINK_TOMMATH\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"LINK_TOMMATH\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"LINK_TOMMATH\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"BUILD_CLAMD\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"BUILD_CLAMD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_MILTER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"HAVE_MILTER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"HAVE_MILTER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CURSES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"HAVE_CURSES\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+   as_fn_error "conditional \"HAVE_CURSES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
  
  : ${CONFIG_STATUS=./config.status}
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ { $as_echo "$as_me:${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.
@@@ -25679,17 -19797,18 +19798,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
@@@ -25697,23 -19816,15 +19817,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
@@@ -25721,7 -19832,13 +19833,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
@@@ -25732,7 -19849,7 +19850,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\\(.*\\)"`;;
@@@ -25755,13 -19872,6 +19873,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
@@@ -25771,15 -19881,15 +19882,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
  
       ;;
@@@ -25791,12 -19901,16 +19902,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='> '
@@@ -25808,7 -19922,89 +19923,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
@@@ -25822,8 -20018,12 +20019,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\(//\)$' \| \
@@@ -25843,76 -20043,25 +20044,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
@@@ -25941,8 -20090,56 +20091,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
@@@ -25961,10 -20158,10 +20159,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
    '
@@@ -25979,13 -20176,19 +20177,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 clamav $as_me devel, which was
- generated by GNU Autoconf 2.63.  Invocation command line was
+ generated by GNU Autoconf 2.64.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -26017,10 -20220,11 +20221,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
@@@ -26042,16 -20246,16 +20247,16 @@@ $config_header
  Configuration commands:
  $config_commands
  
- Report bugs to <bug-autoconf at gnu.org>."
+ Report bugs to <http://bugs.clamav.net/>."
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  clamav config.status devel
- configured by $0, generated by GNU Autoconf 2.63,
+ 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."
  
@@@ -26094,20 -20298,19 +20299,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 \
@@@ -26115,11 -20318,10 +20319,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
@@@ -26430,7 -20632,6 +20633,6 @@@ d
      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
      "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
-     "libclamav/lzma/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/lzma/Makefile" ;;
      "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;
      "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;;
      "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
@@@ -26459,9 -20660,7 +20661,7 @@@
      "docs/man/sigtool.1") CONFIG_FILES="$CONFIG_FILES docs/man/sigtool.1" ;;
      "docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
  
-   *) { { $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
  
@@@ -26488,7 -20687,7 +20688,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.
  
@@@ -26499,11 -20698,7 +20699,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.
@@@ -26511,10 -20706,16 +20707,16 @@@
  if test -n "$CONFIG_FILES"; then
  
  
- 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
@@@ -26528,24 -20729,18 +20730,18 @@@ _ACEO
    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
@@@ -26634,9 -20829,7 +20830,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),
@@@ -26677,9 -20870,7 +20871,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
@@@ -26764,9 -20955,7 +20956,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"
  
  
@@@ -26779,9 -20968,7 +20969,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
@@@ -26809,12 -20996,10 +20997,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
@@@ -26825,7 -21010,7 +21011,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.
@@@ -26838,9 -21023,7 +21024,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
@@@ -26868,47 -21051,7 +21052,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
@@@ -26965,7 -21108,6 +21109,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
@@@ -26975,12 -21117,11 +21118,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
@@@ -26990,7 -21131,7 +21132,7 @@@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
-     s&\\\${datarootdir}&$datarootdir&g' ;;
+   s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
  _ACEOF
  
@@@ -27019,14 -21160,12 +21161,12 @@@ s&@MKDIR_P@&$ac_MKDIR_P&;t 
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$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;}
@@@ -27036,9 -21175,7 +21176,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)
    #
@@@ -27049,25 -21186,19 +21187,19 @@@
        $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
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
@@@ -27105,7 -21236,7 +21237,7 @@@ $as_echo X"$_am_arg" 
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
-   :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
@@@ -27199,47 -21330,7 +21331,7 @@@ $as_echo X"$file" 
  	    q
  	  }
  	  s/.*/./; q'`
-     { as_dir=$dirpart/$fdir
-   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=$dirpart/$fdir; as_fn_mkdir_p
      # echo "creating $dirpart/$file"
      echo '# dummy' > "$dirpart/$file"
    done
@@@ -27885,15 -21976,12 +21977,12 @@@ _LT_EO
  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.
@@@ -27914,10 -22002,10 +22003,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
  
@@@ -27926,7 -22014,7 +22015,7 @@@
  # 4.0.x, and 4.1.0 are the known buggy versions
  # 3.4 doesn't have the bug
  if test "x$gcc_check" != "xyes"; then
- 	{ $as_echo "$as_me:$LINENO: WARNING:
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
  ****** Optimizations disabled to avoid compiler bugs
  ****** The resulting binaries will be slow!
  ****** It is recommended to either upgrade or downgrade your compiler
@@@ -27939,7 -22027,7 +22028,7 @@@ $as_echo "$as_me: WARNING
  fi
  
  if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$zlib_check" = "xno" ; then
- { $as_echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
  ****** WARNING:
  ****** You are either cross compiling to a different host or
  ****** you have manually disabled important configure checks.
diff --combined configure.in
index 7a001cc,cc748e5..9ff8fa5
--- a/configure.in
+++ b/configure.in
@@@ -1084,7 -1084,6 +1084,7 @@@ irix*
  	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
  	AC_DEFINE([_REENTRANT],1,[thread safe])
      fi
 +    LIBS="$LIBS -lgen"
      AC_DEFINE([C_IRIX],1,[os is irix])
      ;;
  interix*)
@@@ -1580,7 -1579,6 +1580,6 @@@ AM_CONDITIONAL([HAVE_CURSES]
  
  AC_OUTPUT([
  libclamav/Makefile
- libclamav/lzma/Makefile
  clamscan/Makefile
  database/Makefile
  docs/Makefile

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list