[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-424-g6e7bde7

Michael Tautschnig mt at debian.org
Wed Mar 18 17:23:21 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 6d97c8368b26d70d37bc003e81f2b67844b57efc
Merge: a23c1bff87cfd6f49737605ed97903ce1d80cae1 26e0d963b8b13e30dc1d643ea801adcb161f1424
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 18 17:50:20 2009 +0100

    Merge commit 'clamav-svn/tags/clamav-0.95rc2' into debian/unstable
    
    Conflicts:
    	NEWS
    	docs/man/freshclam.1.in
    	libclamav/Makefile.in
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --combined configure
index a27c6dd,df37755..facbc78
--- a/configure
+++ b/configure
@@@ -1,11 -1,11 +1,11 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for clamav devel.
+ # Generated by GNU Autoconf 2.63 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 Free Software Foundation, Inc.
+ # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
@@@ -17,7 -17,7 +17,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # 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
@@@ -39,17 -39,45 +39,45 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-   echo "#! /bin/sh" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
+ as_nl='
+ '
+ export as_nl
+ # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+     as_echo_n='/usr/ucb/echo -n'
    else
-     PATH_SEPARATOR=:
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+       case $arg in
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+       esac;
+       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+     '
+     export as_echo_n_body
+     as_echo_n='sh -c $as_echo_n_body as_echo'
    fi
-   rm -f conf$$.sh
+   export as_echo_body
+   as_echo='sh -c $as_echo_body as_echo'
+ fi
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   PATH_SEPARATOR=:
+   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+       PATH_SEPARATOR=';'
+   }
  fi
  
  # Support unset when possible.
@@@ -65,8 -93,6 +93,6 @@@ f
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
- as_nl='
- '
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@@ -89,7 -115,7 +115,7 @@@ if test "x$as_myself" = x; the
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
-   echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    { (exit 1); exit 1; }
  fi
  
@@@ -102,17 -128,10 +128,10 @@@ PS2='> 
  PS4='+ '
  
  # NLS nuisances.
- for as_var in \
-   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
+ LC_ALL=C
+ export LC_ALL
+ LANGUAGE=C
+ export LANGUAGE
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -134,7 -153,7 +153,7 @@@ as_me=`$as_basename -- "$0" |
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
+ $as_echo X/"$0" |
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
@@@ -160,7 -179,7 +179,7 @@@ els
    as_have_required=no
  fi
  
-   if test $as_have_required = yes && 	 (eval ":
+   if test $as_have_required = yes &&	 (eval ":
  (as_func_return () {
    (exit \$1)
  }
@@@ -242,7 -261,7 +261,7 @@@ IFS=$as_save_IF
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # 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
@@@ -263,7 -282,7 +282,7 @@@ _ASEO
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # 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
@@@ -343,10 -362,10 +362,10 @@@ f
  
        if test "x$CONFIG_SHELL" != x; then
    for as_var in BASH_ENV ENV
-         do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-         done
-         export CONFIG_SHELL
-         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ 	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ 	done
+ 	export CONFIG_SHELL
+ 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  fi
  
  
@@@ -415,9 -434,10 +434,10 @@@ f
  
  test \$exitcode = 0") || {
    echo No shell found that supports shell functions.
-   echo Please tell autoconf at gnu.org about your system,
-   echo including any error possibly output before this
-   echo message
+   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.
  }
  
  
@@@ -453,7 -473,7 +473,7 @@@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+     { $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
@@@ -481,7 -501,6 +501,6 @@@ case `echo -n x` i
  *)
    ECHO_N='-n';;
  esac
- 
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@@ -494,19 -513,22 +513,22 @@@ if test -d conf$$.dir; the
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
-   mkdir conf$$.dir
- fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s='ln -s'
-   # ... but there are two gotchas:
-   # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-   # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-   # In both cases, we have to default to `cp -p'.
-   ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+   mkdir conf$$.dir 2>/dev/null
+ fi
+ if (echo >conf$$.file) 2>/dev/null; then
+   if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+     # In both cases, we have to default to `cp -p'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+       as_ln_s='cp -p'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
      as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
+   fi
  else
    as_ln_s='cp -p'
  fi
@@@ -531,10 -553,10 +553,10 @@@ els
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
-         test -d "$1/.";
+ 	test -d "$1/.";
        else
  	case $1 in
-         -*)set "./$1";;
+ 	-*)set "./$1";;
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
@@@ -766,181 -788,235 +788,235 @@@ ac_includes_default="
  # include <unistd.h>
  #endif"
  
- ac_subst_vars='SHELL
- PATH_SEPARATOR
- PACKAGE_NAME
- PACKAGE_TARNAME
- PACKAGE_VERSION
- PACKAGE_STRING
- PACKAGE_BUGREPORT
- exec_prefix
- prefix
- program_transform_name
- bindir
- sbindir
- libexecdir
- datarootdir
- datadir
- sysconfdir
- sharedstatedir
- localstatedir
- includedir
- oldincludedir
- docdir
- infodir
- htmldir
- dvidir
- pdfdir
- psdir
- libdir
- localedir
- mandir
- DEFS
- ECHO_C
- ECHO_N
- ECHO_T
- LIBS
- build_alias
- host_alias
- target_alias
- build
- build_cpu
- build_vendor
- build_os
- host
- host_cpu
- host_vendor
- host_os
- target
- target_cpu
- target_vendor
- target_os
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
- am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
- ACLOCAL
- AUTOCONF
- AUTOMAKE
- AUTOHEADER
- MAKEINFO
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
- mkdir_p
- AWK
- SET_MAKE
- am__leading_dot
- AMTAR
- am__tar
- am__untar
- LIBCLAMAV_VERSION
- LN_S
- LIBTOOL
- CC
- CFLAGS
- LDFLAGS
- CPPFLAGS
- ac_ct_CC
- EXEEXT
- OBJEXT
- DEPDIR
- am__include
- am__quote
- AMDEP_TRUE
- AMDEP_FALSE
- AMDEPBACKSLASH
- CCDEPMODE
- am__fastdepCC_TRUE
- am__fastdepCC_FALSE
- SED
- GREP
- EGREP
- FGREP
- LD
- DUMPBIN
- ac_ct_DUMPBIN
- NM
- OBJDUMP
- AR
- RANLIB
- lt_ECHO
- DSYMUTIL
- NMEDIT
- LIPO
- OTOOL
- OTOOL64
- CPP
- LIBLTDL
- LTDLDEPS
- LTDLINCL
- INCLTDL
- LT_DLLOADERS
- LIBADD_DLOPEN
- LIBADD_SHL_LOAD
- LIBADD_DLD_LINK
- LT_DLPREOPEN
- LIBADD_DL
- sys_symbol_underscore
- ARGZ_H
- INSTALL_LTDL_TRUE
- INSTALL_LTDL_FALSE
- CONVENIENCE_LTDL_TRUE
- CONVENIENCE_LTDL_FALSE
- LT_CONFIG_H
- LTDLOPEN
- DISTCHECK_ENABLE_FLAGS_TRUE
- DISTCHECK_ENABLE_FLAGS_FALSE
- VERSIONSCRIPTFLAG
- VERSIONSCRIPT_TRUE
- VERSIONSCRIPT_FALSE
- GPERF
- CHECK_CPPFLAGS
- CHECK_LIBS
- HAVE_LIBCHECK_TRUE
- HAVE_LIBCHECK_FALSE
- GCOV
- LCOV
- GENHTML
- ENABLE_COVERAGE_TRUE
- ENABLE_COVERAGE_FALSE
- MAINTAINER_MODE_TRUE
- MAINTAINER_MODE_FALSE
- MAINT
- LIBBZ2
- LTLIBBZ2
- LIBBZ2_PREFIX
- ENABLE_UNRAR_TRUE
- ENABLE_UNRAR_FALSE
- LINK_TOMMATH_TRUE
- LINK_TOMMATH_FALSE
- DBDIR
- CFGDIR
- LIBCLAMAV_LIBS
- CLAMD_LIBS
- CLAMAV_MILTER_LIBS
- FRESHCLAM_LIBS
- TH_SAFE
- THREAD_LIBS
- BUILD_CLAMD_TRUE
- BUILD_CLAMD_FALSE
- HAVE_MILTER_TRUE
- HAVE_MILTER_FALSE
- GETENT
- CLAMAVUSER
- CLAMAVGROUP
- CURSES_CPPFLAGS
- CURSES_LIBS
- HAVE_CURSES_TRUE
- HAVE_CURSES_FALSE
- LIBOBJS
- LTLIBOBJS
+ ac_subst_vars='ltdl_LTLIBOBJS
  ltdl_LIBOBJS
- ltdl_LTLIBOBJS'
+ LTLIBOBJS
+ LIBOBJS
+ HAVE_CURSES_FALSE
+ HAVE_CURSES_TRUE
+ CURSES_LIBS
+ CURSES_CPPFLAGS
+ CLAMAVGROUP
+ CLAMAVUSER
+ GETENT
+ HAVE_MILTER_FALSE
+ HAVE_MILTER_TRUE
+ BUILD_CLAMD_FALSE
+ BUILD_CLAMD_TRUE
+ THREAD_LIBS
+ TH_SAFE
+ FRESHCLAM_LIBS
+ CLAMAV_MILTER_LIBS
+ CLAMD_LIBS
+ LIBCLAMAV_LIBS
+ CFGDIR
+ DBDIR
+ LINK_TOMMATH_FALSE
+ LINK_TOMMATH_TRUE
+ ENABLE_UNRAR_FALSE
+ ENABLE_UNRAR_TRUE
+ LIBBZ2_PREFIX
+ LTLIBBZ2
+ LIBBZ2
+ MAINT
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ ENABLE_COVERAGE_FALSE
+ ENABLE_COVERAGE_TRUE
+ GENHTML
+ LCOV
+ GCOV
+ HAVE_LIBCHECK_FALSE
+ HAVE_LIBCHECK_TRUE
+ CHECK_LIBS
+ CHECK_CPPFLAGS
+ GPERF
+ VERSIONSCRIPT_FALSE
+ VERSIONSCRIPT_TRUE
+ VERSIONSCRIPTFLAG
+ DISTCHECK_ENABLE_FLAGS_FALSE
+ DISTCHECK_ENABLE_FLAGS_TRUE
+ LTDLOPEN
+ LT_CONFIG_H
+ CONVENIENCE_LTDL_FALSE
+ CONVENIENCE_LTDL_TRUE
+ INSTALL_LTDL_FALSE
+ INSTALL_LTDL_TRUE
+ ARGZ_H
+ sys_symbol_underscore
+ LIBADD_DL
+ LT_DLPREOPEN
+ LIBADD_DLD_LINK
+ LIBADD_SHL_LOAD
+ LIBADD_DLOPEN
+ LT_DLLOADERS
+ INCLTDL
+ LTDLINCL
+ LTDLDEPS
+ LIBLTDL
+ CPP
+ OTOOL64
+ OTOOL
+ LIPO
+ NMEDIT
+ DSYMUTIL
+ lt_ECHO
+ RANLIB
+ AR
+ OBJDUMP
+ NM
+ ac_ct_DUMPBIN
+ DUMPBIN
+ LD
+ FGREP
+ EGREP
+ GREP
+ SED
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+ am__quote
+ am__include
+ DEPDIR
+ OBJEXT
+ EXEEXT
+ ac_ct_CC
+ CPPFLAGS
+ LDFLAGS
+ CFLAGS
+ CC
+ LIBTOOL
+ LN_S
+ LIBCLAMAV_VERSION
+ am__untar
+ am__tar
+ AMTAR
+ am__leading_dot
+ SET_MAKE
+ AWK
+ mkdir_p
+ MKDIR_P
+ INSTALL_STRIP_PROGRAM
+ STRIP
+ install_sh
+ MAKEINFO
+ AUTOHEADER
+ AUTOMAKE
+ AUTOCONF
+ ACLOCAL
+ VERSION
+ PACKAGE
+ CYGPATH_W
+ am__isrc
+ INSTALL_DATA
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ target_os
+ target_vendor
+ target_cpu
+ target
+ host_os
+ host_vendor
+ host_cpu
+ host
+ build_os
+ build_vendor
+ build_cpu
+ build
+ target_alias
+ host_alias
+ build_alias
+ LIBS
+ ECHO_T
+ ECHO_N
+ ECHO_C
+ DEFS
+ mandir
+ localedir
+ libdir
+ psdir
+ pdfdir
+ dvidir
+ htmldir
+ infodir
+ docdir
+ oldincludedir
+ includedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+ datadir
+ datarootdir
+ libexecdir
+ sbindir
+ bindir
+ program_transform_name
+ prefix
+ exec_prefix
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+ PACKAGE_TARNAME
+ PACKAGE_NAME
+ PATH_SEPARATOR
+ SHELL'
  ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+ enable_shared
+ enable_static
+ with_pic
+ enable_fast_install
+ enable_dependency_tracking
+ with_gnu_ld
+ enable_libtool_lock
+ with_included_ltdl
+ with_ltdl_include
+ with_ltdl_lib
+ enable_ltdl_install
+ with_fpu_words_bigendian
+ enable_gcc_vcheck
+ enable_experimental
+ enable_mempool
+ enable_check
+ enable_rpath
+ with_libcheck_prefix
+ enable_coverage
+ enable_maintainer_mode
+ with_zlib
+ enable_zlib_vcheck
+ enable_bzip2
+ with_libbz2_prefix
+ enable_unrar
+ enable_getaddrinfo
+ enable_ipv6
+ enable_dns
+ enable_clamuko
+ enable_milter
+ with_system_tommath
+ with_iconv
+ enable_pthreads
+ enable_cr
+ enable_id_check
+ enable_yp_check
+ with_user
+ with_group
+ enable_clamav
+ enable_debug
+ enable_no_cache
+ enable_dns_fix
+ enable_bigstack
+ with_dbdir
+ enable_gethostbyname_r
+ enable_readdir_r
+ enable_fdpassing
+ enable_clamdtop
+ with_libncurses_prefix
+ with_libpdcurses_prefix
+ '
        ac_precious_vars='build_alias
  host_alias
  target_alias
@@@ -955,6 -1031,8 +1031,8 @@@ CPP
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
+ ac_unrecognized_opts=
+ ac_unrecognized_sep=
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
@@@ -1053,13 -1131,21 +1131,21 @@@ d
      datarootdir=$ac_optarg ;;
  
    -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=no ;;
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+       *"
+ "enable_$ac_useropt"
+ "*) ;;
+       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ 	 ac_unrecognized_sep=', ';;
+     esac
+     eval enable_$ac_useropt=no ;;
  
    -docdir | --docdir | --docdi | --doc | --do)
      ac_prev=docdir ;;
@@@ -1072,13 -1158,21 +1158,21 @@@
      dvidir=$ac_optarg ;;
  
    -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=\$ac_optarg ;;
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+       *"
+ "enable_$ac_useropt"
+ "*) ;;
+       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ 	 ac_unrecognized_sep=', ';;
+     esac
+     eval enable_$ac_useropt=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@@ -1269,22 -1363,38 +1363,38 @@@
      ac_init_version=: ;;
  
    -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=\$ac_optarg ;;
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+       *"
+ "with_$ac_useropt"
+ "*) ;;
+       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ 	 ac_unrecognized_sep=', ';;
+     esac
+     eval with_$ac_useropt=\$ac_optarg ;;
  
    -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=no ;;
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+       *"
+ "with_$ac_useropt"
+ "*) ;;
+       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ 	 ac_unrecognized_sep=', ';;
+     esac
+     eval with_$ac_useropt=no ;;
  
    --x)
      # Obsolete; use --with-x.
@@@ -1304,7 -1414,7 +1414,7 @@@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
-   -*) { echo "$as_me: error: unrecognized option: $ac_option
+   -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
@@@ -1313,16 -1423,16 +1423,16 @@@
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+       { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
    *)
      # FIXME: should be removed in autoconf 3.0.
-     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
  
@@@ -1331,22 -1441,38 +1441,38 @@@ don
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { echo "$as_me: error: missing argument to $ac_option" >&2
+   { $as_echo "$as_me: error: missing argument to $ac_option" >&2
     { (exit 1); exit 1; }; }
  fi
  
- # Be sure to have absolute directory names.
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+    { (exit 1); exit 1; }; } ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+ 
+ # Check all directory arguments for consistency.
  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
  		datadir sysconfdir sharedstatedir localstatedir includedir \
  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
  		libdir localedir mandir
  do
    eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+   case $ac_val in
+     */ )
+       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+       eval $ac_var=\$ac_val;;
+   esac
+   # Be sure to have absolute directory names.
    case $ac_val in
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
-   { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     { (exit 1); exit 1; }; }
  done
  
@@@ -1361,7 -1487,7 +1487,7 @@@ target=$target_alia
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
-     echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
@@@ -1377,10 -1503,10 +1503,10 @@@ test "$silent" = yes && exec 6>/dev/nul
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-   { echo "$as_me: error: Working directory cannot be determined" >&2
+   { $as_echo "$as_me: error: working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-   { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
     { (exit 1); exit 1; }; }
  
  
@@@ -1388,12 -1514,12 +1514,12 @@@
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then the parent directory.
-   ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
+   ac_confdir=`$as_dirname -- "$as_myself" ||
+ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_myself" : 'X\(//\)[^/]' \| \
+ 	 X"$as_myself" : 'X\(//\)$' \| \
+ 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$as_myself" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -1420,12 -1546,12 +1546,12 @@@ els
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-   { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
- 	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ 	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
     { (exit 1); exit 1; }; }
  	pwd)`
  # When building in place, set srcdir=.
@@@ -1474,9 -1600,9 +1600,9 @@@ Configuration
  
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
+                           [$ac_default_prefix]
    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
- 			  [PREFIX]
+                           [PREFIX]
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@@ -1486,25 -1612,25 +1612,25 @@@ for instance \`--prefix=\$HOME'
  For better control, use the options below.
  
  Fine tuning of the installation directories:
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-   --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-   --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-   --infodir=DIR          info documentation [DATAROOTDIR/info]
-   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-   --mandir=DIR           man documentation [DATAROOTDIR/man]
-   --docdir=DIR           documentation root [DATAROOTDIR/doc/clamav]
-   --htmldir=DIR          html documentation [DOCDIR]
-   --dvidir=DIR           dvi documentation [DOCDIR]
-   --pdfdir=DIR           pdf documentation [DOCDIR]
-   --psdir=DIR            ps documentation [DOCDIR]
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --infodir=DIR           info documentation [DATAROOTDIR/info]
+   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+   --mandir=DIR            man documentation [DATAROOTDIR/man]
+   --docdir=DIR            documentation root [DATAROOTDIR/doc/clamav]
+   --htmldir=DIR           html documentation [DOCDIR]
+   --dvidir=DIR            dvi documentation [DOCDIR]
+   --pdfdir=DIR            pdf documentation [DOCDIR]
+   --psdir=DIR             ps documentation [DOCDIR]
  _ACEOF
  
    cat <<\_ACEOF
@@@ -1528,6 -1654,7 +1654,7 @@@ if test -n "$ac_init_help"; the
    cat <<\_ACEOF
  
  Optional Features:
+   --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-shared[=PKGS]  build shared libraries [default=yes]
@@@ -1617,15 -1744,17 +1744,17 @@@ f
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-     test -d "$ac_dir" || continue
+     test -d "$ac_dir" ||
+       { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+       continue
      ac_builddir=.
  
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
    # A ".." for each directory in $ac_dir_suffix.
-   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -1661,7 -1790,7 +1790,7 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
        echo &&
        $SHELL "$ac_srcdir/configure" --help=recursive
      else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+       $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi || ac_status=$?
      cd "$ac_pwd" || { ac_status=$?; break; }
    done
@@@ -1671,10 -1800,10 +1800,10 @@@ test -n "$ac_init_help" && exit $ac_sta
  if $ac_init_version; then
    cat <<\_ACEOF
  clamav configure devel
- generated by GNU Autoconf 2.61
+ generated by GNU Autoconf 2.63
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -1685,7 -1814,7 +1814,7 @@@ This file contains any messages produce
  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.61.  Invocation command line was
+ generated by GNU Autoconf 2.63.  Invocation command line was
  
    $ $0 $@
  
@@@ -1721,7 -1850,7 +1850,7 @@@ for as_dir in $PAT
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
+   $as_echo "PATH: $as_dir"
  done
  IFS=$as_save_IFS
  
@@@ -1756,7 -1885,7 +1885,7 @@@ d
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
      *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
      1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@@ -1808,11 -1937,12 +1937,12 @@@ _ASBO
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
        *) $as_unset $ac_var ;;
        esac ;;
      esac
@@@ -1842,9 -1972,9 +1972,9 @@@ _ASBO
      do
        eval ac_val=\$$ac_var
        case $ac_val in
-       *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
-       echo "$ac_var='\''$ac_val'\''"
+       $as_echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
  
@@@ -1859,9 -1989,9 +1989,9 @@@ _ASBO
        do
  	eval ac_val=\$$ac_var
  	case $ac_val in
- 	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  	esac
- 	echo "$ac_var='\''$ac_val'\''"
+ 	$as_echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
@@@ -1877,8 -2007,8 +2007,8 @@@ _ASBO
        echo
      fi
      test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
+       $as_echo "$as_me: caught signal $ac_signal"
+     $as_echo "$as_me: exit $exit_status"
    } >&5
    rm -f core *.core core.conftest.* &&
      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@@ -1920,21 -2050,24 +2050,24 @@@ _ACEO
  
  
  # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
+ # Prefer an explicitly selected file to automatically selected ones.
+ ac_site_file1=NONE
+ ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
-   set x "$CONFIG_SITE"
+   ac_site_file1=$CONFIG_SITE
  elif test "x$prefix" != xNONE; then
-   set x "$prefix/share/config.site" "$prefix/etc/config.site"
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
  else
-   set x "$ac_default_prefix/share/config.site" \
- 	"$ac_default_prefix/etc/config.site"
+   ac_site_file1=$ac_default_prefix/share/config.site
+   ac_site_file2=$ac_default_prefix/etc/config.site
  fi
- shift
- for ac_site_file
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
+   test "x$ac_site_file" = xNONE && continue
    if test -r "$ac_site_file"; then
-     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
+     { $as_echo "$as_me:$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"
    fi
@@@ -1944,16 -2077,16 +2077,16 @@@ if test -r "$cache_file"; the
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
+     { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
        *)                      . "./$cache_file";;
      esac
    fi
  else
-   { echo "$as_me:$LINENO: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
+   { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
  
@@@ -1967,29 -2100,38 +2100,38 @@@ 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,)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
- 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
- 	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
- 	ac_cache_corrupted=:
+ 	# differences in whitespace do not lead to failure.
+ 	ac_old_val_w=`echo x $ac_old_val`
+ 	ac_new_val_w=`echo x $ac_new_val`
+ 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ 	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ 	  ac_cache_corrupted=:
+ 	else
+ 	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ 	  eval $ac_var=\$ac_old_val
+ 	fi
+ 	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+ $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+ 	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
-     *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
@@@ -1999,10 -2141,12 +2141,12 @@@
    fi
  done
  if $ac_cache_corrupted; then
-   { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
@@@ -2055,8 -2199,8 +2199,8 @@@ for ac_dir in config "$srcdir"/config; 
    fi
  done
  if test -z "$ac_aux_dir"; then
-   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
- echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+   { { $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; }; }
  fi
  
@@@ -2076,34 -2220,34 +2220,34 @@@ 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 ||
-   { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
- echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { { $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; }; }
  
- { echo "$as_me:$LINENO: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
  if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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 &&
-   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { { $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; }; }
  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-   { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { { $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; }; }
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
  case $ac_cv_build in
  *-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
- echo "$as_me: error: invalid value of canonical build" >&2;}
+ *) { { $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; }; };;
  esac
  build=$ac_cv_build
@@@ -2120,27 -2264,27 +2264,27 @@@ IFS=$ac_save_IF
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
- { echo "$as_me:$LINENO: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
  if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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` ||
-     { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+     { { $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; }; }
  fi
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+ $as_echo "$ac_cv_host" >&6; }
  case $ac_cv_host in
  *-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
- echo "$as_me: error: invalid value of canonical host" >&2;}
+ *) { { $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; }; };;
  esac
  host=$ac_cv_host
@@@ -2157,27 -2301,27 +2301,27 @@@ IFS=$ac_save_IF
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
- { echo "$as_me:$LINENO: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking target system type" >&5
+ $as_echo_n "checking target system type... " >&6; }
  if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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` ||
-     { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
- echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+     { { $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; }; }
  fi
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+ $as_echo "$ac_cv_target" >&6; }
  case $ac_cv_target in
  *-*-*) ;;
- *) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
- echo "$as_me: error: invalid value of canonical target" >&2;}
+ *) { { $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; }; };;
  esac
  target=$ac_cv_target
@@@ -2257,8 -2401,8 +2401,8 @@@ target_cpu_arch0=`echo "$target_cpu_arc
  #
  #
  if $ac_need_target_h_file_new ; then
- { echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5
- echo "${ECHO_T}creating $ac_need_target_h_file - canonical system defines" >&6; }
+ { $as_echo "$as_me:$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
  ac_need_target_h_file_new=false
@@@ -2331,8 -2475,8 +2475,8 @@@ host_cpu_arch0=`echo "$host_cpu_arch" 
  #
  #
  if $ac_need_target_h_file_new ; then
- { echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5
- echo "${ECHO_T}creating $ac_need_target_h_file - canonical system defines" >&6; }
+ { $as_echo "$as_me:$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
  ac_need_target_h_file_new=false
@@@ -2403,11 -2547,12 +2547,12 @@@ am__api_version='1.10
  # 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.
- { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ # 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@@ -2436,17 -2581,29 +2581,29 @@@ case $as_dir/ i
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
- 	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- 	    break 3
+ 	    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
@@@ -2459,8 -2616,8 +2616,8 @@@
      INSTALL=$ac_install_sh
    fi
  fi
- { echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6; }
+ { $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.
@@@ -2470,8 -2627,8 +2627,8 @@@ test -z "$INSTALL_SCRIPT" && INSTALL_SC
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
- { echo "$as_me:$LINENO: checking whether build environment is sane" >&5
- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
  echo timestamp > conftest.file
@@@ -2494,9 -2651,9 +2651,9 @@@ 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".
-       { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+       { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
  alias in your environment" >&5
- echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+ $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; }; }
     fi
@@@ -2507,26 -2664,23 +2664,23 @@@ the
     # Ok.
     :
  else
-    { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+    { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
  Check your system clock" >&5
- echo "$as_me: error: newly created file is older than distributed files!
+ $as_echo "$as_me: error: newly created file is older than distributed files!
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
  # Use a double $ so make ignores it.
  test "$program_suffix" != NONE &&
    program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $.  echo might interpret backslashes.
+ # Double any \ or $.
  # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm -f conftest.sed
+ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
@@@ -2537,15 -2691,15 +2691,15 @@@ if eval "$MISSING --run true"; the
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
-   { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+   { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
- { echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
- echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@@ -2580,8 -2734,8 +2734,8 @@@ f
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
- { echo "$as_me:$LINENO: result: $MKDIR_P" >&5
- echo "${ECHO_T}$MKDIR_P" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
  case $mkdir_p in
@@@ -2593,10 -2747,10 +2747,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
    ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@@ -2609,7 -2763,7 +2763,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2620,22 -2774,23 +2774,23 @@@ f
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
-   { echo "$as_me:$LINENO: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
    test -n "$AWK" && break
  done
  
- { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
@@@ -2652,12 -2807,12 +2807,12 @@@ esa
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
    SET_MAKE=
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
@@@ -2676,8 -2831,8 +2831,8 @@@ if test "`cd $srcdir && pwd`" != "`pwd`
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
-     { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+     { { $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; }; }
    fi
  fi
@@@ -2723,10 -2878,10 +2878,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@@ -2739,7 -2894,7 +2894,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2750,11 -2905,11 +2905,11 @@@ f
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
-   { echo "$as_me:$LINENO: result: $STRIP" >&5
- echo "${ECHO_T}$STRIP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -2763,10 -2918,10 +2918,10 @@@ if test -z "$ac_cv_prog_STRIP"; the
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@@ -2779,7 -2934,7 +2934,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2790,11 -2945,11 +2945,11 @@@ f
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
- echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_STRIP" = x; then
@@@ -2802,12 -2957,8 +2957,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      STRIP=$ac_ct_STRIP
@@@ -2838,7 -2989,7 +2989,7 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
  
 -VERSION="devel-`date +%Y%m%d`"
 +VERSION="0.95rc1"
  
  cat >>confdefs.h <<_ACEOF
  #define VERSION "$VERSION"
@@@ -2846,7 -2997,7 +2997,7 @@@ _ACEO
  
  
  LC_CURRENT=6
- LC_REVISION=0
+ LC_REVISION=1
  LC_AGE=0
  LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
  
@@@ -2855,10 -3006,10 +3006,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
    ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@@ -2871,7 -3022,7 +3022,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -2882,11 -3033,11 +3033,11 @@@ f
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
-   { echo "$as_me:$LINENO: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -2906,11 -3057,12 +3057,12 @@@ don
  # 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.
- { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ # 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@@ -2939,17 -3091,29 +3091,29 @@@ case $as_dir/ i
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
- 	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- 	    break 3
+ 	    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
@@@ -2962,8 -3126,8 +3126,8 @@@
      INSTALL=$ac_install_sh
    fi
  fi
- { echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6; }
+ { $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.
@@@ -2973,22 -3137,23 +3137,23 @@@ test -z "$INSTALL_SCRIPT" && INSTALL_SC
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
- { echo "$as_me:$LINENO: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+ $as_echo "no, using $LN_S" >&6; }
  fi
  
- { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
@@@ -3005,12 -3170,12 +3170,12 @@@ esa
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
    SET_MAKE=
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
@@@ -3025,8 -3190,8 +3190,8 @@@
  
  case `pwd` in
    *\ * | *\	*)
-     { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
- echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+     { $as_echo "$as_me:$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
  
  
@@@ -3060,8 -3225,8 +3225,8 @@@ am__doit
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
- { echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
- echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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=
  _am_result=none
@@@ -3088,8 -3253,8 +3253,8 @@@ if test "$am__include" = "#"; the
  fi
  
  
- { echo "$as_me:$LINENO: result: $_am_result" >&5
- echo "${ECHO_T}$_am_result" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+ $as_echo "$_am_result" >&6; }
  rm -f confinc confmf
  
  # Check whether --enable-dependency-tracking was given.
@@@ -3118,10 -3283,10 +3283,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3134,7 -3299,7 +3299,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3145,11 -3310,11 +3310,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -3158,10 -3323,10 +3323,10 @@@ if test -z "$ac_cv_prog_CC"; the
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -3174,7 -3339,7 +3339,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3185,11 -3350,11 +3350,11 @@@ f
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_CC" = x; then
@@@ -3197,12 -3362,8 +3362,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
@@@ -3215,10 -3376,10 +3376,10 @@@ if test -z "$CC"; the
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3231,7 -3392,7 +3392,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3242,11 -3403,11 +3403,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -3255,10 -3416,10 +3416,10 @@@ f
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3276,7 -3437,7 +3437,7 @@@ d
         continue
       fi
      ac_cv_prog_CC="cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3299,11 -3460,11 +3460,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -3314,10 -3475,10 +3475,10 @@@ if test -z "$CC"; the
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@@ -3330,7 -3491,7 +3491,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3341,11 -3502,11 +3502,11 @@@ f
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   { echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ $as_echo "$CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -3358,10 -3519,10 +3519,10 @@@ if test -z "$CC"; the
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@@ -3374,7 -3535,7 +3535,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -3385,11 -3546,11 +3546,11 @@@ f
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -3401,12 -3562,8 +3562,8 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
@@@ -3416,44 -3573,50 +3573,50 @@@ f
  fi
  
  
- test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }; }
  
  # Provide some information about the compiler.
- echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
  { (ac_try="$ac_compiler --version >&5"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
@@@ -3472,27 -3635,22 +3635,22 @@@ main (
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
- { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
- echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- #
- # List of possible output files, starting from the most likely.
- # The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
- # only as a last resort.  b.out is created by i960 compilers.
- ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
- #
- # The IRIX 6 linker writes into existing files which may not be
- # executable, retaining their permissions.  Remove them first so a
- # subsequent execution test works.
+ { $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+ $as_echo_n "checking for C compiler default output file name... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+ ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+ 
  ac_rmfiles=
  for ac_file in $ac_files
  do
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
    esac
  done
@@@ -3503,10 -3661,11 +3661,11 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@@ -3517,7 -3676,7 +3676,7 @@@ for ac_file in $ac_files '
  do
    test -f "$ac_file" || continue
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
@@@ -3544,25 -3703,27 +3703,27 @@@ els
    ac_file=''
  fi
  
- { echo "$as_me:$LINENO: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
  if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- { { echo "$as_me:$LINENO: error: C compiler cannot create executables
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
- echo "$as_me: error: C compiler cannot create executables
+ $as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
  
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
- { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ $as_echo_n "checking whether the C compiler works... " >&6; }
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
@@@ -3571,49 -3732,53 +3732,53 @@@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
    else
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
- 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ 	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
+ $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; }; }
+    { (exit 1); exit 1; }; }; }
      fi
    fi
  fi
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
- { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ $as_echo_n "checking whether we are cross compiling... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
  
- { echo "$as_me:$LINENO: checking for suffix of executables" >&5
- echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@@ -3622,31 -3787,33 +3787,33 @@@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	  break;;
      * ) break;;
    esac
  done
  else
-   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ $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; }; }
+    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
- { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
  
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
- { echo "$as_me:$LINENO: checking for suffix of object files" >&5
- echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -3669,40 -3836,43 +3836,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
  done
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
- { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -3728,20 -3898,21 +3898,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
@@@ -3751,15 -3922,19 +3922,19 @@@ rm -f core conftest.err conftest.$ac_ob
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+ else
+   GCC=
+ fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
- { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
@@@ -3786,20 -3961,21 +3961,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CFLAGS=""
@@@ -3824,20 -4000,21 +4000,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
@@@ -3863,20 -4040,21 +4040,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -3891,8 -4069,8 +4069,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ { $as_echo "$as_me:$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
  elif test $ac_cv_prog_cc_g = yes; then
@@@ -3908,10 -4086,10 +4086,10 @@@ els
      CFLAGS=
    fi
  fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
- echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  if test "${ac_cv_prog_cc_c89+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
@@@ -3982,20 -4160,21 +4160,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_c89=$ac_arg
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -4011,15 -4190,15 +4190,15 @@@ f
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
-     { echo "$as_me:$LINENO: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6; } ;;
+     { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
    xno)
-     { echo "$as_me:$LINENO: result: unsupported" >&5
- echo "${ECHO_T}unsupported" >&6; } ;;
+     { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
    *)
      CC="$CC $ac_cv_prog_cc_c89"
-     { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+     { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
  
  
@@@ -4031,10 -4210,10 +4210,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  depcc="$CC"   am_compiler_list=
  
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
- echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
@@@ -4122,8 -4301,8 +4301,8 @@@ els
  fi
  
  fi
- { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ { $as_echo "$as_me:$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
  
   if
@@@ -4137,48 -4316,43 +4316,43 @@@ els
  fi
  
  
- { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
- echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
       for ac_i in 1 2 3 4 5 6 7; do
         ac_script="$ac_script$as_nl$ac_script"
       done
-      echo "$ac_script" | sed 99q >conftest.sed
+      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
       $as_unset ac_script || ac_script=
-      # Extract the first word of "sed gsed" to use in msg output
- if test -z "$SED"; then
- set dummy sed gsed; ac_prog_name=$2
- if test "${ac_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+      if test -z "$SED"; then
    ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   # Loop through the user's path and test for each of PROGNAME-LIST
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    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
-     # Check for GNU ac_path_SED and select it if it is found.
+     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
+ # Check for GNU ac_path_SED and select it if it is found.
    # Check for GNU $ac_path_SED
  case `"$ac_path_SED" --version 2>&1` in
  *GNU*)
    ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
  *)
    ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   $as_echo_n 0123456789 >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     echo '' >> "conftest.nl"
+     $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`
@@@ -4193,31 -4367,23 +4367,23 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
- 
-     $ac_path_SED_found && break 3
+       $ac_path_SED_found && break 3
+     done
    done
  done
- 
- done
  IFS=$as_save_IFS
- 
- 
- fi
- 
- SED="$ac_cv_path_SED"
- if test -z "$SED"; then
-   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+   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; }; }
- fi
- 
+   fi
  else
    ac_cv_path_SED=$SED
  fi
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
- echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+ $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
  
@@@ -4234,42 -4400,37 +4400,37 @@@ Xsed="$SED -e 1s/^X//
  
  
  
- { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
- echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  if test "${ac_cv_path_GREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # Extract the first word of "grep ggrep" to use in msg output
- if test -z "$GREP"; then
- set dummy grep ggrep; ac_prog_name=$2
- if test "${ac_cv_path_GREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
+   if test -z "$GREP"; then
    ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   # Loop through the user's path and test for each of PROGNAME-LIST
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_prog in grep ggrep; do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-     { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-     # Check for GNU ac_path_GREP and select it if it is found.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  *)
    ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   $as_echo_n 0123456789 >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     echo 'GREP' >> "conftest.nl"
+     $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`
@@@ -4284,74 -4445,60 +4445,60 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
- 
-     $ac_path_GREP_found && break 3
+       $ac_path_GREP_found && break 3
+     done
    done
  done
- 
- done
  IFS=$as_save_IFS
- 
- 
- fi
- 
- GREP="$ac_cv_path_GREP"
- if test -z "$GREP"; then
-   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   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; }; }
- fi
- 
+   fi
  else
    ac_cv_path_GREP=$GREP
  fi
  
- 
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
- echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+ $as_echo "$ac_cv_path_GREP" >&6; }
   GREP="$ac_cv_path_GREP"
  
  
- { echo "$as_me:$LINENO: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
  if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
     then ac_cv_path_EGREP="$GREP -E"
     else
-      # Extract the first word of "egrep" to use in msg output
- if test -z "$EGREP"; then
- set dummy egrep; ac_prog_name=$2
- if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+      if test -z "$EGREP"; then
    ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   # Loop through the user's path and test for each of PROGNAME-LIST
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_prog in egrep; do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-     { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-     # Check for GNU ac_path_EGREP and select it if it is found.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  *)
    ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   $as_echo_n 0123456789 >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     echo 'EGREP' >> "conftest.nl"
+     $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`
@@@ -4366,75 -4513,61 +4513,61 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
- 
-     $ac_path_EGREP_found && break 3
+       $ac_path_EGREP_found && break 3
+     done
    done
  done
- 
- done
  IFS=$as_save_IFS
- 
- 
- fi
- 
- EGREP="$ac_cv_path_EGREP"
- if test -z "$EGREP"; then
-   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   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; }; }
- fi
- 
+   fi
  else
    ac_cv_path_EGREP=$EGREP
  fi
  
- 
     fi
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
- echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+ $as_echo "$ac_cv_path_EGREP" >&6; }
   EGREP="$ac_cv_path_EGREP"
  
  
- { echo "$as_me:$LINENO: checking for fgrep" >&5
- echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
  if test "${ac_cv_path_FGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
     then ac_cv_path_FGREP="$GREP -F"
     else
-      # Extract the first word of "fgrep" to use in msg output
- if test -z "$FGREP"; then
- set dummy fgrep; ac_prog_name=$2
- if test "${ac_cv_path_FGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+      if test -z "$FGREP"; then
    ac_path_FGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+   # Loop through the user's path and test for each of PROGNAME-LIST
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_prog in 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
-     # Check for GNU ac_path_FGREP and select it if it is found.
+     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
+ # Check for GNU ac_path_FGREP and select it if it is found.
    # Check for GNU $ac_path_FGREP
  case `"$ac_path_FGREP" --version 2>&1` in
  *GNU*)
    ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
  *)
    ac_count=0
-   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   $as_echo_n 0123456789 >"conftest.in"
    while :
    do
      cat "conftest.in" "conftest.in" >"conftest.tmp"
      mv "conftest.tmp" "conftest.in"
      cp "conftest.in" "conftest.nl"
-     echo 'FGREP' >> "conftest.nl"
+     $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`
@@@ -4449,33 -4582,24 +4582,24 @@@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
- 
-     $ac_path_FGREP_found && break 3
+       $ac_path_FGREP_found && break 3
+     done
    done
  done
- 
- done
  IFS=$as_save_IFS
- 
- 
- fi
- 
- FGREP="$ac_cv_path_FGREP"
- if test -z "$FGREP"; then
-   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
- echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   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; }; }
- fi
- 
+   fi
  else
    ac_cv_path_FGREP=$FGREP
  fi
  
- 
     fi
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
- echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+ $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
  
@@@ -4509,8 -4633,8 +4633,8 @@@ f
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
-   { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
- echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
@@@ -4539,14 -4663,14 +4663,14 @@@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
-   { echo "$as_me:$LINENO: checking for GNU ld" >&5
- echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
  else
-   { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
- echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@@ -4576,19 -4700,19 +4700,19 @@@ f
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
-   { echo "$as_me:$LINENO: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ $as_echo "$LD" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ 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; }; }
- { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
- echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
  case `$LD -v 2>&1 </dev/null` in
@@@ -4600,8 -4724,8 +4724,8 @@@
    ;;
  esac
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
- echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
@@@ -4612,10 -4736,10 +4736,10 @@@
  
  
  
- { echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
- echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
    # Let the user override the test.
@@@ -4661,8 -4785,8 +4785,8 @@@ els
    : ${lt_cv_path_NM=no}
  fi
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
- echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ { $as_echo "$as_me:$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"
  else
@@@ -4672,10 -4796,10 +4796,10 @@@
    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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_DUMPBIN+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
    ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
@@@ -4688,7 -4812,7 +4812,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -4699,11 -4823,11 +4823,11 @@@ f
  fi
  DUMPBIN=$ac_cv_prog_DUMPBIN
  if test -n "$DUMPBIN"; then
-   { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
- echo "${ECHO_T}$DUMPBIN" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+ $as_echo "$DUMPBIN" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -4716,10 -4840,10 +4840,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
    ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
@@@ -4732,7 -4856,7 +4856,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -4743,11 -4867,11 +4867,11 @@@ f
  fi
  ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
  if test -n "$ac_ct_DUMPBIN"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
- echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+ $as_echo "$ac_ct_DUMPBIN" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -4759,12 -4883,8 +4883,8 @@@ don
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      DUMPBIN=$ac_ct_DUMPBIN
@@@ -4783,34 -4903,34 +4903,34 @@@ test -z "$NM" && NM=n
  
  
  
- { echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
- echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
-   (eval echo "\"\$as_me:4793: $ac_compile\"" >&5)
+   (eval echo "\"\$as_me:4913: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
-   (eval echo "\"\$as_me:4796: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval echo "\"\$as_me:4916: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
-   (eval echo "\"\$as_me:4799: output\"" >&5)
+   (eval echo "\"\$as_me:4919: 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
- { echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
- echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+ $as_echo "$lt_cv_nm_interface" >&6; }
  
  # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
      i=0
    teststring="ABCD"
@@@ -4927,11 -5047,11 +5047,11 @@@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
-   { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
- echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
  else
-   { echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6; }
+   { $as_echo "$as_me:$LINENO: result: none" >&5
+ $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
  
@@@ -4944,8 -5064,8 +5064,8 @@@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
- { echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
- echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
  ( _lt_dummy="a/b/c"
@@@ -4954,18 -5074,18 +5074,18 @@@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
- { echo "$as_me:$LINENO: result: $xsi_shell" >&5
- echo "${ECHO_T}$xsi_shell" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+ $as_echo "$xsi_shell" >&6; }
  
  
- { echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
- echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
- { echo "$as_me:$LINENO: result: $lt_shell_append" >&5
- echo "${ECHO_T}$lt_shell_append" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+ $as_echo "$lt_shell_append" >&6; }
  
  
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@@ -4999,15 -5119,15 +5119,15 @@@ esa
  
  
  
- { echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
- echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_reload_flag='-r'
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
- echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ { $as_echo "$as_me:$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
  "" | " "*) ;;
@@@ -5035,10 -5155,10 +5155,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
    ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
@@@ -5051,7 -5171,7 +5171,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5062,11 -5182,11 +5182,11 @@@ f
  fi
  OBJDUMP=$ac_cv_prog_OBJDUMP
  if test -n "$OBJDUMP"; then
-   { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
- echo "${ECHO_T}$OBJDUMP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ $as_echo "$OBJDUMP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -5075,10 -5195,10 +5195,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
    ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
@@@ -5091,7 -5211,7 +5211,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5102,11 -5222,11 +5222,11 @@@ f
  fi
  ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
  if test -n "$ac_ct_OBJDUMP"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
- echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_OBJDUMP" = x; then
@@@ -5114,12 -5234,8 +5234,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      OBJDUMP=$ac_ct_OBJDUMP
@@@ -5138,10 -5254,10 +5254,10 @@@ test -z "$OBJDUMP" && OBJDUMP=objdum
  
  
  
- { echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
- echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
  lt_cv_file_magic_test_file=
@@@ -5259,7 -5375,7 +5375,7 @@@ linux* | k*bsd*-gnu
    lt_cv_deplibs_check_method=pass_all
    ;;
  
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
@@@ -5334,8 -5450,8 +5450,8 @@@ tpf*
  esac
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
- echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ { $as_echo "$as_me:$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
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@@ -5354,10 -5470,10 +5470,10 @@@
  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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
@@@ -5370,7 -5486,7 +5486,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="${ac_tool_prefix}ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5381,11 -5497,11 +5497,11 @@@ f
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
-   { echo "$as_me:$LINENO: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $AR" >&5
+ $as_echo "$AR" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -5394,10 -5510,10 +5510,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
    ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@@ -5410,7 -5526,7 +5526,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AR="ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5421,11 -5537,11 +5537,11 @@@ f
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ $as_echo "$ac_ct_AR" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_AR" = x; then
@@@ -5433,12 -5549,8 +5549,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
@@@ -5463,10 -5575,10 +5575,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@@ -5479,7 -5591,7 +5591,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5490,11 -5602,11 +5602,11 @@@ f
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
-   { echo "$as_me:$LINENO: result: $STRIP" >&5
- echo "${ECHO_T}$STRIP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -5503,10 -5615,10 +5615,10 @@@ if test -z "$ac_cv_prog_STRIP"; the
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@@ -5519,7 -5631,7 +5631,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5530,11 -5642,11 +5642,11 @@@ f
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
- echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_STRIP" = x; then
@@@ -5542,12 -5654,8 +5654,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      STRIP=$ac_ct_STRIP
@@@ -5566,10 -5674,10 +5674,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@@ -5582,7 -5690,7 +5690,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5593,11 -5701,11 +5701,11 @@@ f
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
-   { echo "$as_me:$LINENO: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ $as_echo "$RANLIB" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -5606,10 -5714,10 +5714,10 @@@ if test -z "$ac_cv_prog_RANLIB"; the
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@@ -5622,7 -5730,7 +5730,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -5633,11 -5741,11 +5741,11 @@@ f
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ $as_echo "$ac_ct_RANLIB" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_RANLIB" = x; then
@@@ -5645,12 -5753,8 +5753,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      RANLIB=$ac_ct_RANLIB
@@@ -5727,10 -5831,10 +5831,10 @@@ compiler=$C
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
- { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
- echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  # These are sane defaults that work on at least a few old systems.
@@@ -5848,14 -5952,14 +5952,14 @@@ _LT_EO
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; 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
    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s "$nlist"; then
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
@@@ -5912,7 -6016,7 +6016,7 @@@ _LT_EO
  	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
@@@ -5947,11 -6051,11 +6051,11 @@@ 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
-   { echo "$as_me:$LINENO: result: failed" >&5
- echo "${ECHO_T}failed" >&6; }
+   { $as_echo "$as_me:$LINENO: result: failed" >&5
+ $as_echo "failed" >&6; }
  else
-   { echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
  fi
  
  
@@@ -5992,7 -6096,7 +6096,7 @@@ ia64-*-hpux*
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
@@@ -6007,11 -6111,11 +6111,11 @@@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
-   echo '#line 6010 "configure"' > conftest.$ac_ext
+   echo '#line 6114 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
@@@ -6049,7 -6153,7 +6153,7 @@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.o` in
        *32-bit*)
@@@ -6099,10 -6203,10 +6203,10 @@@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
-   { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
- echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
@@@ -6131,26 -6235,30 +6235,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    lt_cv_cc_needs_belf=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
       ac_ext=c
@@@ -6160,8 -6268,8 +6268,8 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
- echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ { $as_echo "$as_me:$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
      CFLAGS="$SAVE_CFLAGS"
@@@ -6173,7 -6281,7 +6281,7 @@@ sparc*-*solaris*
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.o` in
      *64-bit*)
@@@ -6200,10 -6308,10 +6308,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
    ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@@ -6216,7 -6324,7 +6324,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6227,11 -6335,11 +6335,11 @@@ f
  fi
  DSYMUTIL=$ac_cv_prog_DSYMUTIL
  if test -n "$DSYMUTIL"; then
-   { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
- echo "${ECHO_T}$DSYMUTIL" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+ $as_echo "$DSYMUTIL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -6240,10 -6348,10 +6348,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
    ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@@ -6256,7 -6364,7 +6364,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6267,11 -6375,11 +6375,11 @@@ f
  fi
  ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
  if test -n "$ac_ct_DSYMUTIL"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
- echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+ $as_echo "$ac_ct_DSYMUTIL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_DSYMUTIL" = x; then
@@@ -6279,12 -6387,8 +6387,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      DSYMUTIL=$ac_ct_DSYMUTIL
@@@ -6296,10 -6400,10 +6400,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_NMEDIT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
    ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@@ -6312,7 -6416,7 +6416,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6323,11 -6427,11 +6427,11 @@@ f
  fi
  NMEDIT=$ac_cv_prog_NMEDIT
  if test -n "$NMEDIT"; then
-   { echo "$as_me:$LINENO: result: $NMEDIT" >&5
- echo "${ECHO_T}$NMEDIT" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+ $as_echo "$NMEDIT" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -6336,10 -6440,10 +6440,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
    ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@@ -6352,7 -6456,7 +6456,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_NMEDIT="nmedit"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6363,11 -6467,11 +6467,11 @@@ f
  fi
  ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  if test -n "$ac_ct_NMEDIT"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
- echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+ $as_echo "$ac_ct_NMEDIT" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_NMEDIT" = x; then
@@@ -6375,12 -6479,8 +6479,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      NMEDIT=$ac_ct_NMEDIT
@@@ -6392,10 -6492,10 +6492,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_LIPO+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
    ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
@@@ -6408,7 -6508,7 +6508,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6419,11 -6519,11 +6519,11 @@@ f
  fi
  LIPO=$ac_cv_prog_LIPO
  if test -n "$LIPO"; then
-   { echo "$as_me:$LINENO: result: $LIPO" >&5
- echo "${ECHO_T}$LIPO" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+ $as_echo "$LIPO" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -6432,10 -6532,10 +6532,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
    ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
@@@ -6448,7 -6548,7 +6548,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_LIPO="lipo"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6459,11 -6559,11 +6559,11 @@@ f
  fi
  ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
  if test -n "$ac_ct_LIPO"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
- echo "${ECHO_T}$ac_ct_LIPO" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+ $as_echo "$ac_ct_LIPO" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_LIPO" = x; then
@@@ -6471,12 -6571,8 +6571,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      LIPO=$ac_ct_LIPO
@@@ -6488,10 -6584,10 +6584,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_OTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
    ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
@@@ -6504,7 -6600,7 +6600,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6515,11 -6611,11 +6611,11 @@@ f
  fi
  OTOOL=$ac_cv_prog_OTOOL
  if test -n "$OTOOL"; then
-   { echo "$as_me:$LINENO: result: $OTOOL" >&5
- echo "${ECHO_T}$OTOOL" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+ $as_echo "$OTOOL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -6528,10 -6624,10 +6624,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
    ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
@@@ -6544,7 -6640,7 +6640,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_OTOOL="otool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6555,11 -6651,11 +6651,11 @@@ f
  fi
  ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
  if test -n "$ac_ct_OTOOL"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
- echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+ $as_echo "$ac_ct_OTOOL" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_OTOOL" = x; then
@@@ -6567,12 -6663,8 +6663,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      OTOOL=$ac_ct_OTOOL
@@@ -6584,10 -6676,10 +6676,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_OTOOL64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
    ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
@@@ -6600,7 -6692,7 +6692,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6611,11 -6703,11 +6703,11 @@@ f
  fi
  OTOOL64=$ac_cv_prog_OTOOL64
  if test -n "$OTOOL64"; then
-   { echo "$as_me:$LINENO: result: $OTOOL64" >&5
- echo "${ECHO_T}$OTOOL64" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+ $as_echo "$OTOOL64" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -6624,10 -6716,10 +6716,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
    ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
@@@ -6640,7 -6732,7 +6732,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_OTOOL64="otool64"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -6651,11 -6743,11 +6743,11 @@@ f
  fi
  ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
  if test -n "$ac_ct_OTOOL64"; then
-   { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
- echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+ $as_echo "$ac_ct_OTOOL64" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
    if test "x$ac_ct_OTOOL64" = x; then
@@@ -6663,12 -6755,8 +6755,8 @@@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&5
- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      OTOOL64=$ac_ct_OTOOL64
@@@ -6703,10 -6791,10 +6791,10 @@@ f
  
  
  
-     { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
- echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
        if test -z "${LT_MULTI_MODULE}"; then
@@@ -6730,12 -6818,12 +6818,12 @@@
  	rm -f conftest.*
        fi
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
- echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-     { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
- echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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_n "checking for -exported_symbols_list linker flag... " >&6; }
  if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_exported_symbols_list=no
        save_LDFLAGS=$LDFLAGS
@@@ -6762,33 -6850,37 +6850,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    lt_cv_ld_exported_symbols_list=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  	LDFLAGS="$save_LDFLAGS"
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
- echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:$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])
        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@@ -6829,15 -6921,15 +6921,15 @@@ ac_cpp='$CPP $CPPFLAGS
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@@ -6869,20 -6961,21 +6961,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
@@@ -6906,13 -6999,14 +6999,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
@@@ -6920,7 -7014,7 +7014,7 @@@
    # Broken: success on invalid input.
  continue
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
@@@ -6945,8 -7039,8 +7039,8 @@@ f
  else
    ac_cv_prog_CPP=$CPP
  fi
- { echo "$as_me:$LINENO: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CPP" >&5
+ $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
@@@ -6974,20 -7068,21 +7068,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
@@@ -7011,13 -7106,14 +7106,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
@@@ -7025,7 -7121,7 +7121,7 @@@
    # Broken: success on invalid input.
  continue
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
@@@ -7041,11 -7137,13 +7137,13 @@@ rm -f conftest.err conftest.$ac_ex
  if $ac_preproc_ok; then
    :
  else
-   { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }; }
  fi
  
  ac_ext=c
@@@ -7055,10 -7153,10 +7153,10 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7085,20 -7183,21 +7183,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_header_stdc=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stdc=no
@@@ -7190,37 -7289,40 +7289,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_header_stdc=no
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ { $as_echo "$as_me:$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
@@@ -7242,11 -7344,11 +7344,11 @@@ f
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  		  inttypes.h stdint.h unistd.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7264,20 -7366,21 +7366,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7285,12 -7388,15 +7388,15 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7301,11 -7407,11 +7407,11 @@@ don
  
  for ac_header in dlfcn.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -7323,20 -7429,21 +7429,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -7344,12 -7451,15 +7451,15 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -7528,10 -7638,10 +7638,10 @@@ if test -n "${ZSH_VERSION+set}" ; the
     setopt NO_GLOB_SUBST
  fi
  
- { echo "$as_me:$LINENO: checking for objdir" >&5
- echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
  if test "${lt_cv_objdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
  mkdir .libs 2>/dev/null
@@@ -7543,8 -7653,8 +7653,8 @@@ els
  fi
  rmdir .libs 2>/dev/null
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
- echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+ $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
  
@@@ -7636,10 -7746,10 +7746,10 @@@ test -z "$MAGIC_CMD" && MAGIC_CMD=fil
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-     { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
- echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
  [\\/*] |  ?:[\\/]*)
@@@ -7689,11 -7799,11 +7799,11 @@@ f
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
-   { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
- echo "${ECHO_T}$MAGIC_CMD" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -7702,10 -7812,10 +7812,10 @@@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
-     { echo "$as_me:$LINENO: checking for file" >&5
- echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$LINENO: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
  [\\/*] |  ?:[\\/]*)
@@@ -7755,11 -7865,11 +7865,11 @@@ f
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
-   { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
- echo "${ECHO_T}$MAGIC_CMD" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -7839,10 -7949,10 +7949,10 @@@ lt_prog_compiler_no_builtin_flag
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
-   { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
     ac_outfile=conftest.$ac_objext
@@@ -7857,11 -7967,11 +7967,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:7860: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:7970: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:7864: \$? = $ac_status" >&5
+    echo "$as_me:7974: \$? = $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.
@@@ -7874,8 -7984,8 +7984,8 @@@
     $RM conftest*
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ { $as_echo "$as_me:$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
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@@ -7894,8 -8004,8 +8004,8 @@@ f
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
- { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
- echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
      lt_prog_compiler_wl='-Wl,'
@@@ -8166,8 -8276,8 +8276,8 @@@ case $host_os i
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
- { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
- echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+ $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
  
@@@ -8178,10 -8288,10 +8288,10 @@@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
-   { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
     ac_outfile=conftest.$ac_objext
@@@ -8196,11 -8306,11 +8306,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:8199: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8309: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:8203: \$? = $ac_status" >&5
+    echo "$as_me:8313: \$? = $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.
@@@ -8213,8 -8323,8 +8323,8 @@@
     $RM conftest*
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+ { $as_echo "$as_me:$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
      case $lt_prog_compiler_pic in
@@@ -8237,10 -8347,10 +8347,10 @@@ f
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
     save_LDFLAGS="$LDFLAGS"
@@@ -8265,8 -8375,8 +8375,8 @@@
     LDFLAGS="$save_LDFLAGS"
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+ { $as_echo "$as_me:$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
      :
@@@ -8280,10 -8390,10 +8390,10 @@@ f
  
  
  
-   { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
     $RM -r conftest 2>/dev/null
@@@ -8301,11 -8411,11 +8411,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:8304: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8414: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:8308: \$? = $ac_status" >&5
+    echo "$as_me:8418: \$? = $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
@@@ -8327,18 -8437,18 +8437,18 @@@
     $RM conftest*
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
  
  
  
  
-   { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
     $RM -r conftest 2>/dev/null
@@@ -8356,11 -8466,11 +8466,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:8359: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:8469: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:8363: \$? = $ac_status" >&5
+    echo "$as_me:8473: \$? = $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
@@@ -8382,8 -8492,8 +8492,8 @@@
     $RM conftest*
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
- echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
  
@@@ -8391,19 -8501,19 +8501,19 @@@
  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
-   { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
- echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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*
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   { echo "$as_me:$LINENO: result: $hard_links" >&5
- echo "${ECHO_T}$hard_links" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
    if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+     { $as_echo "$as_me:$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
  else
@@@ -8415,8 -8525,8 +8525,8 @@@ f
  
  
  
-   { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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=
    allow_undefined_flag=
@@@ -8657,7 -8767,7 +8767,7 @@@ _LT_EO
        fi
        ;;
  
-     netbsd*)
+     netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
@@@ -8832,6 -8942,7 +8942,7 @@@ _LT_EO
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
+ 	link_all_deplibs=no
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
@@@ -8878,18 -8989,21 +8989,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
@@@ -8904,12 -9018,13 +9018,13 @@@ if test -z "$aix_libpath"; the
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -8945,18 -9060,21 +9060,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
@@@ -8971,12 -9089,13 +9089,13 @@@ if test -z "$aix_libpath"; the
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@@ -9199,27 -9318,31 +9318,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; 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
-   echo "$as_me: failed program was:" >&5
+   $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
          LDFLAGS="$save_LDFLAGS"
@@@ -9234,7 -9357,7 +9357,7 @@@
        link_all_deplibs=yes
        ;;
  
-     netbsd*)
+     netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
@@@ -9477,8 -9600,8 +9600,8 @@@
      fi
    fi
  
- { echo "$as_me:$LINENO: result: $ld_shlibs" >&5
- echo "${ECHO_T}$ld_shlibs" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+ $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
  with_gnu_ld=$with_gnu_ld
@@@ -9514,15 -9637,15 +9637,15 @@@ 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.
-       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       { $as_echo "$as_me:$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
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } 2>conftest.err; then
          soname=conftest
          lib=conftest
@@@ -9540,7 -9663,7 +9663,7 @@@
          if { (eval echo "$as_me:$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=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
          then
  	  archive_cmds_need_lc=no
@@@ -9552,8 -9675,8 +9675,8 @@@
          cat conftest.err 1>&5
        fi
        $RM conftest*
-       { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
- echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+       { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+ $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
    fi
@@@ -9716,8 -9839,8 +9839,8 @@@ esa
  
  
  
-   { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
    case $host_os in
@@@ -10159,29 -10282,33 +10282,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && 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
    shlibpath_overrides_runpath=yes
  fi
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
    LDFLAGS=$save_LDFLAGS
@@@ -10207,6 -10334,18 +10334,18 @@@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
+ netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+   dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
@@@ -10395,8 -10534,8 +10534,8 @@@ uts4*
    dynamic_linker=no
    ;;
  esac
- { echo "$as_me:$LINENO: result: $dynamic_linker" >&5
- echo "${ECHO_T}$dynamic_linker" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@@ -10497,8 -10636,8 +10636,8 @@@ f
  
  
  
-   { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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" ||
     test -n "$runpath_var" ||
@@@ -10522,8 -10661,8 +10661,8 @@@ els
    # directories.
    hardcode_action=unsupported
  fi
- { echo "$as_me:$LINENO: result: $hardcode_action" >&5
- echo "${ECHO_T}$hardcode_action" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+ $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
     test "$inherit_rpath" = yes; then
@@@ -10567,10 -10706,10 +10706,10 @@@ els
  
    darwin*)
    # if libdl is installed we need to link against it
-     { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
- echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
@@@ -10602,33 -10741,37 +10741,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dl_dlopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dl_dlopen=no
  fi
  
+ rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
@@@ -10641,10 -10784,10 +10784,10 @@@ f
      ;;
  
    *)
-     { echo "$as_me:$LINENO: checking for shl_load" >&5
- echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+     { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -10697,38 -10840,42 +10840,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_func_shl_load=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
+ { $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
    lt_cv_dlopen="shl_load"
  else
-   { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
- echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
@@@ -10760,39 -10907,43 +10907,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dld_shl_load=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
+ { $as_echo "$as_me:$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
    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  else
-   { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -10845,38 -10996,42 +10996,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_func_dlopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
+ { $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
    lt_cv_dlopen="dlopen"
  else
-   { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
- echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
@@@ -10908,39 -11063,43 +11063,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dl_dlopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_lib_dl_dlopen=no
  fi
  
+ rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-   { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsvld  $LIBS"
@@@ -10972,39 -11131,43 +11131,43 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_svld_dlopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
+ { $as_echo "$as_me:$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
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
  else
-   { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
- echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
@@@ -11036,33 -11199,37 +11199,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dld_dld_link=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
+ { $as_echo "$as_me:$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
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
@@@ -11101,10 -11268,10 +11268,10 @@@ f
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
-     { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
- echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
    lt_cv_dlopen_self=cross
@@@ -11112,7 -11279,7 +11279,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 11115 "configure"
+ #line 11282 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -11174,7 -11341,7 +11341,7 @@@ _LT_EO
    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
@@@ -11192,15 -11359,15 +11359,15 @@@ rm -fr conftest
  
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ { $as_echo "$as_me:$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\"
-       { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+       { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
    lt_cv_dlopen_self_static=cross
@@@ -11208,7 -11375,7 +11375,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 11211 "configure"
+ #line 11378 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -11270,7 -11437,7 +11437,7 @@@ _LT_EO
    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
@@@ -11288,8 -11455,8 +11455,8 @@@ rm -fr conftest
  
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
- echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
@@@ -11327,13 -11494,13 +11494,13 @@@ f
  
  striplib=
  old_striplib=
- { echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
- echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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"
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
    case $host_os in
@@@ -11341,16 -11508,16 +11508,16 @@@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
-       { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+       { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
      else
-       { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+       { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
      fi
      ;;
    *)
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
      ;;
    esac
  fi
@@@ -11367,13 -11534,13 +11534,13 @@@
  
  
    # Report which library types will actually be built
-   { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-   { echo "$as_me:$LINENO: result: $can_build_shared" >&5
- echo "${ECHO_T}$can_build_shared" >&6; }
+   { $as_echo "$as_me:$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 "$can_build_shared" >&6; }
  
-   { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
- echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
  
    # On AIX, shared libraries and static libraries use the same namespace, and
@@@ -11393,15 -11560,15 +11560,15 @@@
      fi
      ;;
    esac
-   { echo "$as_me:$LINENO: result: $enable_shared" >&5
- echo "${ECHO_T}$enable_shared" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+ $as_echo "$enable_shared" >&6; }
  
-   { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
- echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   { echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
  
  
  
@@@ -11435,18 -11602,18 +11602,18 @@@ CC="$lt_save_CC
  # Only expand once:
  
  
- { echo "$as_me:$LINENO: checking which extension is used for runtime loadable modules" >&5
- echo $ECHO_N "checking which extension is used for runtime loadable modules... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  module=yes
  eval libltdl_cv_shlibext=$shrext_cmds
  
  fi
- { echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
- echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+ $as_echo "$libltdl_cv_shlibext" >&6; }
  if test -n "$libltdl_cv_shlibext"; then
  
  cat >>confdefs.h <<_ACEOF
@@@ -11455,15 -11622,15 +11622,15 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking which variable specifies run-time module search path" >&5
- echo $ECHO_N "checking which variable specifies run-time module search path... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_module_path_var="$shlibpath_var"
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_module_path_var" >&5
- echo "${ECHO_T}$lt_cv_module_path_var" >&6; }
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<_ACEOF
@@@ -11472,15 -11639,15 +11639,15 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking for the default library search path" >&5
- echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_sys_dlsearch_path" >&5
- echo "${ECHO_T}$lt_cv_sys_dlsearch_path" >&6; }
+ { $as_echo "$as_me:$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=
    for dir in $lt_cv_sys_dlsearch_path; do
@@@ -11509,10 -11676,10 +11676,10 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  
  LIBADD_DLOPEN=
- { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
- echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -11550,26 -11717,30 +11717,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_search_dlopen=$ac_res
  else
-   echo "$as_me: failed program was:" >&5
+   $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
@@@ -11584,8 -11755,8 +11755,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
- echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+ { $as_echo "$as_me:$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
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -11624,18 -11795,21 +11795,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBDL 1
@@@ -11644,13 -11818,13 +11818,13 @@@ _ACEO
  	    libltdl_cv_func_dlopen="yes"
  	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	{ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsvld  $LIBS"
@@@ -11682,33 -11856,37 +11856,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_svld_dlopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBDL 1
@@@ -11720,6 -11898,7 +11898,7 @@@ f
  
  fi
  
+ rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
@@@ -11731,11 -11910,11 +11910,11 @@@ the
  
  for ac_func in dlerror
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -11788,35 -11967,42 +11967,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -11827,10 -12013,10 +12013,10 @@@ f
  
  
  LIBADD_SHL_LOAD=
- { echo "$as_me:$LINENO: checking for shl_load" >&5
- echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -11883,32 -12069,36 +12069,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_func_shl_load=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
+ { $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
@@@ -11916,10 -12106,10 +12106,10 @@@ _ACEO
  
  	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
  else
-   { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
- echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
@@@ -11951,33 -12141,37 +12141,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dld_shl_load=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SHL_LOAD 1
@@@ -11994,10 -12188,10 +12188,10 @@@ f
  case $host_os in
  darwin[1567].*)
  # We only want this for pre-Mac OS X 10.4.
-   { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
- echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12050,32 -12244,36 +12244,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_func__dyld_func_lookup=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
- echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
- if test $ac_cv_func__dyld_func_lookup = yes; then
+ { $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
@@@ -12089,10 -12287,10 +12287,10 @@@ beos*
    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
    ;;
  cygwin* | mingw* | os2* | pw32*)
-   { echo "$as_me:$LINENO: checking whether cygwin_conv_path is declared" >&5
- echo $ECHO_N "checking whether cygwin_conv_path is declared... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12119,20 -12317,21 +12317,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_decl_cygwin_conv_path=no
@@@ -12140,9 -12339,9 +12339,9 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_decl_cygwin_conv_path" >&5
- echo "${ECHO_T}$ac_cv_have_decl_cygwin_conv_path" >&6; }
- if test $ac_cv_have_decl_cygwin_conv_path = yes; then
+ { $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
@@@ -12162,10 -12361,10 +12361,10 @@@ f
    ;;
  esac
  
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
- echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
@@@ -12197,33 -12396,37 +12396,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_dld_dld_link=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_DLD 1
@@@ -12259,10 -12462,10 +12462,10 @@@ ac_link='$CC -o conftest$ac_exeext $CFL
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
- { echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
- echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    lt_cv_sys_symbol_underscore=no
    cat > conftest.$ac_ext <<_LT_EOF
@@@ -12272,14 -12475,14 +12475,14 @@@ _LT_EO
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; 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
    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s "$ac_nlist"; then
        # See whether the symbols have a leading underscore.
        if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
@@@ -12301,18 -12504,18 +12504,18 @@@
    rm -rf conftest*
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
- echo "${ECHO_T}$lt_cv_sys_symbol_underscore" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
+ $as_echo "$lt_cv_sys_symbol_underscore" >&6; }
    sys_symbol_underscore=$lt_cv_sys_symbol_underscore
  
  
  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
- 	{ echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
- echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    libltdl_cv_need_uscore=unknown
            save_LIBS="$LIBS"
@@@ -12323,7 -12526,7 +12526,7 @@@ els
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 12326 "configure"
+ #line 12529 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -12385,7 -12588,7 +12588,7 @@@ _LT_EO
    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
@@@ -12404,8 -12607,8 +12607,8 @@@ rm -fr conftest
  	  LIBS="$save_LIBS"
  
  fi
- { echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
- echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+ $as_echo "$libltdl_cv_need_uscore" >&6; }
    fi
  fi
  
@@@ -12417,10 -12620,10 +12620,10 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
- echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    # PORTME does your system automatically load deplibs for dlopen?
    # or its logical equivalent (e.g. shl_load for HP-UX < 11)
@@@ -12471,7 -12674,7 +12674,7 @@@
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-   netbsd*)
+   netbsd* | netbsdelf*-gnu)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
    openbsd*)
@@@ -12511,8 -12714,8 +12714,8 @@@
    esac
  
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_sys_dlopen_deplibs" >&5
- echo "${ECHO_T}$lt_cv_sys_dlopen_deplibs" >&6; }
+ { $as_echo "$as_me:$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
@@@ -12526,11 -12729,11 +12729,11 @@@ f
  
  for ac_header in argz.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12548,20 -12751,21 +12751,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -12569,12 -12773,15 +12773,15 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -12582,12 -12789,13 +12789,13 @@@
  done
  
  
- { echo "$as_me:$LINENO: checking for error_t" >&5
- echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   ac_cv_type_error_t=no
+ cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@@ -12597,14 -12805,48 +12805,48 @@@ cat >>conftest.$ac_ext <<_ACEO
  #  include <argz.h>
  #endif
  
  int
  main ()
  {
- if ((ac__type_new_ *) 0)
-   return 0;
- if (sizeof (ac__type_new_))
+ 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)
+ #  include <argz.h>
+ #endif
+ 
+ int
+ main ()
+ {
+ if (sizeof ((error_t)))
+ 	  return 0;
    ;
    return 0;
  }
@@@ -12615,30 -12857,39 +12857,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-   ac_cv_type_error_t=yes
+   :
+ 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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	ac_cv_type_error_t=no
+ 
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
- echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
- if test $ac_cv_type_error_t = yes; then
+ { $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
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_ERROR_T 1
@@@ -12670,11 -12921,11 +12921,11 @@@ 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=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12727,35 -12978,42 +12978,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  else
@@@ -12768,10 -13026,10 +13026,10 @@@ don
  
  
  if test -z "$ARGZ_H"; then
-   { echo "$as_me:$LINENO: checking if argz actually works" >&5
- echo $ECHO_N "checking if argz actually works... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    case $host_os in #(
  	 *cygwin*)
@@@ -12799,8 -13057,8 +13057,8 @@@
  	 *) lt_cv_sys_argz_works=yes ;;
  	 esac
  fi
- { echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
- echo "${ECHO_T}$lt_cv_sys_argz_works" >&6; }
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<\_ACEOF
@@@ -12820,10 -13078,10 +13078,10 @@@ f
  
  
  
- { echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
- echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$lt_cv_sys_global_symbol_pipe"; then
      libltdl_cv_preloaded_symbols=yes
@@@ -12832,8 -13090,8 +13090,8 @@@
    fi
  
  fi
- { echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
- echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
+ { $as_echo "$as_me:$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
@@@ -12863,10 -13121,10 +13121,10 @@@ f
  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.
-   { echo "$as_me:$LINENO: checking for ltdl.h" >&5
- echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12885,20 -13143,21 +13143,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_ltdl_h=no
@@@ -12906,13 -13165,13 +13165,13 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
- echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
- if test $ac_cv_header_ltdl_h = yes; then
-   { echo "$as_me:$LINENO: checking whether lt_dlinterface_register is declared" >&5
- echo $ECHO_N "checking whether lt_dlinterface_register is declared... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -12940,20 -13199,21 +13199,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_decl_lt_dlinterface_register=no
@@@ -12961,13 -13221,13 +13221,13 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_decl_lt_dlinterface_register" >&5
- echo "${ECHO_T}$ac_cv_have_decl_lt_dlinterface_register" >&6; }
- if test $ac_cv_have_decl_lt_dlinterface_register = yes; then
-   { echo "$as_me:$LINENO: checking for lt_dladvise_preload in -lltdl" >&5
- echo $ECHO_N "checking for lt_dladvise_preload in -lltdl... $ECHO_C" >&6; }
+ { $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
+ $as_echo_n "checking for lt_dladvise_preload in -lltdl... " >&6; }
  if test "${ac_cv_lib_ltdl_lt_dladvise_preload+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lltdl  $LIBS"
@@@ -12999,33 -13259,37 +13259,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_ltdl_lt_dladvise_preload=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dladvise_preload" >&5
- echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dladvise_preload" >&6; }
- if test $ac_cv_lib_ltdl_lt_dladvise_preload = yes; then
+ { $as_echo "$as_me:$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
    with_included_ltdl=no
  else
    with_included_ltdl=yes
@@@ -13054,8 -13318,8 +13318,8 @@@ f
  if test -n "$with_ltdl_include"; then
    if test -f "$with_ltdl_include/ltdl.h"; then :
    else
-     { { echo "$as_me:$LINENO: error: invalid ltdl include directory: \`$with_ltdl_include'" >&5
- echo "$as_me: error: invalid ltdl include directory: \`$with_ltdl_include'" >&2;}
+     { { $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; }; }
    fi
  else
@@@ -13072,8 -13336,8 +13336,8 @@@ f
  if test -n "$with_ltdl_lib"; then
    if test -f "$with_ltdl_lib/libltdl.la"; then :
    else
-     { { echo "$as_me:$LINENO: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&5
- echo "$as_me: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&2;}
+     { { $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; }; }
    fi
  else
@@@ -13083,13 -13347,13 +13347,13 @@@ f
  case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
    ,yes,no,no,)
  	case $enable_ltdl_convenience in
-   no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
- echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+   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; }; } ;;
    "") enable_ltdl_convenience=yes
        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
  esac
- LIBLTDL='${top_builddir}/'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
+ LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
  LTDLDEPS=$LIBLTDL
  LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
  
@@@ -13115,8 -13379,8 +13379,8 @@@ _ACEO
  	LTDLINCL=
  	;;
    ,no*,no,*)
- 	{ { echo "$as_me:$LINENO: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&5
- echo "$as_me: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&2;}
+ 	{ { $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; }; }
  	;;
    *)	with_included_ltdl=no
@@@ -13128,14 -13392,14 +13392,14 @@@ esa
  INCLTDL="$LTDLINCL"
  
  # Report our decision...
- { echo "$as_me:$LINENO: checking where to find libltdl headers" >&5
- echo $ECHO_N "checking where to find libltdl headers... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $LTDLINCL" >&5
- echo "${ECHO_T}$LTDLINCL" >&6; }
- { echo "$as_me:$LINENO: checking where to find libltdl library" >&5
- echo $ECHO_N "checking where to find libltdl library... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $LIBLTDL" >&5
- echo "${ECHO_T}$LIBLTDL" >&6; }
+ { $as_echo "$as_me:$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 "$LTDLINCL" >&6; }
+ { $as_echo "$as_me:$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 "$LIBLTDL" >&6; }
  
  
  
@@@ -13187,11 -13451,11 +13451,11 @@@ f
  
  for ac_header in unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13209,20 -13473,21 +13473,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
@@@ -13230,12 -13495,15 +13495,15 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -13248,11 -13516,11 +13516,11 @@@ don
  
  for ac_func in closedir opendir readdir
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13305,35 -13573,42 +13573,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  else
@@@ -13348,11 -13623,11 +13623,11 @@@ don
  
  for ac_func in strlcat strlcpy
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13405,35 -13680,42 +13680,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  else
@@@ -13482,8 -13764,8 +13764,8 @@@ _ACEO
  	# Only modify libdir if user has not overriden it
  	default_libdir='${exec_prefix}/lib'
  	if test "$libdir" = "$default_libdir"; then
- 		{ echo "$as_me:$LINENO: checking for multiarch libdir" >&5
- echo $ECHO_N "checking for multiarch libdir... $ECHO_C" >&6; }
+ 		{ $as_echo "$as_me:$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
  			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS`
@@@ -13498,8 -13780,8 +13780,8 @@@
  			*)                 acl_libdirstem=lib/$ac_multilibdir ;;
  		esac
  		libdir='${exec_prefix}/'$acl_libdirstem
- 		{ echo "$as_me:$LINENO: result: $libdir" >&5
- echo "${ECHO_T}$libdir" >&6; }
+ 		{ $as_echo "$as_me:$LINENO: result: $libdir" >&5
+ $as_echo "$libdir" >&6; }
  	else
  		acl_libdirstem=lib
  		if test -d "$libdir"; then
@@@ -13514,10 -13796,10 +13796,10 @@@
  	fi
  
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13544,20 -13826,21 +13826,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_header_stdc=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stdc=no
@@@ -13649,37 -13932,40 +13932,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_header_stdc=no
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ { $as_echo "$as_me:$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
@@@ -13688,15 -13974,14 +13974,14 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
- echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_c_restrict=no
-    # Try the official restrict keyword, then gcc's __restrict, and
-    # the less common variants.
-    for ac_kw in restrict __restrict __restrict__ _Restrict; do
+    # 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
@@@ -13704,16 -13989,16 +13989,16 @@@ cat confdefs.h >>conftest.$ac_ex
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  typedef int * int_ptr;
-         int foo (int_ptr $ac_kw ip) {
-         return ip[0];
+ 	int foo (int_ptr $ac_kw ip) {
+ 	return ip[0];
         }
  int
  main ()
  {
  int s[1];
-         int * $ac_kw t = s;
-         t[0] = 0;
-         return foo(t)
+ 	int * $ac_kw t = s;
+ 	t[0] = 0;
+ 	return foo(t)
    ;
    return 0;
  }
@@@ -13724,20 -14009,21 +14009,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_restrict=$ac_kw
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -13748,13 -14034,14 +14034,14 @@@ rm -f core conftest.err conftest.$ac_ob
     done
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
- echo "${ECHO_T}$ac_cv_c_restrict" >&6; }
+ { $as_echo "$as_me:$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
+    no) cat >>confdefs.h <<\_ACEOF
+ #define restrict /**/
  _ACEOF
   ;;
     *)  cat >>confdefs.h <<_ACEOF
@@@ -13763,10 -14050,10 +14050,10 @@@ _ACEO
   ;;
   esac
  
- { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -13838,20 -14125,21 +14125,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_const=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_const=no
@@@ -13859,20 -14147,20 +14147,20 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6; }
+ { $as_echo "$as_me:$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
+ #define const /**/
  _ACEOF
  
  fi
  
- { echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
  if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
@@@ -13895,20 -14183,21 +14183,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_inline=$ac_kw
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -13919,8 -14208,8 +14208,8 @@@ rm -f core conftest.err conftest.$ac_ob
  done
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ $as_echo "$ac_cv_c_inline" >&6; }
  
  
  case $ac_cv_c_inline in
@@@ -13938,10 -14227,10 +14227,10 @@@ _ACEO
      ;;
  esac
  
- { echo "$as_me:$LINENO: checking whether FPU byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether FPU byte ordering is bigendian... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_c_fpu_bigendian=auto
  
@@@ -13968,13 -14257,14 +14257,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -13988,7 -14278,7 +14278,7 @@@ if ${GREP-grep} elleemme conftest.$ac_o
  fi
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -13999,8 -14289,8 +14289,8 @@@ f
  
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_fpu_bigendian" >&5
- echo "${ECHO_T}$ac_cv_c_fpu_bigendian" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_fpu_bigendian" >&5
+ $as_echo "$ac_cv_c_fpu_bigendian" >&6; }
  case $ac_cv_c_fpu_bigendian in
  	yes)
  
@@@ -14017,32 -14307,82 +14307,82 @@@ _ACEO
  
  		;;
  	*)
- 		{ echo "$as_me:$LINENO: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
- echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&2;}
+ 		{ $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: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&2;}
  esac
  
- { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ 
+  { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
-   # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
+   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
+ /* end confdefs.h.  */
+ #ifndef __APPLE_CC__
+ 	       not a universal capable compiler
+ 	     #endif
+ 	     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
+ 
+ 	# 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
+ 
+ 
+ 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
  /* end confdefs.h.  */
  #include <sys/types.h>
- #include <sys/param.h>
+ 	     #include <sys/param.h>
  
  int
  main ()
  {
- #if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
- 	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-  bogus endian macros
- #endif
+ #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+ 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+ 		     && LITTLE_ENDIAN)
+ 	      bogus endian macros
+ 	     #endif
  
    ;
    return 0;
@@@ -14054,33 -14394,34 +14394,34 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
+ 	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <sys/types.h>
- #include <sys/param.h>
+ 		#include <sys/param.h>
  
  int
  main ()
  {
  #if BYTE_ORDER != BIG_ENDIAN
-  not big endian
- #endif
+ 		 not big endian
+ 		#endif
  
    ;
    return 0;
@@@ -14092,20 -14433,21 +14433,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_bigendian=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_bigendian=no
@@@ -14113,29 -14455,31 +14455,31 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	# It does not; compile a test program.
- if test "$cross_compiling" = yes; then
-   # try to guess the endianness by grepping values into an object file
-   ac_cv_c_bigendian=unknown
-   cat >conftest.$ac_ext <<_ACEOF
+ 
+ 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
  /* end confdefs.h.  */
- short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
- short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
- short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
- short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ #include <limits.h>
+ 
  int
  main ()
  {
-  _ascii (); _ebcdic ();
+ #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ 	      bogus endian macros
+ 	     #endif
+ 
    ;
    return 0;
  }
@@@ -14146,30 -14490,139 +14490,139 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; 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
+ /* end confdefs.h.  */
+ #include <limits.h>
+ 
+ int
+ main ()
+ {
+ #ifndef _BIG_ENDIAN
+ 		 not big endian
+ 		#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
-   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; 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
  fi
- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-   if test "$ac_cv_c_bigendian" = unknown; then
-     ac_cv_c_bigendian=no
-   else
-     # finding both strings is unlikely to happen, but who knows?
-     ac_cv_c_bigendian=unknown
-   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
+   # 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
+ /* end confdefs.h.  */
+ short int ascii_mm[] =
+ 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ 		short int ascii_ii[] =
+ 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ 		int use_ascii (int i) {
+ 		  return ascii_mm[i] + ascii_ii[i];
+ 		}
+ 		short int ebcdic_ii[] =
+ 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ 		short int ebcdic_mm[] =
+ 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ 		int use_ebcdic (int i) {
+ 		  return ebcdic_mm[i] + ebcdic_ii[i];
+ 		}
+ 		extern int foo;
+ 
+ int
+ main ()
+ {
+ return use_ascii (foo) == use_ebcdic (foo);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ 	      ac_cv_c_bigendian=yes
+ 	    fi
+ 	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ 	      if test "$ac_cv_c_bigendian" = unknown; then
+ 		ac_cv_c_bigendian=no
+ 	      else
+ 		# finding both strings is unlikely to happen, but who knows?
+ 		ac_cv_c_bigendian=unknown
+ 	      fi
+ 	    fi
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -14188,14 -14641,14 +14641,14 @@@ in
  main ()
  {
  
-   /* Are we little or big endian?  From Harbison&Steele.  */
-   union
-   {
-     long int l;
-     char c[sizeof (long int)];
-   } u;
-   u.l = 1;
-   return u.c[sizeof (long int) - 1] == 1;
+ 	     /* Are we little or big endian?  From Harbison&Steele.  */
+ 	     union
+ 	     {
+ 	       long int l;
+ 	       char c[sizeof (long int)];
+ 	     } u;
+ 	     u.l = 1;
+ 	     return u.c[sizeof (long int) - 1] == 1;
  
    ;
    return 0;
@@@ -14207,65 -14660,65 +14660,65 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_bigendian=no
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
+     fi
  fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
- echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in
-   yes)
- 
- cat >>confdefs.h <<\_ACEOF
+ { $as_echo "$as_me:$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
-  ;;
-   no)
-      ;;
-   *)
-     { { echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
- echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
- 
- if test $ac_cv_c_bigendian = yes; then
+ ;; #(
+    no)
+       ;; #(
+    universal)
  
  cat >>confdefs.h <<\_ACEOF
- #define WORDS_BIGENDIAN 1
+ #define AC_APPLE_UNIVERSAL_BUILD 1
  _ACEOF
  
- else
+      ;; #(
+    *)
+      { { $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; }; } ;;
+  esac
  
- cat >>confdefs.h <<\_ACEOF
+ if test $ac_cv_c_bigendian = no; then
+     cat >>confdefs.h <<\_ACEOF
  #define WORDS_BIGENDIAN 0
  _ACEOF
  
@@@ -14283,20 -14736,20 +14736,20 @@@ msg_gcc_check="use --disable-gcc-vchec
  VERSION_SUFFIX=
  if test "$gcc_check" = "yes"; then
  	if test "x$ac_compiler_gnu" = "xyes"; then
- 		{ echo "$as_me:$LINENO: checking for a supported version of gcc" >&5
- echo $ECHO_N "checking for a supported version of gcc... $ECHO_C" >&6; }
+ 		{ $as_echo "$as_me:$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*)
- 				{ echo "$as_me:$LINENO: result: no (${gcc_version})" >&5
- echo "${ECHO_T}no (${gcc_version})" >&6; }
- 				{ { 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
- 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;}
+ 				{ $as_echo "$as_me:$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; }; }
  				;;
  			*)
- 				{ echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5
- echo "${ECHO_T}ok (${gcc_version})" >&6; }
+ 				{ $as_echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5
+ $as_echo "ok (${gcc_version})" >&6; }
  				;;
  	esac
  	fi
@@@ -14328,11 -14781,11 +14781,11 @@@ f
  
  
  
- { echo "$as_me:$LINENO: checking for gcc bug PR27603" >&5
- echo $ECHO_N "checking for gcc bug PR27603... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for gcc bug PR27603" >&5
+ $as_echo_n "checking for gcc bug PR27603... " >&6; }
  if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
- echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ $as_echo "cross-compiling, assumed ok" >&6; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14364,42 -14817,45 +14817,45 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   { echo "$as_me:$LINENO: result: ok, bug not present" >&5
- echo "${ECHO_T}ok, bug not present" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok, bug not present" >&5
+ $as_echo "ok, bug not present" >&6; }
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
- { { 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
- 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;}
+ { { $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; }; }
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  
- { echo "$as_me:$LINENO: checking for gcc bug PR26763-2" >&5
- echo $ECHO_N "checking for gcc bug PR26763-2... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for gcc bug PR26763-2" >&5
+ $as_echo_n "checking for gcc bug PR26763-2... " >&6; }
  if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
- echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ $as_echo "cross-compiling, assumed ok" >&6; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14433,42 -14889,45 +14889,45 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   { echo "$as_me:$LINENO: result: ok, bug not present" >&5
- echo "${ECHO_T}ok, bug not present" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok, bug not present" >&5
+ $as_echo "ok, bug not present" >&6; }
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
- { { 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
- 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;}
+ { { $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; }; }
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  
- { echo "$as_me:$LINENO: checking for valid code generation of CLI_ISCONTAINED" >&5
- echo $ECHO_N "checking for valid code generation of CLI_ISCONTAINED... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
- echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ $as_echo "cross-compiling, assumed ok" >&6; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14541,42 -15000,45 +15000,45 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   { echo "$as_me:$LINENO: result: ok, bug not present" >&5
- echo "${ECHO_T}ok, bug not present" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok, bug not present" >&5
+ $as_echo "ok, bug not present" >&6; }
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
- { { 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
- 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;}
+ { { $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; }; }
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  
- { echo "$as_me:$LINENO: checking for gcc bug PR28045" >&5
- echo $ECHO_N "checking for gcc bug PR28045... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for gcc bug PR28045" >&5
+ $as_echo_n "checking for gcc bug PR28045... " >&6; }
  if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
- echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ $as_echo "cross-compiling, assumed ok" >&6; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14613,42 -15075,45 +15075,45 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   { echo "$as_me:$LINENO: result: ok, bug not present" >&5
- echo "${ECHO_T}ok, bug not present" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok, bug not present" >&5
+ $as_echo "ok, bug not present" >&6; }
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
- { { 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
- 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;}
+ { { $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; }; }
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  
- { echo "$as_me:$LINENO: checking for gcc bug PR37573" >&5
- echo $ECHO_N "checking for gcc bug PR37573... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for gcc bug PR37573" >&5
+ $as_echo_n "checking for gcc bug PR37573... " >&6; }
  if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
- echo "${ECHO_T}cross-compiling, assumed ok" >&6; }
+   { $as_echo "$as_me:$LINENO: result: cross-compiling, assumed ok" >&5
+ $as_echo "cross-compiling, assumed ok" >&6; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -14739,41 -15204,44 +15204,44 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   { echo "$as_me:$LINENO: result: ok, bug not present" >&5
- echo "${ECHO_T}ok, bug not present" >&6; }
+   { $as_echo "$as_me:$LINENO: result: ok, bug not present" >&5
+ $as_echo "ok, bug not present" >&6; }
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
- { { 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
- 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;}
+ { { $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; }; }
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  
- { echo "$as_me:$LINENO: checking for ld --version-script" >&5
- echo $ECHO_N "checking for ld --version-script... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
      cat > conftest.c <<EOF
  void cl_symbol1(void) {}
@@@ -14802,7 -15270,7 +15270,7 @@@ EO
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; };
    then
        VERSIONSCRIPTFLAG=--version-script
@@@ -14815,7 -15283,7 +15283,7 @@@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; };
  	then
  		VERSIONSCRIPTFLAG=-M
@@@ -14826,8 -15294,8 +15294,8 @@@
    fi
   rm -f conftest*
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5
- echo "${ECHO_T}$ac_cv_ld_version_script" >&6; }
+ { $as_echo "$as_me:$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
    VERSIONSCRIPT_TRUE=
@@@ -14870,20 -15338,21 +15338,21 @@@ 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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
-   { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ 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?
- { echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ { $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
@@@ -14899,32 -15368,33 +15368,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ { $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
@@@ -14938,51 -15408,52 +15408,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -14991,21 -15462,24 +15462,24 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ 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
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ as_val=`eval 'as_val=${'$as_ac_Header'}
+ 		 $as_echo "$as_val"'`
+    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -15013,17 -15487,17 +15487,17 @@@
  done
  
  if test "${ac_cv_header_syslog_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for syslog.h" >&5
- echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
- echo "${ECHO_T}$ac_cv_header_syslog_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking syslog.h usability" >&5
- echo $ECHO_N "checking syslog.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -15039,32 -15513,33 +15513,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking syslog.h presence" >&5
- echo $ECHO_N "checking syslog.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -15078,51 -15553,52 +15553,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: syslog.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: syslog.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: syslog.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: syslog.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: syslog.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: syslog.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -15131,18 -15607,18 +15607,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for syslog.h" >&5
- echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_syslog_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
- echo "${ECHO_T}$ac_cv_header_syslog_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
+ $as_echo "$ac_cv_header_syslog_h" >&6; }
  
  fi
- if test $ac_cv_header_syslog_h = yes; then
+ if test "x$ac_cv_header_syslog_h" = x""yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define USE_SYSLOG 1
@@@ -15152,26 -15628,58 +15628,58 @@@ f
  
  
  
- { echo "$as_me:$LINENO: checking for off_t" >&5
- echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   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 ((ac__type_new_ *) 0)
-   return 0;
- if (sizeof (ac__type_new_))
+ 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;
  }
@@@ -15182,30 -15690,39 +15690,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-   ac_cv_type_off_t=yes
+   :
+ 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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	ac_cv_type_off_t=no
+ 
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
- echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
+ { $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
  
@@@ -15215,10 -15732,10 +15732,10 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking size of short" >&5
- echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking size of short" >&5
+ $as_echo_n "checking size of short... " >&6; }
  if test "${ac_cv_sizeof_short+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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
@@@ -15245,20 -15762,21 +15762,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_sizeof_short=$ac_size
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15271,22 -15789,22 +15789,22 @@@ don
  fi
  
  if test x$ac_cv_sizeof_short = x ; then
-   { { echo "$as_me:$LINENO: error: cannot determine a size for short" >&5
- echo "$as_me: error: cannot determine a size for short" >&2;}
+   { { $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; }; }
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
- echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ $as_echo "$ac_cv_sizeof_short" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking size of int" >&5
- echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking size of int" >&5
+ $as_echo_n "checking size of int... " >&6; }
  if test "${ac_cv_sizeof_int+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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
@@@ -15313,20 -15831,21 +15831,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_sizeof_int=$ac_size
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15339,22 -15858,22 +15858,22 @@@ don
  fi
  
  if test x$ac_cv_sizeof_int = x ; then
-   { { echo "$as_me:$LINENO: error: cannot determine a size for int" >&5
- echo "$as_me: error: cannot determine a size for int" >&2;}
+   { { $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; }; }
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
- echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ $as_echo "$ac_cv_sizeof_int" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking size of long" >&5
- echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking size of long" >&5
+ $as_echo_n "checking size of long... " >&6; }
  if test "${ac_cv_sizeof_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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
@@@ -15381,20 -15900,21 +15900,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_sizeof_long=$ac_size
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15407,22 -15927,22 +15927,22 @@@ don
  fi
  
  if test x$ac_cv_sizeof_long = x ; then
-   { { echo "$as_me:$LINENO: error: cannot determine a size for long" >&5
- echo "$as_me: error: cannot determine a size for long" >&2;}
+   { { $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; }; }
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ $as_echo "$ac_cv_sizeof_long" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking size of long long" >&5
- echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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
@@@ -15449,20 -15969,21 +15969,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_sizeof_long_long=$ac_size
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15475,22 -15996,22 +15996,22 @@@ don
  fi
  
  if test x$ac_cv_sizeof_long_long = x ; then
-   { { echo "$as_me:$LINENO: error: cannot determine a size for long long" >&5
- echo "$as_me: error: cannot determine a size for long long" >&2;}
+   { { $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; }; }
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+ $as_echo "$ac_cv_sizeof_long_long" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking size of void *" >&5
- echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking size of void *" >&5
+ $as_echo_n "checking size of void *... " >&6; }
  if test "${ac_cv_sizeof_void_p+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $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
@@@ -15517,20 -16038,21 +16038,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_sizeof_void_p=$ac_size
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -15543,12 -16065,12 +16065,12 @@@ don
  fi
  
  if test x$ac_cv_sizeof_void_p = x ; then
-   { { echo "$as_me:$LINENO: error: cannot determine a size for void *" >&5
- echo "$as_me: error: cannot determine a size for void *" >&2;}
+   { { $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; }; }
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
- echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+ $as_echo "$ac_cv_sizeof_void_p" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
@@@ -15573,10 -16095,10 +16095,10 @@@ _ACEO
    VERSION_SUFFIX="$VERSION_SUFFIX-exp"
  fi
  
- { echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
- echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
@@@ -15608,40 -16130,44 +16130,44 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_socket_bind=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
- echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6; }
- if test $ac_cv_lib_socket_bind = yes; then
+ { $as_echo "$as_me:$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
    LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"
  fi
  
- { echo "$as_me:$LINENO: checking for library containing gethostent" >&5
- echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -15679,26 -16205,30 +16205,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_search_gethostent=$ac_res
  else
-   echo "$as_me: failed program was:" >&5
+   $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
@@@ -15713,8 -16243,8 +16243,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5
- echo "${ECHO_T}$ac_cv_search_gethostent" >&6; }
+ { $as_echo "$as_me:$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
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -15738,11 -16268,11 +16268,11 @@@ f
  
  for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -15795,45 -16325,52 +16325,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
  done
  
  
- 	{ echo "$as_me:$LINENO: checking for working mmap" >&5
- echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+ $as_echo_n "checking for working mmap... " >&6; }
  if test "${ac_cv_c_mmap_private+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  		if test "$cross_compiling" = yes; then
@@@ -15911,36 -16448,39 +16448,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_mmap_private=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_mmap_private" >&5
- echo "${ECHO_T}$ac_cv_c_mmap_private" >&6; }
+ { $as_echo "$as_me:$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
@@@ -15950,10 -16490,10 +16490,10 @@@ _ACEO
  fi
  rm -f conftest.mmap
  
- { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    while :; do
    cat >conftest.$ac_ext <<_ACEOF
@@@ -15979,26 -16519,30 +16519,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_sys_largefile_source=no; break
  else
-   echo "$as_me: failed program was:" >&5
+   $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
@@@ -16025,34 -16569,38 +16569,38 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_sys_largefile_source=1; break
  else
-   echo "$as_me: failed program was:" >&5
+   $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
    ac_cv_sys_largefile_source=unknown
    break
  done
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
+ { $as_echo "$as_me:$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) ;;
    *)
@@@ -16061,7 -16609,7 +16609,7 @@@ cat >>confdefs.h <<_ACEO
  _ACEOF
  ;;
  esac
- rm -f conftest*
+ rm -rf conftest*
  
  # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
  # in glibc 2.1.3, but that breaks too many other things.
@@@ -16084,13 -16632,13 +16632,13 @@@ f
  
  if test "$enable_mempool" = "yes"; then
  	if test "$ac_cv_c_mmap_private" != "yes"; then
- 		{ echo "$as_me:$LINENO: ****** mempool support disabled (mmap not available or not usable)" >&5
- echo "$as_me: ****** mempool support disabled (mmap not available or not usable)" >&6;}
+ 		{ $as_echo "$as_me:$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
- 		{ echo "$as_me:$LINENO: checking for getpagesize" >&5
- echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6; }
+ 		{ $as_echo "$as_me:$LINENO: checking for getpagesize" >&5
+ $as_echo_n "checking for getpagesize... " >&6; }
  if test "${ac_cv_func_getpagesize+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -16143,38 -16691,42 +16691,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_func_getpagesize=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_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
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_getpagesize" >&5
- echo "${ECHO_T}$ac_cv_func_getpagesize" >&6; }
- if test $ac_cv_func_getpagesize = yes; then
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpagesize" >&5
+ $as_echo "$ac_cv_func_getpagesize" >&6; }
+ if test "x$ac_cv_func_getpagesize" = x""yes; then
  
  
- 	{ echo "$as_me:$LINENO: checking for MAP_ANON(YMOUS)" >&5
- echo $ECHO_N "checking for MAP_ANON(YMOUS)... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  		ac_cv_c_mmap_anonymous='no'
@@@ -16199,20 -16751,21 +16751,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    ac_cv_c_mmap_anonymous='MAP_ANONYMOUS'
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -16242,27 -16795,31 +16795,31 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_c_mmap_anonymous='MAP_ANON'
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
@@@ -16272,8 -16829,8 +16829,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_mmap_anonymous" >&5
- echo "${ECHO_T}$ac_cv_c_mmap_anonymous" >&6; }
+ { $as_echo "$as_me:$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
  
  cat >>confdefs.h <<_ACEOF
@@@ -16283,8 -16840,8 +16840,8 @@@ _ACEO
  	fi
  
  			if test "$ac_cv_c_mmap_anonymous" = "no"; then
- 				{ echo "$as_me:$LINENO: ****** mempool support disabled (anonymous mmap not available)" >&5
- echo "$as_me: ****** mempool support disabled (anonymous mmap not available)" >&6;}
+ 				{ $as_echo "$as_me:$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
@@@ -16294,8 -16851,8 +16851,8 @@@ _ACEO
  			fi
  
  else
-   { echo "$as_me:$LINENO: ****** mempool support disabled (getpagesize not available)" >&5
- echo "$as_me: ****** mempool support disabled (getpagesize not available)" >&6;}
+   { $as_echo "$as_me:$LINENO: ****** mempool support disabled (getpagesize not available)" >&5
+ $as_echo "$as_me: ****** mempool support disabled (getpagesize not available)" >&6;}
  fi
  
  	fi
@@@ -16352,8 -16909,8 +16909,8 @@@ f
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
-   { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
- echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+ $as_echo_n "checking for ld used by GCC... " >&6; }
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
@@@ -16382,14 -16939,14 +16939,14 @@@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
-   { echo "$as_me:$LINENO: checking for GNU ld" >&5
- echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
  else
-   { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
- echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@@ -16416,19 -16973,19 +16973,19 @@@ f
  
  LD="$acl_cv_path_LD"
  if test -n "$LD"; then
-   { echo "$as_me:$LINENO: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ $as_echo "$LD" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ 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; }; }
- { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
- echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU ld's only accept -v.
  case `$LD -v 2>&1 </dev/null` in
@@@ -16438,17 -16995,17 +16995,17 @@@
    acl_cv_prog_gnu_ld=no ;;
  esac
  fi
- { echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
- echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+ $as_echo "$acl_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$acl_cv_prog_gnu_ld
  
  
  
  
-                                                 { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
- echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
+                                                 { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
      CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@@ -16458,8 -17015,8 +17015,8 @@@
      acl_cv_rpath=done
  
  fi
- { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
- echo "${ECHO_T}$acl_cv_rpath" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+ $as_echo "$acl_cv_rpath" >&6; }
    wl="$acl_cv_wl"
    acl_libext="$acl_cv_libext"
    acl_shlibext="$acl_cv_shlibext"
@@@ -16937,17 -17494,17 +17494,17 @@@ f
  
  		CPPFLAGS="$CPPFLAGS $INCCHECK"
  		if test "${ac_cv_header_check_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for check.h" >&5
- echo $ECHO_N "checking for check.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_check_h" >&5
- echo "${ECHO_T}$ac_cv_header_check_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking check.h usability" >&5
- echo $ECHO_N "checking check.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -16963,32 -17520,33 +17520,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking check.h presence" >&5
- echo $ECHO_N "checking check.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -17002,51 -17560,52 +17560,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: check.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: check.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: check.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: check.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: check.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: check.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: check.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: check.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: check.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: check.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -17055,18 -17614,18 +17614,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for check.h" >&5
- echo $ECHO_N "checking for check.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_check_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_check_h" >&5
- echo "${ECHO_T}$ac_cv_header_check_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_check_h" >&5
+ $as_echo "$ac_cv_header_check_h" >&6; }
  
  fi
- if test $ac_cv_header_check_h = yes; then
+ if test "x$ac_cv_header_check_h" = x""yes; then
    have_header=yes
  else
    have_header=no
@@@ -17079,8 -17638,8 +17638,8 @@@ f
  		if test "$have_header" = "yes"; then
  
  				LIBS="$LIBS $LIBCHECK"
- 				{ echo "$as_me:$LINENO: checking linking with check" >&5
- echo $ECHO_N "checking linking with check... $ECHO_C" >&6; }
+ 				{ $as_echo "$as_me:$LINENO: checking linking with check" >&5
+ $as_echo_n "checking linking with check... " >&6; }
  				cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -17102,32 -17661,36 +17661,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  					ac_cv_findlib_CHECK_libs="$LIBCHECK"
  					ac_cv_findlib_CHECK_ltlibs="$LTLIBCHECK"
  					ac_cv_findlib_CHECK_inc="$INCCHECK"
- 					{ echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+ 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
@@@ -17137,15 -17700,15 +17700,15 @@@ f
  		LIBS="$save_LIBS"
  	if test "X$ac_cv_findlib_CHECK_libs" = "X"; then
  
- 			{ echo "$as_me:$LINENO: unable to compile/link with check" >&5
- echo "$as_me: unable to compile/link with check" >&6;}
+ 			{ $as_echo "$as_me:$LINENO: unable to compile/link with check" >&5
+ $as_echo "$as_me: unable to compile/link with check" >&6;}
  			HAVE_LIBCHECK=no
  
  
  else
  
- 			{ echo "$as_me:$LINENO: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&5
- echo "$as_me: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&6;}
+ 			{ $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: 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
@@@ -17174,11 -17737,11 +17737,11 @@@ f
  
  
  if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
-     { { echo "$as_me:$LINENO: error:
+     { { $as_echo "$as_me:$LINENO: error:
  
  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
  " >&5
- echo "$as_me: error:
+ $as_echo "$as_me: error:
  
  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
  " >&2;}
@@@ -17195,13 -17758,13 +17758,13 @@@ f
  
  if test "x$enable_coverage" = "xyes"; then
  	if test "x$CHECK_LIBS" = "x"; then
- 		{ { echo "$as_me:$LINENO: error: Coverage testing required, but unit tests not enabled!" >&5
- echo "$as_me: error: Coverage testing required, but unit tests not enabled!" >&2;}
+ 		{ { $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; }; }
  	fi
  	if test "x$ac_compiler_gnu" != "xyes"; then
- 		{ { echo "$as_me:$LINENO: error: coverage testing only works if gcc is used" >&5
- echo "$as_me: error: coverage testing only works if gcc is used" >&2;}
+ 		{ { $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; }; }
  	fi
  
@@@ -17211,10 -17774,10 +17774,10 @@@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_GCOV+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$GCOV"; then
    ac_cv_prog_GCOV="$GCOV" # Let the user override the test.
@@@ -17227,7 -17790,7 +17790,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_GCOV="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -17238,11 -17801,11 +17801,11 @@@ f
  fi
  GCOV=$ac_cv_prog_GCOV
  if test -n "$GCOV"; then
-   { echo "$as_me:$LINENO: result: $GCOV" >&5
- echo "${ECHO_T}$GCOV" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $GCOV" >&5
+ $as_echo "$GCOV" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -17254,10 -17817,10 +17817,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_LCOV+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$LCOV"; then
    ac_cv_prog_LCOV="$LCOV" # Let the user override the test.
@@@ -17270,7 -17833,7 +17833,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_LCOV="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -17281,11 -17844,11 +17844,11 @@@ f
  fi
  LCOV=$ac_cv_prog_LCOV
  if test -n "$LCOV"; then
-   { echo "$as_me:$LINENO: result: $LCOV" >&5
- echo "${ECHO_T}$LCOV" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $LCOV" >&5
+ $as_echo "$LCOV" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -17297,10 -17860,10 +17860,10 @@@ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_GENHTML+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$GENHTML"; then
    ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test.
@@@ -17313,7 -17876,7 +17876,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_GENHTML="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -17324,11 -17887,11 +17887,11 @@@ f
  fi
  GENHTML=$ac_cv_prog_GENHTML
  if test -n "$GENHTML"; then
-   { echo "$as_me:$LINENO: result: $GENHTML" >&5
- echo "${ECHO_T}$GENHTML" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $GENHTML" >&5
+ $as_echo "$GENHTML" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -17349,17 -17912,17 +17912,17 @@@ f
  
  have_pthreads=no
  if test "${ac_cv_header_pthread_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking pthread.h usability" >&5
- echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -17375,32 -17938,33 +17938,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking pthread.h presence" >&5
- echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -17414,51 -17978,52 +17978,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -17467,25 -18032,25 +18032,25 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_pthread_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+ $as_echo "$ac_cv_header_pthread_h" >&6; }
  
  fi
- if test $ac_cv_header_pthread_h = yes; then
+ if test "x$ac_cv_header_pthread_h" = x""yes; then
    have_pthreads=yes
  fi
  
  
  
- { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
    enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@@ -17493,8 -18058,8 +18058,8 @@@ els
    USE_MAINTAINER_MODE=no
  fi
  
-   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
- echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+ $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
    MAINTAINER_MODE_FALSE='#'
@@@ -17506,16 -18071,16 +18071,16 @@@ f
    MAINT=$MAINTAINER_MODE_TRUE
  
  
- { echo "$as_me:$LINENO: checking for zlib installation" >&5
- echo $ECHO_N "checking for zlib installation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
    withval=$with_zlib;
  if test "$withval"; then
    ZLIB_HOME="$withval"
-   { echo "$as_me:$LINENO: result: using $ZLIB_HOME" >&5
- echo "${ECHO_T}using $ZLIB_HOME" >&6; }
+   { $as_echo "$as_me:$LINENO: result: using $ZLIB_HOME" >&5
+ $as_echo "using $ZLIB_HOME" >&6; }
  fi
  
  else
@@@ -17525,8 -18090,8 +18090,8 @@@ if test ! -f "$ZLIB_HOME/include/zlib.h
  then
    ZLIB_HOME=/usr
  fi
- { echo "$as_me:$LINENO: result: $ZLIB_HOME" >&5
- echo "${ECHO_T}$ZLIB_HOME" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ZLIB_HOME" >&5
+ $as_echo "$ZLIB_HOME" >&6; }
  
  fi
  
@@@ -17541,8 -18106,8 +18106,8 @@@ f
  
  if test ! -f "$ZLIB_HOME/include/zlib.h"
  then
-     { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
+     { { $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; }; }
  else
  
@@@ -17553,16 -18118,16 +18118,16 @@@
  
      if test -n "$vuln"; then
  	if test "$zlib_check" = "yes"; then
- 	    { { 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
- 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;}
+ 	    { { $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; }; }
  	else
- 	    { echo "$as_me:$LINENO: WARNING: ****** This ClamAV installation may be linked against" >&5
- echo "$as_me: WARNING: ****** This ClamAV installation may be linked against" >&2;}
- 	    { echo "$as_me:$LINENO: WARNING: ****** a broken zlib version. Please DO NOT report any" >&5
- echo "$as_me: WARNING: ****** a broken zlib version. Please DO NOT report any" >&2;}
- 	    { echo "$as_me:$LINENO: WARNING: ****** stability problems to the ClamAV developers!" >&5
- echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!" >&2;}
+ 	    { $as_echo "$as_me:$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: 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: WARNING: ****** stability problems to the ClamAV developers!" >&2;}
  	fi
      fi
  
@@@ -17571,10 -18136,10 +18136,10 @@@
  	save_LDFLAGS="$LDFLAGS"
  	save_LIBS="$LIBS"
  	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
- 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
- echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
@@@ -17606,49 -18171,53 +18171,53 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_z_inflateEnd=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
- echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }
- if test $ac_cv_lib_z_inflateEnd = yes; then
+ { $as_echo "$as_me:$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
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz";
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ZLIB_H 1
  _ACEOF
  
  else
-   { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
+   { { $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; }; }
  fi
  
  
- { echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
- echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
@@@ -17680,33 -18249,37 +18249,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_z_gzopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
- echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }
- if test $ac_cv_lib_z_gzopen = yes; then
+ { $as_echo "$as_me:$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
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
@@@ -17714,18 -18287,18 +18287,18 @@@
    LIBS="-lz $LIBS"
  
  else
-   { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5
- echo "$as_me: error: Your zlib is missing gzopen()" >&2;}
+   { { $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; }; }
  fi
  
  	LDFLAGS="$save_LDFLAGS"
  	LIBS="$save_LIBS"
      else
- 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
- echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
@@@ -17757,49 -18330,53 +18330,53 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_z_inflateEnd=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
- echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }
- if test $ac_cv_lib_z_inflateEnd = yes; then
+ { $as_echo "$as_me:$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
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz";
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ZLIB_H 1
  _ACEOF
  
  else
-   { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5
- echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}
+   { { $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; }; }
  fi
  
  
- { echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
- echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
@@@ -17831,33 -18408,37 +18408,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_z_gzopen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
- echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }
- if test $ac_cv_lib_z_gzopen = yes; then
+ { $as_echo "$as_me:$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
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
@@@ -17865,8 -18446,8 +18446,8 @@@
    LIBS="-lz $LIBS"
  
  else
-   { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5
- echo "$as_me: error: Your zlib is missing gzopen()" >&2;}
+   { { $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; }; }
  fi
  
@@@ -17888,10 -18469,10 +18469,10 @@@ the
  
  
  
-   { echo "$as_me:$LINENO: checking how to link with libbz2" >&5
- echo $ECHO_N "checking how to link with libbz2... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  
@@@ -18348,8 -18929,8 +18929,8 @@@ f
      ac_cv_libbz2_prefix="$LIBBZ2_PREFIX"
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_libbz2_libs" >&5
- echo "${ECHO_T}$ac_cv_libbz2_libs" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_libbz2_libs" >&5
+ $as_echo "$ac_cv_libbz2_libs" >&6; }
    LIBBZ2="$ac_cv_libbz2_libs"
    LTLIBBZ2="$ac_cv_libbz2_ltlibs"
    INCBZ2="$ac_cv_libbz2_cppflags"
@@@ -18385,13 -18966,13 +18966,13 @@@
  
  
      save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem";
+     LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
  
      have_bzprefix="no"
-     { echo "$as_me:$LINENO: checking for BZ2_bzReadOpen in -lbz2" >&5
- echo $ECHO_N "checking for BZ2_bzReadOpen in -lbz2... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbz2  $LIBS"
@@@ -18423,33 -19004,37 +19004,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_bz2_BZ2_bzReadOpen=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzReadOpen" >&5
- echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzReadOpen" >&6; }
- if test $ac_cv_lib_bz2_BZ2_bzReadOpen = yes; then
+ { $as_echo "$as_me:$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
    have_bzprefix="yes"
  fi
  
@@@ -18463,17 -19048,17 +19048,17 @@@ _ACEO
      LDFLAGS="$save_LDFLAGS"
      if test "$HAVE_LIBBZ2" = "yes"; then
  	if test "${ac_cv_header_bzlib_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for bzlib.h" >&5
- echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
- echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking bzlib.h usability" >&5
- echo $ECHO_N "checking bzlib.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -18489,32 -19074,33 +19074,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking bzlib.h presence" >&5
- echo $ECHO_N "checking bzlib.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -18528,51 -19114,52 +19114,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: bzlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: bzlib.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: bzlib.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: bzlib.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: bzlib.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: bzlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: bzlib.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bzlib.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: bzlib.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -18581,22 -19168,22 +19168,22 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for bzlib.h" >&5
- echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_bzlib_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
- echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_bzlib_h" >&5
+ $as_echo "$ac_cv_header_bzlib_h" >&6; }
  
  fi
- if test $ac_cv_header_bzlib_h = yes; then
-   { echo "$as_me:$LINENO: checking for CVE-2008-1372" >&5
- echo $ECHO_N "checking for CVE-2008-1372... $ECHO_C" >&6; }
+ if test "x$ac_cv_header_bzlib_h" = x""yes; then
+   { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  save_LIBS="$LIBS"
@@@ -18673,24 -19260,26 +19260,26 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_cve_2008_1372=ok
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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 )
@@@ -18702,6 -19291,7 +19291,7 @@@ 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
  fi
  
@@@ -18709,8 -19299,8 +19299,8 @@@
  LIBS="$save_LIBS"
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_c_cve_2008_1372" >&5
- echo "${ECHO_T}$ac_cv_c_cve_2008_1372" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_c_cve_2008_1372" >&5
+ $as_echo "$ac_cv_c_cve_2008_1372" >&6; }
  
  else
    ac_cv_c_cve_2008_1372="no"
@@@ -18718,22 -19308,22 +19308,22 @@@ f
  
  
  	if test "$ac_cv_c_cve_2008_1372" = "bugged"; then
- 		{ echo "$as_me:$LINENO: WARNING: ****** bzip2 libraries are affected by the CVE-2008-1372 bug" >&5
- echo "$as_me: WARNING: ****** bzip2 libraries are affected by the CVE-2008-1372 bug" >&2;}
- 		{ echo "$as_me:$LINENO: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5." >&5
- echo "$as_me: WARNING: ****** We strongly suggest you to update to bzip2 1.0.5." >&2;}
- 		{ echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
- echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
+ 		{ $as_echo "$as_me:$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: 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: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
  	fi
  	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then
- 						{ echo "$as_me:$LINENO: WARNING: ****** Unable to link bzip2 testcase" >&5
- echo "$as_me: WARNING: ****** Unable to link bzip2 testcase" >&2;}
- 		{ 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
- 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;}
- 		{ echo "$as_me:$LINENO: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&5
- echo "$as_me: WARNING: ****** It is recommended to fix your build environment so that we can run the testcase!" >&2;}
- 		{ echo "$as_me:$LINENO: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&5
- echo "$as_me: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
+ 						{ $as_echo "$as_me:$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: 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: 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: WARNING: ****** Please do not report stability problems to the ClamAV developers!" >&2;}
  	fi
  
  	case "$ac_cv_c_cve_2008_1372" in
@@@ -18746,14 -19336,14 +19336,14 @@@ _ACEO
  
  		;;
  	*)
- 		{ echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
- echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
+ 		{ $as_echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
+ $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
  		;;
  	esac
  
      else
- 	{ echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
- echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
+ 	{ $as_echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5
+ $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
      fi
  fi
  
@@@ -18783,14 -19373,14 +19373,14 @@@ f
  
  if test "$want_getaddrinfo" = "yes"
  then
-     { echo "$as_me:$LINENO: checking for getaddrinfo" >&5
- echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
-     if test "${have_gai+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+     { $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5
+ $as_echo_n "checking for getaddrinfo... " >&6; }
+     if test "${have_cv_gai+set}" = set; then
+   $as_echo_n "(cached) " >&6
  else
  
  		if test "$cross_compiling" = yes; then
-   have_gai=no
+   have_cv_gai=no
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -18822,29 -19412,32 +19412,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   have_gai=yes
+   have_cv_gai=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_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
  fi
  
@@@ -18852,9 -19445,9 +19445,9 @@@
  
  fi
  
-     { echo "$as_me:$LINENO: result: $have_gai" >&5
- echo "${ECHO_T}$have_gai" >&6; }
-     if test "$have_gai" = yes; then
+     { $as_echo "$as_me:$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
@@@ -18873,14 -19466,14 +19466,14 @@@ f
  
  if test "$want_ipv6" = "yes"
  then
-     { echo "$as_me:$LINENO: checking for IPv6 support" >&5
- echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6; }
-     if test "${have_ipv6+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+     { $as_echo "$as_me:$LINENO: checking for IPv6 support" >&5
+ $as_echo_n "checking for IPv6 support... " >&6; }
+     if test "${have_cv_ipv6+set}" = set; then
+   $as_echo_n "(cached) " >&6
  else
  
  		if test "$cross_compiling" = yes; then
-   have_ipv6=no
+   have_cv_ipv6=no
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -18917,29 -19510,32 +19510,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   have_ipv6=yes
+   have_cv_ipv6=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_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
  fi
  
@@@ -18947,9 -19543,9 +19543,9 @@@
  
  fi
  
-     { echo "$as_me:$LINENO: result: $have_ipv6" >&5
- echo "${ECHO_T}$have_ipv6" >&6; }
-     if test "$have_ipv6" = yes; then
+     { $as_echo "$as_me:$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
@@@ -18970,10 -19566,10 +19566,10 @@@ f
  
  if test $want_dns = yes; then
      ac_cv_have_lresolv=no
-     { echo "$as_me:$LINENO: checking for resolv.h" >&5
- echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6; }
+     { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -18995,20 -19591,21 +19591,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_resolv_h=no
@@@ -19016,14 -19613,14 +19613,14 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
- echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }
- if test $ac_cv_header_resolv_h = yes; then
+ { $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
  
- 	    { echo "$as_me:$LINENO: checking for dn_expand in std libs" >&5
- echo $ECHO_N "checking for dn_expand in std libs... $ECHO_C" >&6; }
+ 	    { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  	    	ac_cv_have_lresolv_std='no'
@@@ -19042,42 -19639,46 +19639,46 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  		    ac_cv_have_lresolv_std='yes'
  		    ac_cv_have_lresolv=''
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_std" >&5
- echo "${ECHO_T}$ac_cv_have_lresolv_std" >&6; }
+ { $as_echo "$as_me:$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
- 	    { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
- echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }
+ 	    { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  		ac_cv_have_lresolv_lresolv='yes'
@@@ -19096,35 -19697,39 +19697,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  		    ac_cv_have_lresolv_lresolv='yes'
  		    ac_cv_have_lresolv=' -lresolv'
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_lresolv" >&5
- echo "${ECHO_T}$ac_cv_have_lresolv_lresolv" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_lresolv" >&5
+ $as_echo "$ac_cv_have_lresolv_lresolv" >&6; }
  	    LIBS=$bklibs;
  	    fi
  
@@@ -19141,8 -19746,8 +19746,8 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
      else
- 	{ echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
- echo "$as_me: WARNING: ****** DNS support disabled" >&2;}
+ 	{ $as_echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
+ $as_echo "$as_me: WARNING: ****** DNS support disabled" >&2;}
      fi
  fi
  
@@@ -19157,14 -19762,14 +19762,14 @@@ f
  
  
  if test "$cross_compiling" = no; then
-  { echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
- echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
- echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
+   { { $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; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
@@@ -19191,36 -19796,39 +19796,39 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_setpgrp_void=no
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
- echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
+ { $as_echo "$as_me:$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
@@@ -19230,10 -19838,10 +19838,10 @@@ _ACEO
  fi
  
  else
-  { echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
- echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -19263,20 -19871,21 +19871,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_func_setpgrp_void=no
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_func_setpgrp_void=yes
@@@ -19284,8 -19893,8 +19893,8 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
- echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
+ { $as_echo "$as_me:$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
@@@ -19309,10 -19918,10 +19918,10 @@@ if test "${with_system_tommath+set}" = 
    withval=$with_system_tommath;
  	case "$withval" in
  	yes)
- 		{ echo "$as_me:$LINENO: checking for mp_mul_2d in -ltommath" >&5
- echo $ECHO_N "checking for mp_mul_2d in -ltommath... $ECHO_C" >&6; }
+ 		{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ltommath  $LIBS"
@@@ -19344,33 -19953,37 +19953,37 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_tommath_mp_mul_2d=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_tommath_mp_mul_2d" >&5
- echo "${ECHO_T}$ac_cv_lib_tommath_mp_mul_2d" >&6; }
- if test $ac_cv_lib_tommath_mp_mul_2d = yes; then
+ { $as_echo "$as_me:$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
  
  
  cat >>confdefs.h <<\_ACEOF
@@@ -19381,15 -19994,15 +19994,15 @@@ _ACEO
  				have_system_tommath=yes
  
  else
-   { echo "$as_me:$LINENO: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&5
- echo "$as_me: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&2;}
+   { $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: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&2;}
  
  fi
  
  	;;
  	no) ;;
- 	*) { { echo "$as_me:$LINENO: error: --with-system-tommath does not take an argument" >&5
- echo "$as_me: error: --with-system-tommath does not take an argument" >&2;}
+ 	*) { { $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; }; } ;;
  	esac
  
@@@ -19411,8 -20024,8 +20024,8 @@@ if test "${with_iconv+set}" = set; the
    withval=$with_iconv;
   case "$withval" in
  	 yes|no) wiconv="$withval";;
- 	 *) { { echo "$as_me:$LINENO: error: --with-iconv does not take an argument" >&5
- echo "$as_me: error: --with-iconv does not take an argument" >&2;}
+ 	 *) { { $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; }; };;
   esac
  else
@@@ -19420,10 -20033,10 +20033,10 @@@
  fi
  
  if test "X$wiconv" != "Xno"; then
- 	{ echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
- echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-liconv  $LIBS"
@@@ -19455,38 -20068,42 +20068,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_iconv_libiconv_open=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
- echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
- if test $ac_cv_lib_iconv_libiconv_open = yes; then
+ { $as_echo "$as_me:$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
    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"
  fi
  
- 	{ echo "$as_me:$LINENO: checking for iconv" >&5
- echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: checking for iconv" >&5
+ $as_echo_n "checking for iconv... " >&6; }
  	save_LIBS="$LIBS"
  	LIBS="$LIBCLAMAV_LIBS"
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -19519,21 -20136,24 +20136,24 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
-    { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ICONV 1
@@@ -19541,15 -20161,16 +20161,16 @@@ _ACEO
  
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
- 	{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ 	{ $as_echo "$as_me:$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
  	LIBS="$save_LIBS"
@@@ -19738,8 -20359,8 +20359,8 @@@ cat >>confdefs.h <<_ACEO
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking whether in_port_t is defined" >&5
- echo $ECHO_N "checking whether in_port_t is defined... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
@@@ -19764,20 -20385,21 +20385,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
  
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+     { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_IN_PORT_T 1
@@@ -19785,17 -20407,17 +20407,17 @@@ _ACEO
  
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- { echo "$as_me:$LINENO: checking for in_addr_t definition" >&5
- echo $ECHO_N "checking for in_addr_t definition... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
@@@ -19820,20 -20442,21 +20442,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
  
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+     { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_IN_ADDR_T 1
@@@ -19841,11 -20464,11 +20464,11 @@@ _ACEO
  
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@@ -20086,8 -20709,8 +20709,8 @@@ _ACEO
      use_gethostbyname_r="no"
      ;;
  bsd*)
-     { echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5
- echo "${ECHO_T}Unknown BSD detected. Disabling thread support." >&6; }
+     { $as_echo "$as_me:$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
@@@ -20097,8 -20720,8 +20720,8 @@@ _ACEO
      use_gethostbyname_r="no"
      ;;
  beos*)
-     { echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5
- echo "${ECHO_T}BeOS detected. Disabling thread support." >&6; }
+     { $as_echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5
+ $as_echo "BeOS detected. Disabling thread support." >&6; }
      have_pthreads="no"
  
  cat >>confdefs.h <<\_ACEOF
@@@ -20327,10 -20950,10 +20950,10 @@@ if test "$have_milter" = "yes"; the
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
      fi
      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
-     { echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
- echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmilter  $LIBS"
@@@ -20362,40 -20985,44 +20985,44 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_milter_mi_stop=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5
- echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6; }
- if test $ac_cv_lib_milter_mi_stop = yes; then
+ { $as_echo "$as_me:$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
    CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"
  else
  
- 		{ echo "$as_me:$LINENO: checking for library containing strlcpy" >&5
- echo $ECHO_N "checking for library containing strlcpy... $ECHO_C" >&6; }
+ 		{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
@@@ -20433,26 -21060,30 +21060,30 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_search_strlcpy=$ac_res
  else
-   echo "$as_me: failed program was:" >&5
+   $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
@@@ -20467,8 -21098,8 +21098,8 @@@ f
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_search_strlcpy" >&5
- echo "${ECHO_T}$ac_cv_search_strlcpy" >&6; }
+ { $as_echo "$as_me:$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
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@@ -20477,10 -21108,10 +21108,10 @@@ f
  
  	LIBS="$save_LIBS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"
  	$as_unset ac_cv_lib_milter_mi_stop
- 	{ echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
- echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmilter  $LIBS"
@@@ -20512,38 -21143,42 +21143,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    ac_cv_lib_milter_mi_stop=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	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
  LIBS=$ac_check_lib_save_LIBS
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5
- echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6; }
- if test $ac_cv_lib_milter_mi_stop = yes; then
+ { $as_echo "$as_me:$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
    CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
  else
  
- 	    { { echo "$as_me:$LINENO: error: Cannot find libmilter" >&5
- echo "$as_me: error: Cannot find libmilter" >&2;}
+ 	    { { $as_echo "$as_me:$LINENO: error: Cannot find libmilter" >&5
+ $as_echo "$as_me: error: Cannot find libmilter" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
@@@ -20555,20 -21190,21 +21190,21 @@@ f
  
  for ac_header in libmilter/mfapi.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ 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
-   { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ 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?
- { echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ { $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
@@@ -20584,32 -21220,33 +21220,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ { $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
@@@ -20623,51 -21260,52 +21260,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -20676,27 -21314,30 +21314,30 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
+ 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
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ as_val=`eval 'as_val=${'$as_ac_Header'}
+ 		 $as_echo "$as_val"'`
+    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
   have_milter="yes"
  else
  
- 	{ { echo "$as_me:$LINENO: error: Please install mfapi.h from the sendmail distribution" >&5
- echo "$as_me: error: Please install mfapi.h from the sendmail distribution" >&2;}
+ 	{ { $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; }; }
  
  fi
@@@ -20730,11 -21371,11 +21371,11 @@@ the
  
  for ac_func in sched_yield pthread_yield
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -20787,35 -21428,42 +21428,42 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
@@@ -20829,8 -21477,8 +21477,8 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking for gethostbyname_r" >&5
- echo $ECHO_N "checking for gethostbyname_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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.  */
@@@ -20863,20 -21511,21 +21511,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_gethostbyname_args=5
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -20915,20 -21564,21 +21564,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_gethostbyname_args=3
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -20970,20 -21620,21 +21620,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_gethostbyname_args=6
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -20999,11 -21650,11 +21650,11 @@@ f
  
  
  if test "$use_gethostbyname_r" = "no"; then
-     { echo "$as_me:$LINENO: result: support disabled" >&5
- echo "${ECHO_T}support disabled" >&6; }
+     { $as_echo "$as_me:$LINENO: result: support disabled" >&5
+ $as_echo "support disabled" >&6; }
  elif test -z "$ac_cv_gethostbyname_args"; then
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  else
      if test "$ac_cv_gethostbyname_args" = 3; then
  
@@@ -21024,13 -21675,13 +21675,13 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
      fi
-     { echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_gethostbyname_args arguments" >&5
- echo "${ECHO_T}yes, and it takes $ac_cv_gethostbyname_args arguments" >&6; }
+     { $as_echo "$as_me:$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
  
  
- { echo "$as_me:$LINENO: checking for readdir_r" >&5
- echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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.  */
@@@ -21060,20 -21711,21 +21711,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_readdir_args=2
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -21111,20 -21763,21 +21763,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_readdir_args=3
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -21142,11 -21795,11 +21795,11 @@@ f
  
  
  if test "$enable_readdir_r" = "no"; then
-     { echo "$as_me:$LINENO: result: support disabled" >&5
- echo "${ECHO_T}support disabled" >&6; }
+     { $as_echo "$as_me:$LINENO: result: support disabled" >&5
+ $as_echo "support disabled" >&6; }
  elif test -z "$ac_cv_readdir_args"; then
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  else
      if test "$ac_cv_readdir_args" = 2; then
  
@@@ -21161,12 -21814,12 +21814,12 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
      fi
-     { echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_readdir_args arguments" >&5
- echo "${ECHO_T}yes, and it takes $ac_cv_readdir_args arguments" >&6; }
+     { $as_echo "$as_me:$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
  
- { echo "$as_me:$LINENO: checking for ctime_r" >&5
- echo $ECHO_N "checking for ctime_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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.  */
@@@ -21195,13 -21848,14 +21848,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -21215,7 -21869,7 +21869,7 @@@ _ACEO
  
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -21230,14 -21884,14 +21884,14 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-     { echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_ctime_args arguments" >&5
- echo "${ECHO_T}yes, and it takes $ac_cv_ctime_args arguments" >&6; }
+     { $as_echo "$as_me:$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
  
- { echo "$as_me:$LINENO: checking for socklen_t" >&5
- echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+ $as_echo_n "checking for socklen_t... " >&6; }
  if test "${ac_cv_socklen_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
      ac_cv_socklen_t=no
@@@ -21268,13 -21922,14 +21922,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -21283,7 -21938,7 +21938,7 @@@
  	ac_cv_socklen_t=yes
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -21293,13 -21948,13 +21948,13 @@@ rm -f core conftest.err conftest.$ac_ob
  
  fi
  
- { echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
- echo "${ECHO_T}$ac_cv_socklen_t" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
+ $as_echo "$ac_cv_socklen_t" >&6; }
      if test $ac_cv_socklen_t = no; then
-     { echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5
- echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6; }
+     { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
  	ac_cv_socklen_t_equiv=int
@@@ -21331,13 -21986,14 +21986,14 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@@ -21347,7 -22003,7 +22003,7 @@@
  		break
  
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@@ -21358,8 -22014,8 +22014,8 @@@ rm -f core conftest.err conftest.$ac_ob
  
  fi
  
-     { echo "$as_me:$LINENO: result: $ac_cv_socklen_t_equiv" >&5
- echo "${ECHO_T}$ac_cv_socklen_t_equiv" >&6; }
+     { $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t_equiv" >&5
+ $as_echo "$ac_cv_socklen_t_equiv" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define socklen_t $ac_cv_socklen_t_equiv
@@@ -21371,24 -22027,24 +22027,24 @@@ if test "$test_clamav" = "yes
  then
          if test "$use_id" = "no"
      then
- 	{ echo "$as_me:$LINENO: checking for $clamav_user in /etc/passwd" >&5
- echo $ECHO_N "checking for $clamav_user in /etc/passwd... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
- 	{ echo "$as_me:$LINENO: checking for $clamav_user using id" >&5
- echo $ECHO_N "checking for $clamav_user using id... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_path_GETENT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    case $GETENT in
    [\\/]* | ?:[\\/]*)
@@@ -21403,7 -22059,7 +22059,7 @@@ d
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GETENT="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
@@@ -21415,11 -22071,11 +22071,11 @@@ esa
  fi
  GETENT=$ac_cv_path_GETENT
  if test -n "$GETENT"; then
-   { echo "$as_me:$LINENO: result: $GETENT" >&5
- echo "${ECHO_T}$GETENT" >&6; }
+   { $as_echo "$as_me:$LINENO: result: $GETENT" >&5
+ $as_echo "$GETENT" >&6; }
  else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
  
@@@ -21434,13 -22090,13 +22090,13 @@@
      if test "$use_netinfo" = "yes"
      then
  	if test -x /usr/bin/dscl; then
- 	    { echo "$as_me:$LINENO: checking for $clamav_user using dscl" >&5
- echo $ECHO_N "checking for $clamav_user using dscl... $ECHO_C" >&6; }
+ 	    { $as_echo "$as_me:$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
- 	    { echo "$as_me:$LINENO: checking for $clamav_user using netinfo" >&5
- echo $ECHO_N "checking for $clamav_user using netinfo... $ECHO_C" >&6; }
+ 	    { $as_echo "$as_me:$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}`
  	fi
@@@ -21448,22 -22104,22 +22104,22 @@@
  
      if test "$use_yp" = "yes"
      then
- 	{ echo "$as_me:$LINENO: checking for $clamav_user using ypmatch" >&5
- echo $ECHO_N "checking for $clamav_user using ypmatch... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$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`
      fi
  
      if test -z "$clamavuser" || test -z "$clamavgroup"
      then
- 	{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- 	{ { echo "$as_me:$LINENO: error: User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" >&5
- echo "$as_me: error: User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" >&2;}
+ 	{ $as_echo "$as_me:$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; }; }
      else
- 	{ echo "$as_me:$LINENO: result: yes, user $clamav_user and group $clamav_group" >&5
- echo "${ECHO_T}yes, user $clamav_user and group $clamav_group" >&6; }
+ 	{ $as_echo "$as_me:$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"
  
@@@ -21471,10 -22127,10 +22127,10 @@@
      fi
  fi
  
- { echo "$as_me:$LINENO: checking for structure packing via __attribute__((packed))" >&5
- echo $ECHO_N "checking for structure packing via __attribute__((packed))... $ECHO_C" >&6; }
- if test "${have_attrib_packed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$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
+   $as_echo_n "(cached) " >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21502,45 -22158,48 +22158,48 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-   have_attrib_packed=yes
+   have_cv_attrib_packed=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	have_attrib_packed=no
+ 	have_cv_attrib_packed=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
- { echo "$as_me:$LINENO: result: $have_attrib_packed" >&5
- echo "${ECHO_T}$have_attrib_packed" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $have_cv_attrib_packed" >&5
+ $as_echo "$have_cv_attrib_packed" >&6; }
  
- if test "$have_attrib_packed" = no; then
- 	{ echo "$as_me:$LINENO: checking for structure packing via pragma" >&5
- echo $ECHO_N "checking for structure packing via pragma... $ECHO_C" >&6; }
- 	if test "${have_pragma_pack+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "$have_cv_attrib_packed" = no; then
+ 	{ $as_echo "$as_me:$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
+   $as_echo_n "(cached) " >&6
  else
  
  		if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
+ $as_echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21560,29 -22219,32 +22219,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   have_pragma_pack=yes
+   have_cv_pragma_pack=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_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
  fi
  
@@@ -21590,27 -22252,29 +22252,29 @@@
  
  fi
  
- 	{ echo "$as_me:$LINENO: result: $have_pragma_pack" >&5
- echo "${ECHO_T}$have_pragma_pack" >&6; }
- 	if test "$have_pragma_pack" = yes; then
+ 	{ $as_echo "$as_me:$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
  
  	else
- 		{ echo "$as_me:$LINENO: checking for structure packing via hppa/hp-ux pragma" >&5
- echo $ECHO_N "checking for structure packing via hppa/hp-ux pragma... $ECHO_C" >&6; }
- 		if test "${have_pragma_pack_hpux+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ 		{ $as_echo "$as_me:$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
+   $as_echo_n "(cached) " >&6
  else
  
  			if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
+ $as_echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
+    { (exit 1); exit 1; }; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -21631,29 -22295,32 +22295,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-   have_pragma_pack_hpux=yes
+   have_cv_pragma_pack_hpux=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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_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
  fi
  
@@@ -21661,8 -22328,8 +22328,8 @@@
  
  fi
  
- 		{ echo "$as_me:$LINENO: result: $have_pragma_pack_hpux" >&5
- echo "${ECHO_T}$have_pragma_pack_hpux" >&6; }
+ 		{ $as_echo "$as_me:$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
@@@ -21671,10 -22338,10 +22338,10 @@@ _ACEO
  	fi
  fi
  
- { echo "$as_me:$LINENO: checking for type aligning via __attribute__((aligned))" >&5
- echo $ECHO_N "checking for type aligning via __attribute__((aligned))... $ECHO_C" >&6; }
- if test "${have_attrib_aligned+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$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
+   $as_echo_n "(cached) " >&6
  else
  
  	cat >conftest.$ac_ext <<_ACEOF
@@@ -21698,39 -22365,40 +22365,40 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-   have_attrib_aligned=yes
+   have_cv_attrib_aligned=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
- 	have_attrib_aligned=no
+ 	have_cv_attrib_aligned=no
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
- { echo "$as_me:$LINENO: result: $have_attrib_aligned" >&5
- echo "${ECHO_T}$have_attrib_aligned" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $have_cv_attrib_aligned" >&5
+ $as_echo "$have_cv_attrib_aligned" >&6; }
  
- if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then
- 	{ { echo "$as_me:$LINENO: error: Need to know how to pack structures with this compiler" >&5
- echo "$as_me: error: Need to know how to pack structures with this compiler" >&2;}
+ 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; }; }
  fi
  
- if test "$have_attrib_packed" = yes; then
+ if test "$have_cv_attrib_packed" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ATTRIB_PACKED 1
@@@ -21738,7 -22406,7 +22406,7 @@@ _ACEO
  
  fi
  
- if test "$have_attrib_aligned" = yes; then
+ if test "$have_cv_attrib_aligned" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ATTRIB_ALIGNED 1
@@@ -21746,8 -22414,8 +22414,8 @@@ _ACEO
  
  fi
  
- { echo "$as_me:$LINENO: checking for fd_set" >&5
- echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for fd_set" >&5
+ $as_echo_n "checking for fd_set... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -21769,8 -22437,8 +22437,8 @@@ cat >>confdefs.h <<\_ACEO
  #define HAVE_SYS_SELECT_H 1
  _ACEOF
  
- 	{ echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5
- echo "${ECHO_T}yes, found in sys/select.h" >&6; }
+ 	{ $as_echo "$as_me:$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.  */
@@@ -21797,20 -22465,21 +22465,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
    have_fd_set=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	have_fd_set=no
@@@ -21818,21 -22487,21 +22487,21 @@@ f
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  	if test "$have_fd_set" = yes; then
- 		{ echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5
- echo "${ECHO_T}yes, found in sys/types.h" >&6; }
+ 		{ $as_echo "$as_me:$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
  
- 		{ echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+ 		{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
  	fi
  fi
  
- { echo "$as_me:$LINENO: checking default FD_SETSIZE value" >&5
- echo $ECHO_N "checking default FD_SETSIZE value... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking default FD_SETSIZE value" >&5
+ $as_echo_n "checking default FD_SETSIZE value... " >&6; }
  if test "$cross_compiling" = yes; then
    DEFAULT_FD_SETSIZE=256
  else
@@@ -21874,43 -22543,46 +22543,46 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    DEFAULT_FD_SETSIZE=`cat conftestval`
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
- { echo "$as_me:$LINENO: result: $DEFAULT_FD_SETSIZE" >&5
- echo "${ECHO_T}$DEFAULT_FD_SETSIZE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DEFAULT_FD_SETSIZE" >&5
+ $as_echo "$DEFAULT_FD_SETSIZE" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define DEFAULT_FD_SETSIZE $DEFAULT_FD_SETSIZE
  _ACEOF
  
  
- { echo "$as_me:$LINENO: checking whether signed right shift is sign extended" >&5
- echo $ECHO_N "checking whether signed right shift is sign extended... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
    have_signed_rightshift_extended=no
  else
@@@ -21928,29 -22600,32 +22600,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    have_signed_rightshift_extended=yes
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
@@@ -21962,19 -22637,19 +22637,19 @@@ cat >>confdefs.h <<\_ACEO
  _ACEOF
  
  fi
- { echo "$as_me:$LINENO: result: $have_signed_rightshift_extended" >&5
- echo "${ECHO_T}$have_signed_rightshift_extended" >&6; };
+ { $as_echo "$as_me:$LINENO: result: $have_signed_rightshift_extended" >&5
+ $as_echo "$have_signed_rightshift_extended" >&6; };
  
  
  
  
  for ac_func in recvmsg sendmsg
  do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@@ -22027,44 -22702,51 +22702,51 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
    eval "$as_ac_var=yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $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 echo '${'$as_ac_var'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+ 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
    cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
  fi
  done
  
- { echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5
- echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
  
      cat >conftest.$ac_ext <<_ACEOF
@@@ -22104,20 -22786,21 +22786,21 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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_control_in_msghdr="yes"
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	 ac_cv_have_control_in_msghdr="no"
@@@ -22126,8 -22809,8 +22809,8 @@@ f
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5
- echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6; }
+ { $as_echo "$as_me:$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
@@@ -22135,8 -22818,8 +22818,8 @@@
  _ACEOF
  
  
-         { echo "$as_me:$LINENO: checking BSD 4.4 / RFC2292 style fd passing" >&5
- echo $ECHO_N "checking BSD 4.4 / RFC2292 style fd passing... $ECHO_C" >&6; }
+         { $as_echo "$as_me:$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
    enableval=$enable_fdpassing; want_fdpassing=$enableval
@@@ -22172,6 -22855,19 +22855,19 @@@ cat >>conftest.$ac_ext <<_ACEO
  #include <signal.h>
  #include <sys/socket.h>
  
+ #if !defined CMSG_SPACE || !defined CMSG_LEN
+ #ifndef ALIGN
+ #define ALIGN(len) len
+ #endif
+ 
+ #ifndef CMSG_SPACE
+ #define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len))
+ #endif
+ 
+ #ifndef CMSG_LEN
+ #define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len)
+ #endif
+ #endif
  
  #define TEST "test"
  
@@@ -22301,29 -22997,32 +22997,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    have_fdpass=1; fdpass_need_xopen=0
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
@@@ -22356,6 -23055,19 +23055,19 @@@ cat >>conftest.$ac_ext <<_ACEO
  #include <signal.h>
  #include <sys/socket.h>
  
+ #if !defined CMSG_SPACE || !defined CMSG_LEN
+ #ifndef ALIGN
+ #define ALIGN(len) len
+ #endif
+ 
+ #ifndef CMSG_SPACE
+ #define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len))
+ #endif
+ 
+ #ifndef CMSG_LEN
+ #define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len)
+ #endif
+ #endif
  
  #define TEST "test"
  
@@@ -22485,29 -23197,32 +23197,32 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
    (eval "$ac_try") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    have_fdpass=1; fdpass_need_xopen=1
  else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
+   $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
  fi
+ rm -rf conftest.dSYM
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
@@@ -22526,20 -23241,20 +23241,20 @@@ cat >>confdefs.h <<\_ACEO
  #define FDPASS_NEED_XOPEN 1
  _ACEOF
  
-                 { echo "$as_me:$LINENO: result: yes, by defining _XOPEN_SOURCE" >&5
- echo "${ECHO_T}yes, by defining _XOPEN_SOURCE" >&6; }
+                 { $as_echo "$as_me:$LINENO: result: yes, by defining _XOPEN_SOURCE" >&5
+ $as_echo "yes, by defining _XOPEN_SOURCE" >&6; }
              else
-                 { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+                 { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
              fi
          else
-             { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+             { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
          fi
  
      else
-         { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
+         { $as_echo "$as_me:$LINENO: result: disabled" >&5
+ $as_echo "disabled" >&6; }
      fi
  fi
  
@@@ -23017,17 -23732,17 +23732,17 @@@ f
  
  		CPPFLAGS="$CPPFLAGS $INCNCURSES"
  		if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
- echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking ncurses/ncurses.h usability" >&5
- echo $ECHO_N "checking ncurses/ncurses.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -23043,32 -23758,33 +23758,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking ncurses/ncurses.h presence" >&5
- echo $ECHO_N "checking ncurses/ncurses.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -23082,51 -23798,52 +23798,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -23135,18 -23852,18 +23852,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
- echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_ncurses_ncurses_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; }
+ { $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 $ac_cv_header_ncurses_ncurses_h = yes; then
+ if test "x$ac_cv_header_ncurses_ncurses_h" = x""yes; then
    have_header=yes
  else
    have_header=no
@@@ -23159,8 -23876,8 +23876,8 @@@ f
  		if test "$have_header" = "yes"; then
  
  				LIBS="$LIBS $LIBNCURSES"
- 				{ echo "$as_me:$LINENO: checking linking with ncurses" >&5
- echo $ECHO_N "checking linking with ncurses... $ECHO_C" >&6; }
+ 				{ $as_echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ $as_echo_n "checking linking with ncurses... " >&6; }
  				cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -23182,32 -23899,36 +23899,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  					ac_cv_findlib_NCURSES_libs="$LIBNCURSES"
  					ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
  					ac_cv_findlib_NCURSES_inc="$INCNCURSES"
- 					{ echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+ 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
@@@ -23217,15 -23938,15 +23938,15 @@@ f
  		LIBS="$save_LIBS"
  	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
  
- 			{ echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
- echo "$as_me: unable to compile/link with ncurses" >&6;}
+ 			{ $as_echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ $as_echo "$as_me: unable to compile/link with ncurses" >&6;}
  			HAVE_LIBNCURSES=no
  
  
  else
  
- 			{ echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
- echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
+ 			{ $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: 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
@@@ -23702,17 -24423,17 +24423,17 @@@ f
  
  		CPPFLAGS="$CPPFLAGS $INCNCURSES"
  		if test "${ac_cv_header_ncurses_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for ncurses.h" >&5
- echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking ncurses.h usability" >&5
- echo $ECHO_N "checking ncurses.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -23728,32 -24449,33 +24449,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking ncurses.h presence" >&5
- echo $ECHO_N "checking ncurses.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -23767,51 -24489,52 +24489,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: ncurses.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: ncurses.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: ncurses.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: ncurses.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: ncurses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: ncurses.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: ncurses.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: ncurses.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -23820,18 -24543,18 +24543,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for ncurses.h" >&5
- echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_ncurses_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
+ $as_echo "$ac_cv_header_ncurses_h" >&6; }
  
  fi
- if test $ac_cv_header_ncurses_h = yes; then
+ if test "x$ac_cv_header_ncurses_h" = x""yes; then
    have_header=yes
  else
    have_header=no
@@@ -23844,8 -24567,8 +24567,8 @@@ f
  		if test "$have_header" = "yes"; then
  
  				LIBS="$LIBS $LIBNCURSES"
- 				{ echo "$as_me:$LINENO: checking linking with ncurses" >&5
- echo $ECHO_N "checking linking with ncurses... $ECHO_C" >&6; }
+ 				{ $as_echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ $as_echo_n "checking linking with ncurses... " >&6; }
  				cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -23867,32 -24590,36 +24590,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  					ac_cv_findlib_NCURSES_libs="$LIBNCURSES"
  					ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
  					ac_cv_findlib_NCURSES_inc="$INCNCURSES"
- 					{ echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+ 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
@@@ -23902,15 -24629,15 +24629,15 @@@ f
  		LIBS="$save_LIBS"
  	if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
  
- 			{ echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
- echo "$as_me: unable to compile/link with ncurses" >&6;}
+ 			{ $as_echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ $as_echo "$as_me: unable to compile/link with ncurses" >&6;}
  			HAVE_LIBNCURSES=no
  
  
  else
  
- 			{ echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
- echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
+ 			{ $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: 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
@@@ -24387,17 -25114,17 +25114,17 @@@ f
  
  		CPPFLAGS="$CPPFLAGS $INCPDCURSES"
  		if test "${ac_cv_header_curses_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for curses.h" >&5
- echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
+   { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
- echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
+ { $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?
- { echo "$as_me:$LINENO: checking curses.h usability" >&5
- echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; }
+ { $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
@@@ -24413,32 -25140,33 +25140,33 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ $as_echo "$ac_header_compiler" >&6; }
  
  # Is the header present?
- { echo "$as_me:$LINENO: checking curses.h presence" >&5
- echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; }
+ { $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
@@@ -24452,51 -25180,52 +25180,52 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-   echo "$as_me: failed program was:" >&5
+   $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
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $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: )
-     { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
+     { $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:* )
-     { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
+     { $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/ ##
@@@ -24505,18 -25234,18 +25234,18 @@@ _ASBO
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
- { echo "$as_me:$LINENO: checking for curses.h" >&5
- echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
+ { $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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_cv_header_curses_h=$ac_header_preproc
  fi
- { echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
- echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
+ $as_echo "$ac_cv_header_curses_h" >&6; }
  
  fi
- if test $ac_cv_header_curses_h = yes; then
+ if test "x$ac_cv_header_curses_h" = x""yes; then
    have_header=yes
  else
    have_header=no
@@@ -24529,8 -25258,8 +25258,8 @@@ f
  		if test "$have_header" = "yes"; then
  
  				LIBS="$LIBS $LIBPDCURSES"
- 				{ echo "$as_me:$LINENO: checking linking with pdcurses" >&5
- echo $ECHO_N "checking linking with pdcurses... $ECHO_C" >&6; }
+ 				{ $as_echo "$as_me:$LINENO: checking linking with pdcurses" >&5
+ $as_echo_n "checking linking with pdcurses... " >&6; }
  				cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@@ -24552,32 -25281,36 +25281,36 @@@ case "(($ac_try" i
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 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
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
  
  					ac_cv_findlib_PDCURSES_libs="$LIBPDCURSES"
  					ac_cv_findlib_PDCURSES_ltlibs="$LTLIBPDCURSES"
  					ac_cv_findlib_PDCURSES_inc="$INCPDCURSES"
- 					{ echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6; }
+ 					{ $as_echo "$as_me:$LINENO: result: ok" >&5
+ $as_echo "ok" >&6; }
  
  else
-   echo "$as_me: failed program was:" >&5
+   $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
  
@@@ -24587,16 -25320,16 +25320,16 @@@ f
  		LIBS="$save_LIBS"
  	if test "X$ac_cv_findlib_PDCURSES_libs" = "X"; then
  
- 			{ echo "$as_me:$LINENO: unable to compile/link with pdcurses" >&5
- echo "$as_me: unable to compile/link with pdcurses" >&6;}
+ 			{ $as_echo "$as_me:$LINENO: unable to compile/link with pdcurses" >&5
+ $as_echo "$as_me: unable to compile/link with pdcurses" >&6;}
  			HAVE_LIBPDCURSES=no
- 			{ echo "$as_me:$LINENO: WARNING: ****** not building clamdtop: ncurses not found" >&5
- echo "$as_me: WARNING: ****** not building clamdtop: ncurses not found" >&2;}
+ 			{ $as_echo "$as_me:$LINENO: WARNING: ****** not building clamdtop: ncurses not found" >&5
+ $as_echo "$as_me: WARNING: ****** not building clamdtop: ncurses not found" >&2;}
  
  else
  
- 			{ echo "$as_me:$LINENO: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&5
- echo "$as_me: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&6;}
+ 			{ $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: 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
@@@ -24617,11 -25350,11 +25350,11 @@@ f
  fi
  
  if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
-     { { echo "$as_me:$LINENO: error:
+     { { $as_echo "$as_me:$LINENO: error:
  
  ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
  " >&5
- echo "$as_me: error:
+ $as_echo "$as_me: error:
  
  ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
  " >&2;}
@@@ -24675,11 -25408,12 +25408,12 @@@ _ACEO
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
-       *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
- echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
        *) $as_unset $ac_var ;;
        esac ;;
      esac
@@@ -24712,12 -25446,12 +25446,12 @@@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
-       { echo "$as_me:$LINENO: updating cache $cache_file" >&5
- echo "$as_me: updating cache $cache_file" >&6;}
+       { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
      cat confcache >$cache_file
    else
-     { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
- echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+     { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
  rm -f confcache
@@@ -24733,7 -25467,7 +25467,7 @@@ ac_ltlibobjs
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-   ac_i=`echo "$ac_i" | sed "$ac_script"`
+   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"
@@@ -24745,30 -25479,30 +25479,30 @@@ LTLIBOBJS=$ac_ltlibobj
  
  
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ $as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ $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; }; }
  fi
  if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
+ $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; }; }
  fi
  if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+ $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; }; }
  fi
@@@ -24789,83 -25523,85 +25523,85 @@@ LT_CONFIG_H=clamav-config.
      ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
  
  
+ 
  if test -z "${DISTCHECK_ENABLE_FLAGS_TRUE}" && test -z "${DISTCHECK_ENABLE_FLAGS_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
+ $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; }; }
  fi
  if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.
+ $as_echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
  if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHECK\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHECK\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"HAVE_LIBCHECK\" was never defined.
+ $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; }; }
  fi
  if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined.
+ $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; }; }
  fi
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+ $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; }; }
  fi
  if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UNRAR\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UNRAR\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_UNRAR\" was never defined.
+ $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; }; }
  fi
  if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"LINK_TOMMATH\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"LINK_TOMMATH\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"LINK_TOMMATH\" was never defined.
+ $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; }; }
  fi
  if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"BUILD_CLAMD\" was never defined.
+ $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; }; }
  fi
  if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HAVE_MILTER\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_MILTER\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"HAVE_MILTER\" was never defined.
+ $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; }; }
  fi
  if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HAVE_CURSES\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CURSES\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"HAVE_CURSES\" was never defined.
+ $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; }; }
  fi
  
  : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
+ { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
@@@ -24878,7 -25614,7 +25614,7 @@@ ac_cs_silent=fals
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@@ -24888,7 -25624,7 +25624,7 @@@ DUALCASE=1; export DUALCASE # for MKS s
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # 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
@@@ -24910,17 -25646,45 +25646,45 @@@ as_cr_Letters=$as_cr_letters$as_cr_LETT
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-   echo "#! /bin/sh" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
+ as_nl='
+ '
+ export as_nl
+ # Printing a long string crashes Solaris 7 /usr/bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+     as_echo_n='/usr/ucb/echo -n'
    else
-     PATH_SEPARATOR=:
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+       case $arg in
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+       esac;
+       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+     '
+     export as_echo_n_body
+     as_echo_n='sh -c $as_echo_n_body as_echo'
    fi
-   rm -f conf$$.sh
+   export as_echo_body
+   as_echo='sh -c $as_echo_body as_echo'
+ fi
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   PATH_SEPARATOR=:
+   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+       PATH_SEPARATOR=';'
+   }
  fi
  
  # Support unset when possible.
@@@ -24936,8 -25700,6 +25700,6 @@@ f
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
- as_nl='
- '
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@@ -24960,7 -25722,7 +25722,7 @@@ if test "x$as_myself" = x; the
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
-   echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    { (exit 1); exit 1; }
  fi
  
@@@ -24973,17 -25735,10 +25735,10 @@@ PS2='> 
  PS4='+ '
  
  # NLS nuisances.
- for as_var in \
-   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
+ LC_ALL=C
+ export LC_ALL
+ LANGUAGE=C
+ export LANGUAGE
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
@@@ -25005,7 -25760,7 +25760,7 @@@ as_me=`$as_basename -- "$0" |
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
+ $as_echo X/"$0" |
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
@@@ -25056,7 -25811,7 +25811,7 @@@ $as_unset CDPAT
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+     { $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
@@@ -25084,7 -25839,6 +25839,6 @@@ case `echo -n x` i
  *)
    ECHO_N='-n';;
  esac
- 
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
@@@ -25097,19 -25851,22 +25851,22 @@@ if test -d conf$$.dir; the
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
-   mkdir conf$$.dir
- fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s='ln -s'
-   # ... but there are two gotchas:
-   # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-   # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-   # In both cases, we have to default to `cp -p'.
-   ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+   mkdir conf$$.dir 2>/dev/null
+ fi
+ if (echo >conf$$.file) 2>/dev/null; then
+   if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+     # In both cases, we have to default to `cp -p'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+       as_ln_s='cp -p'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
      as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
+   fi
  else
    as_ln_s='cp -p'
  fi
@@@ -25134,10 -25891,10 +25891,10 @@@ els
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
-         test -d "$1/.";
+ 	test -d "$1/.";
        else
  	case $1 in
-         -*)set "./$1";;
+ 	-*)set "./$1";;
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
@@@ -25160,7 -25917,7 +25917,7 @@@ exec 6>&
  # values after options handling.
  ac_log="
  This file was extended by clamav $as_me devel, which was
- generated by GNU Autoconf 2.61.  Invocation command line was
+ generated by GNU Autoconf 2.63.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -25173,7 -25930,16 +25930,16 @@@ on `(hostname || uname -n) 2>/dev/null 
  
  _ACEOF
  
- cat >>$CONFIG_STATUS <<_ACEOF
+ case $ac_config_files in *"
+ "*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
+ 
+ case $ac_config_headers in *"
+ "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+ esac
+ 
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  # Files that config.status was made for.
  config_files="$ac_config_files"
  config_headers="$ac_config_headers"
@@@ -25181,22 -25947,23 +25947,23 @@@ config_commands="$ac_config_commands
  
  _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
- Usage: $0 [OPTIONS] [FILE]...
+ Usage: $0 [OPTION]... [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-   -q, --quiet      do not print progress messages
+   -q, --quiet, --silent
+                    do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
- 		   instantiate the configuration file FILE
-   --header=FILE[:TEMPLATE]
- 		   instantiate the configuration header FILE
+       --file=FILE[:TEMPLATE]
+                    instantiate the configuration file FILE
+       --header=FILE[:TEMPLATE]
+                    instantiate the configuration header FILE
  
  Configuration files:
  $config_files
@@@ -25210,13 -25977,13 +25977,13 @@@ $config_command
  Report bugs to <bug-autoconf at gnu.org>."
  
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  clamav config.status devel
- configured by $0, generated by GNU Autoconf 2.61,
-   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ configured by $0, generated by GNU Autoconf 2.63,
+   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2008 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
@@@ -25224,11 -25991,12 +25991,12 @@@ ac_pwd='$ac_pwd
  srcdir='$srcdir'
  INSTALL='$INSTALL'
  MKDIR_P='$MKDIR_P'
+ AWK='$AWK'
+ test -n "\$AWK" || AWK=awk
  _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
- # If no file are specified by the user, then we need to provide default
- # value.  By we need to know if files were specified by the user.
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # The default lists apply if the user does not specify any file.
  ac_need_defaults=:
  while test $# != 0
  do
@@@ -25250,30 -26018,36 +26018,36 @@@
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;
+     $as_echo "$ac_cs_version"; exit ;;
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
      ac_need_defaults=false;;
    --header | --heade | --head | --hea )
      $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
      ac_need_defaults=false;;
    --he | --h)
      # Conflict between --help and --header
-     { echo "$as_me: error: ambiguous option: $1
+     { $as_echo "$as_me: error: ambiguous option: $1
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; };;
    --help | --hel | -h )
-     echo "$ac_cs_usage"; exit ;;
+     $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
  
    # This is an error.
-   -*) { echo "$as_me: error: unrecognized option: $1
+   -*) { $as_echo "$as_me: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
  
@@@ -25292,27 -26066,29 +26066,29 @@@ if $ac_cs_silent; the
  fi
  
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  if \$ac_cs_recheck; then
-   echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-   CONFIG_SHELL=$SHELL
+   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   shift
+   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+   CONFIG_SHELL='$SHELL'
    export CONFIG_SHELL
-   exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   exec "\$@"
  fi
  
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  exec 5>>config.log
  {
    echo
    sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
  ## Running $as_me. ##
  _ASBOX
-   echo "$ac_log"
+   $as_echo "$ac_log"
  } >&5
  
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  #
  # INIT-COMMANDS
  #
@@@ -25575,7 -26351,7 +26351,7 @@@ f
  
  _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  
  # Handling of arguments.
  for ac_config_target in $ac_config_targets
@@@ -25614,8 -26390,8 +26390,8 @@@ d
      "docs/man/sigtool.1") CONFIG_FILES="$CONFIG_FILES docs/man/sigtool.1" ;;
      "docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
  
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   *) { { $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; }; };;
    esac
  done
@@@ -25656,280 -26432,144 +26432,144 @@@ $debug |
    (umask 077 && mkdir "$tmp")
  } ||
  {
-    echo "$me: cannot create a temporary directory in ." >&2
+    $as_echo "$as_me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
  
- #
- # Set up the sed scripts for CONFIG_FILES section.
- #
- 
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+ # This happens for instance with `./config.status config.h'.
  if test -n "$CONFIG_FILES"; then
  
- _ACEOF
- 
- 
- 
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
- SHELL!$SHELL$ac_delim
- PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
- PACKAGE_NAME!$PACKAGE_NAME$ac_delim
- PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
- PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
- PACKAGE_STRING!$PACKAGE_STRING$ac_delim
- PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
- exec_prefix!$exec_prefix$ac_delim
- prefix!$prefix$ac_delim
- program_transform_name!$program_transform_name$ac_delim
- bindir!$bindir$ac_delim
- sbindir!$sbindir$ac_delim
- libexecdir!$libexecdir$ac_delim
- datarootdir!$datarootdir$ac_delim
- datadir!$datadir$ac_delim
- sysconfdir!$sysconfdir$ac_delim
- sharedstatedir!$sharedstatedir$ac_delim
- localstatedir!$localstatedir$ac_delim
- includedir!$includedir$ac_delim
- oldincludedir!$oldincludedir$ac_delim
- docdir!$docdir$ac_delim
- infodir!$infodir$ac_delim
- htmldir!$htmldir$ac_delim
- dvidir!$dvidir$ac_delim
- pdfdir!$pdfdir$ac_delim
- psdir!$psdir$ac_delim
- libdir!$libdir$ac_delim
- localedir!$localedir$ac_delim
- mandir!$mandir$ac_delim
- DEFS!$DEFS$ac_delim
- ECHO_C!$ECHO_C$ac_delim
- ECHO_N!$ECHO_N$ac_delim
- ECHO_T!$ECHO_T$ac_delim
- LIBS!$LIBS$ac_delim
- build_alias!$build_alias$ac_delim
- host_alias!$host_alias$ac_delim
- target_alias!$target_alias$ac_delim
- build!$build$ac_delim
- build_cpu!$build_cpu$ac_delim
- build_vendor!$build_vendor$ac_delim
- build_os!$build_os$ac_delim
- host!$host$ac_delim
- host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
- target!$target$ac_delim
- target_cpu!$target_cpu$ac_delim
- target_vendor!$target_vendor$ac_delim
- target_os!$target_os$ac_delim
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
- am__isrc!$am__isrc$ac_delim
- CYGPATH_W!$CYGPATH_W$ac_delim
- PACKAGE!$PACKAGE$ac_delim
- VERSION!$VERSION$ac_delim
- ACLOCAL!$ACLOCAL$ac_delim
- AUTOCONF!$AUTOCONF$ac_delim
- AUTOMAKE!$AUTOMAKE$ac_delim
- AUTOHEADER!$AUTOHEADER$ac_delim
- MAKEINFO!$MAKEINFO$ac_delim
- install_sh!$install_sh$ac_delim
- STRIP!$STRIP$ac_delim
- INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
- mkdir_p!$mkdir_p$ac_delim
- AWK!$AWK$ac_delim
- SET_MAKE!$SET_MAKE$ac_delim
- am__leading_dot!$am__leading_dot$ac_delim
- AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
- LIBCLAMAV_VERSION!$LIBCLAMAV_VERSION$ac_delim
- LN_S!$LN_S$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
- CPPFLAGS!$CPPFLAGS$ac_delim
- ac_ct_CC!$ac_ct_CC$ac_delim
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
- DEPDIR!$DEPDIR$ac_delim
- am__include!$am__include$ac_delim
- am__quote!$am__quote$ac_delim
- AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- AMDEP_FALSE!$AMDEP_FALSE$ac_delim
- AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
- CCDEPMODE!$CCDEPMODE$ac_delim
- am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
- am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
- SED!$SED$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- FGREP!$FGREP$ac_delim
- LD!$LD$ac_delim
- DUMPBIN!$DUMPBIN$ac_delim
- ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
- done
  
- ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- if test -n "$ac_eof"; then
-   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-   ac_eof=`expr $ac_eof + 1`
+ ac_cr=`echo X | tr X '\015'`
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+   ac_cs_awk_cr='\\r'
+ else
+   ac_cs_awk_cr=$ac_cr
  fi
  
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- _ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
- s/^/s,@/; s/!/@,|#_!!_#|/
- :n
- t n
- s/'"$ac_delim"'$/,g/; t
- s/$/\\/; p
- N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
- CEOF$ac_eof
+ echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
  
  
+ {
+   echo "cat >conf$$subs.awk <<_ACEOF" &&
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+   { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
- NM!$NM$ac_delim
- OBJDUMP!$OBJDUMP$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
- lt_ECHO!$lt_ECHO$ac_delim
- DSYMUTIL!$DSYMUTIL$ac_delim
- NMEDIT!$NMEDIT$ac_delim
- LIPO!$LIPO$ac_delim
- OTOOL!$OTOOL$ac_delim
- OTOOL64!$OTOOL64$ac_delim
- CPP!$CPP$ac_delim
- LIBLTDL!$LIBLTDL$ac_delim
- LTDLDEPS!$LTDLDEPS$ac_delim
- LTDLINCL!$LTDLINCL$ac_delim
- INCLTDL!$INCLTDL$ac_delim
- LT_DLLOADERS!$LT_DLLOADERS$ac_delim
- LIBADD_DLOPEN!$LIBADD_DLOPEN$ac_delim
- LIBADD_SHL_LOAD!$LIBADD_SHL_LOAD$ac_delim
- LIBADD_DLD_LINK!$LIBADD_DLD_LINK$ac_delim
- LT_DLPREOPEN!$LT_DLPREOPEN$ac_delim
- LIBADD_DL!$LIBADD_DL$ac_delim
- sys_symbol_underscore!$sys_symbol_underscore$ac_delim
- ARGZ_H!$ARGZ_H$ac_delim
- INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
- INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
- CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
- CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
- LT_CONFIG_H!$LT_CONFIG_H$ac_delim
- LTDLOPEN!$LTDLOPEN$ac_delim
- DISTCHECK_ENABLE_FLAGS_TRUE!$DISTCHECK_ENABLE_FLAGS_TRUE$ac_delim
- DISTCHECK_ENABLE_FLAGS_FALSE!$DISTCHECK_ENABLE_FLAGS_FALSE$ac_delim
- VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim
- VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim
- VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim
- GPERF!$GPERF$ac_delim
- CHECK_CPPFLAGS!$CHECK_CPPFLAGS$ac_delim
- CHECK_LIBS!$CHECK_LIBS$ac_delim
- HAVE_LIBCHECK_TRUE!$HAVE_LIBCHECK_TRUE$ac_delim
- HAVE_LIBCHECK_FALSE!$HAVE_LIBCHECK_FALSE$ac_delim
- GCOV!$GCOV$ac_delim
- LCOV!$LCOV$ac_delim
- GENHTML!$GENHTML$ac_delim
- ENABLE_COVERAGE_TRUE!$ENABLE_COVERAGE_TRUE$ac_delim
- ENABLE_COVERAGE_FALSE!$ENABLE_COVERAGE_FALSE$ac_delim
- MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
- MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
- MAINT!$MAINT$ac_delim
- LIBBZ2!$LIBBZ2$ac_delim
- LTLIBBZ2!$LTLIBBZ2$ac_delim
- LIBBZ2_PREFIX!$LIBBZ2_PREFIX$ac_delim
- ENABLE_UNRAR_TRUE!$ENABLE_UNRAR_TRUE$ac_delim
- ENABLE_UNRAR_FALSE!$ENABLE_UNRAR_FALSE$ac_delim
- LINK_TOMMATH_TRUE!$LINK_TOMMATH_TRUE$ac_delim
- LINK_TOMMATH_FALSE!$LINK_TOMMATH_FALSE$ac_delim
- DBDIR!$DBDIR$ac_delim
- CFGDIR!$CFGDIR$ac_delim
- LIBCLAMAV_LIBS!$LIBCLAMAV_LIBS$ac_delim
- CLAMD_LIBS!$CLAMD_LIBS$ac_delim
- CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim
- FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim
- TH_SAFE!$TH_SAFE$ac_delim
- THREAD_LIBS!$THREAD_LIBS$ac_delim
- BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim
- BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim
- HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim
- HAVE_MILTER_FALSE!$HAVE_MILTER_FALSE$ac_delim
- GETENT!$GETENT$ac_delim
- CLAMAVUSER!$CLAMAVUSER$ac_delim
- CLAMAVGROUP!$CLAMAVGROUP$ac_delim
- CURSES_CPPFLAGS!$CURSES_CPPFLAGS$ac_delim
- CURSES_LIBS!$CURSES_LIBS$ac_delim
- HAVE_CURSES_TRUE!$HAVE_CURSES_TRUE$ac_delim
- HAVE_CURSES_FALSE!$HAVE_CURSES_FALSE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- ltdl_LIBOBJS!$ltdl_LIBOBJS$ac_delim
- ltdl_LTLIBOBJS!$ltdl_LTLIBOBJS$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+   . ./conf$$subs.sh ||
+     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
- echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+     { { $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; }; }
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
  done
+ rm -f conf$$subs.sh
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+ s/^/S["/; s/!.*/"]=/
+ p
+ g
+ s/^[^!]*!//
+ :repl
+ t repl
+ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+ s/\(.\{148\}\).*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+ n
+ b repl
+ :more1
+ s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+ p
+ g
+ s/.\{148\}//
+ t nl
+ :delim
+ h
+ s/\(.\{148\}\).*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+ b
+ :more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+ p
+ g
+ s/.\{148\}//
+ t delim
+ ' <conf$$subs.awk | sed '
+ /^[^""]/{
+   N
+   s/\n//
+ }
+ ' >>$CONFIG_STATUS || ac_write_fail=1
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+ cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+   for (key in S) S_is_set[key] = 1
+   FS = ""
  
- ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
- if test -n "$ac_eof"; then
-   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-   ac_eof=`expr $ac_eof + 1`
- fi
+ }
+ {
+   line = $ 0
+   nfields = split(line, field, "@")
+   substed = 0
+   len = length(field[1])
+   for (i = 2; i < nfields; i++) {
+     key = field[i]
+     keylen = length(key)
+     if (S_is_set[key]) {
+       value = S[key]
+       line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+       len += length(value) + length(field[++i])
+       substed = 1
+     } else
+       len += 1 + keylen
+   }
  
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+   print line
+ }
+ 
+ _ACAWK
  _ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
- s/^/s,@/; s/!/@,|#_!!_#|/
- :n
- t n
- s/'"$ac_delim"'$/,g/; t
- s/$/\\/; p
- N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
- :end
- s/|#_!!_#|//g
- CEOF$ac_eof
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+   cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+   || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+ $as_echo "$as_me: error: could not setup config files machinery" >&2;}
+    { (exit 1); exit 1; }; }
  _ACEOF
  
- 
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
@@@ -25945,19 -26585,133 +26585,133 @@@ s/^[^=]*=[	 ]*$/
  }'
  fi
  
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  fi # test -n "$CONFIG_FILES"
  
+ # Set up the scripts for CONFIG_HEADERS section.
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+ cat >"$tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+ 
+ # Transform confdefs.h into an awk script `defines.awk', embedded as
+ # here-document in config.status, that substitutes the proper values into
+ # config.h.in to produce config.h.
+ 
+ # Create a delimiter string that does not exist in confdefs.h, to ease
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+   ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+   if test -z "$ac_t"; then
+     break
+   elif $ac_last_try; then
+     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+ $as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+ done
+ 
+ # For the awk script, D is an array of macro values keyed by name,
+ # likewise P contains macro parameters if any.  Preserve backslash
+ # newline sequences.
+ 
+ ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+ sed -n '
+ s/.\{148\}/&'"$ac_delim"'/g
+ t rset
+ :rset
+ s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+ t def
+ d
+ :def
+ s/\\$//
+ t bsnl
+ s/["\\]/\\&/g
+ s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+ D["\1"]=" \3"/p
+ s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+ d
+ :bsnl
+ s/["\\]/\\&/g
+ s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+ D["\1"]=" \3\\\\\\n"\\/p
+ t cont
+ s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+ t cont
+ d
+ :cont
+ n
+ s/.\{148\}/&'"$ac_delim"'/g
+ t clear
+ :clear
+ s/\\$//
+ t bsnlc
+ s/["\\]/\\&/g; s/^/"/; s/$/"/p
+ d
+ :bsnlc
+ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+ b cont
+ ' <confdefs.h | sed '
+ s/'"$ac_delim"'/"\\\
+ "/g' >>$CONFIG_STATUS || ac_write_fail=1
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+   for (key in D) D_is_set[key] = 1
+   FS = ""
+ }
+ /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+   line = \$ 0
+   split(line, arg, " ")
+   if (arg[1] == "#") {
+     defundef = arg[2]
+     mac1 = arg[3]
+   } else {
+     defundef = substr(arg[1], 2)
+     mac1 = arg[2]
+   }
+   split(mac1, mac2, "(") #)
+   macro = mac2[1]
+   prefix = substr(line, 1, index(line, defundef) - 1)
+   if (D_is_set[macro]) {
+     # Preserve the white space surrounding the "#".
+     print prefix "define", macro P[macro] D[macro]
+     next
+   } else {
+     # Replace #undef with comments.  This is necessary, for example,
+     # in the case of _POSIX_SOURCE, which is predefined and required
+     # on some systems where configure will not decide to define it.
+     if (defundef == "undef") {
+       print "/*", prefix defundef, macro, "*/"
+       next
+     }
+   }
+ }
+ { print }
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+   { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+ $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+    { (exit 1); exit 1; }; }
+ fi # test -n "$CONFIG_HEADERS"
+ 
  
- for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+ eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+ shift
+ for ac_tag
  do
    case $ac_tag in
    :[FHLC]) ac_mode=$ac_tag; continue;;
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
-   :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
- echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   :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; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@@ -25986,26 -26740,38 +26740,38 @@@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
- 	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
- echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ 	   { { $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; }; };;
        esac
-       ac_file_inputs="$ac_file_inputs $ac_f"
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       ac_file_inputs="$ac_file_inputs '$ac_f'"
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
      # use $as_me), people would be surprised to read:
      #    /* config.h.  Generated by config.status.  */
-     configure_input="Generated from "`IFS=:
- 	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+     configure_input='Generated from '`
+ 	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ 	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
-       { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
+       { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ $as_echo "$as_me: creating $ac_file" >&6;}
      fi
+     # Neutralize special characters interpreted by sed in replacement strings.
+     case $configure_input in #(
+     *\&* | *\|* | *\\* )
+        ac_sed_conf_input=`$as_echo "$configure_input" |
+        sed 's/[\\\\&|]/\\\\&/g'`;; #(
+     *) ac_sed_conf_input=$configure_input;;
+     esac
  
      case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin";;
+     *:-:* | *:-) 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; }; } ;;
      esac
      ;;
    esac
@@@ -26015,7 -26781,7 +26781,7 @@@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  	 X"$ac_file" : 'X\(//\)$' \| \
  	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
+ $as_echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26041,7 -26807,7 +26807,7 @@@
      as_dirs=
      while :; do
        case $as_dir in #(
-       *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
@@@ -26050,7 -26816,7 +26816,7 @@@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
+ $as_echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26071,17 -26837,17 +26837,17 @@@
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
-   } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   } || 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; }; }; }
    ac_builddir=.
  
  case "$ac_dir" in
  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
  *)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
    # A ".." for each directory in $ac_dir_suffix.
-   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@@ -26126,12 -26892,13 +26892,13 @@@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir
    esac
  _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  # 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=
  
- case `sed -n '/datarootdir/ {
+ ac_sed_dataroot='
+ /datarootdir/ {
    p
    q
  }
@@@ -26140,13 -26907,14 +26907,14 @@@
  /@infodir@/p
  /@localedir@/p
  /@mandir@/p
- ' $ac_file_inputs` in
+ '
+ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-   { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
- echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+   { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    ac_datarootdir_hack='
    s&@datadir@&$datadir&g
    s&@docdir@&$docdir&g
@@@ -26160,15 -26928,16 +26928,16 @@@ _ACEO
  # Neutralize VPATH when `$srcdir' = `.'.
  # Shell code in configure.ac might set extrasub.
  # FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_sed_extra="$ac_vpsub
  $extrasub
  _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- s&@configure_input@&$configure_input&;t t
+ s|@configure_input@|$ac_sed_conf_input|;t t
  s&@top_builddir@&$ac_top_builddir_sub&;t t
+ s&@top_build_prefix@&$ac_top_build_prefix&;t t
  s&@srcdir@&$ac_srcdir&;t t
  s&@abs_srcdir@&$ac_abs_srcdir&;t t
  s&@top_srcdir@&$ac_top_srcdir&;t t
@@@ -26179,121 -26948,60 +26948,60 @@@ s&@abs_top_builddir@&$ac_abs_top_buildd
  s&@INSTALL@&$ac_INSTALL&;t t
  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  $ac_datarootdir_hack
- " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+ "
+ 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; }; }
  
  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"; } &&
-   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+   { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&5
- echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ $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;}
  
    rm -f "$tmp/stdin"
    case $ac_file in
-   -) cat "$tmp/out"; rm -f "$tmp/out";;
-   *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac
+   -) 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; }; }
   ;;
    :H)
    #
    # CONFIG_HEADER
    #
- _ACEOF
- 
- # Transform confdefs.h into a sed script `conftest.defines', that
- # substitutes the proper values into config.h.in to produce config.h.
- rm -f conftest.defines conftest.tail
- # First, append a space to every undef/define line, to ease matching.
- echo 's/$/ /' >conftest.defines
- # Then, protect against being on the right side of a sed subst, or in
- # an unquoted here document, in config.status.  If some macros were
- # called several times there might be several #defines for the same
- # symbol, which is useless.  But do not sort them, since the last
- # AC_DEFINE must be honored.
- ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
- # These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
- # NAME is the cpp macro being defined, VALUE is the value it is being given.
- # PARAMS is the parameter list in the macro definition--in most cases, it's
- # just an empty string.
- ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
- ac_dB='\\)[	 (].*,\\1define\\2'
- ac_dC=' '
- ac_dD=' ,'
- 
- uniq confdefs.h |
-   sed -n '
- 	t rset
- 	:rset
- 	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
- 	t ok
- 	d
- 	:ok
- 	s/[\\&,]/\\&/g
- 	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- 	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-   ' >>conftest.defines
- 
- # Remove the space that was appended to ease matching.
- # Then replace #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- # (The regexp can be short, since the line contains either #define or #undef.)
- echo 's/ $//
- s,^[	 #]*u.*,/* & */,' >>conftest.defines
- 
- # Break up conftest.defines:
- ac_max_sed_lines=50
- 
- # First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
- # Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
- # Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
- # et cetera.
- ac_in='$ac_file_inputs'
- ac_out='"$tmp/out1"'
- ac_nxt='"$tmp/out2"'
- 
- while :
- do
-   # Write a here document:
-     cat >>$CONFIG_STATUS <<_ACEOF
-     # First, check the format of the line:
-     cat >"\$tmp/defines.sed" <<\\CEOF
- /^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
- /^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
- b
- :def
- _ACEOF
-   sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-   echo 'CEOF
-     sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-   ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-   sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-   grep . conftest.tail >/dev/null || break
-   rm -f conftest.defines
-   mv conftest.tail conftest.defines
- done
- rm -f conftest.defines conftest.tail
- 
- echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
    if test x"$ac_file" != x-; then
-     echo "/* $configure_input  */" >"$tmp/config.h"
-     cat "$ac_result" >>"$tmp/config.h"
-     if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
+     {
+       $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+     } >"$tmp/config.h" \
+       || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+    { (exit 1); exit 1; }; }
+     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
      else
-       rm -f $ac_file
-       mv "$tmp/config.h" $ac_file
+       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; }; }
      fi
    else
-     echo "/* $configure_input  */"
-     cat "$ac_result"
+     $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; }; }
    fi
-   rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_arg=$ac_file
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
  _am_stamp_count=1
  for _am_header in $config_headers :; do
    case $_am_header in
@@@ -26308,7 -27016,7 +27016,7 @@@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[
  	 X"$_am_arg" : 'X\(//\)[^/]' \| \
  	 X"$_am_arg" : 'X\(//\)$' \| \
  	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$_am_arg" |
+ $as_echo X"$_am_arg" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26328,8 -27036,8 +27036,8 @@@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
-   :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
- echo "$as_me: executing $ac_file commands" >&6;}
+   :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
  
@@@ -26351,7 -27059,7 +27059,7 @@@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^
  	 X"$mf" : 'X\(//\)[^/]' \| \
  	 X"$mf" : 'X\(//\)$' \| \
  	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
+ $as_echo X"$mf" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26395,7 -27103,7 +27103,7 @@@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/]
  	 X"$file" : 'X\(//\)[^/]' \| \
  	 X"$file" : 'X\(//\)$' \| \
  	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
+ $as_echo X"$file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26421,7 -27129,7 +27129,7 @@@
      as_dirs=
      while :; do
        case $as_dir in #(
-       *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
@@@ -26430,7 -27138,7 +27138,7 @@@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
+ $as_echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
@@@ -26451,8 -27159,8 +27159,8 @@@
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
-   } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   } || 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; }; }; }
      # echo "creating $dirpart/$file"
      echo '# dummy' > "$dirpart/$file"
@@@ -27104,6 -27812,11 +27812,11 @@@ _ACEO
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  
+ test $ac_write_fail = 0 ||
+   { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
+ 
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
@@@ -27125,18 -27838,22 +27838,22 @@@ if test "$no_create" != yes; the
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
  
  
  # Yep, downgrading the compiler avoids the bug too:
  # 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
- 	{ echo "$as_me:$LINENO: WARNING:
+ 	{ $as_echo "$as_me:$LINENO: WARNING:
  ****** Optimizations disabled to avoid compiler bugs
  ****** The resulting binaries will be slow!
  ****** It is recommended to either upgrade or downgrade your compiler
  " >&5
- echo "$as_me: WARNING:
+ $as_echo "$as_me: WARNING:
  ****** Optimizations disabled to avoid compiler bugs
  ****** The resulting binaries will be slow!
  ****** It is recommended to either upgrade or downgrade your compiler
@@@ -27144,14 -27861,14 +27861,14 @@@
  fi
  
  if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$zlib_check" = "xno" ; then
- { echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:$LINENO: WARNING:
  ****** WARNING:
  ****** You are either cross compiling to a different host or
  ****** you have manually disabled important configure checks.
  ****** Please be aware that this build may be badly broken.
  ****** DO NOT REPORT BUGS BASED ON THIS BUILD !!!
  " >&5
- echo "$as_me: WARNING:
+ $as_echo "$as_me: WARNING:
  ****** WARNING:
  ****** You are either cross compiling to a different host or
  ****** you have manually disabled important configure checks.
diff --combined configure.in
index bca7bc5,8cf3a8e..8aaaf6d
--- a/configure.in
+++ b/configure.in
@@@ -39,11 -39,12 +39,11 @@@ dnl the date in the versio
  AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
  
  dnl change this on a release
 -VERSION="devel-`date +%Y%m%d`"
 -dnl VERSION="0.94rc1"
 +VERSION="0.95rc1"
  AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
  
  LC_CURRENT=6
- LC_REVISION=0
+ LC_REVISION=1
  LC_AGE=0
  LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
  AC_SUBST([LIBCLAMAV_VERSION])
@@@ -69,10 -70,8 +69,8 @@@ AC_C_CONS
  AC_C_INLINE
  AC_C_FPU_BIGENDIAN
  AC_C_BIGENDIAN
- if test $ac_cv_c_bigendian = yes; then
-   AC_DEFINE([WORDS_BIGENDIAN],1,endianess)
- else
-   AC_DEFINE([WORDS_BIGENDIAN],0,endianess)
+ if test $ac_cv_c_bigendian = no; then
+     m4_default([], [AC_DEFINE([WORDS_BIGENDIAN], 0)])
  fi
  
  AC_ARG_ENABLE([gcc-vcheck],
@@@ -551,7 -550,7 +549,7 @@@ if test "$want_bzip2" = "yes
  then
      AC_LIB_LINKFLAGS([bz2])
      save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem";
+     LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
  
      have_bzprefix="no"
      AC_CHECK_LIB([bz2], [BZ2_bzReadOpen], [have_bzprefix="yes"])
@@@ -604,7 -603,7 +602,7 @@@ want_getaddrinfo=$enableval, want_getad
  if test "$want_getaddrinfo" = "yes"
  then
      AC_MSG_CHECKING([for getaddrinfo])
-     AC_CACHE_VAL([have_gai],[
+     AC_CACHE_VAL([have_cv_gai],[
  		AC_TRY_RUN([
  		    #include <sys/types.h>
  		    #include <sys/socket.h>
@@@ -622,12 -621,12 +620,12 @@@
  			return 0;
  		    }
  		],
- 		[have_gai=yes],
- 		[have_gai=no],
- 		[have_gai=no])
+ 		[have_cv_gai=yes],
+ 		[have_cv_gai=no],
+ 		[have_cv_gai=no])
  		])
-     AC_MSG_RESULT([$have_gai])
-     if test "$have_gai" = yes; then
+     AC_MSG_RESULT([$have_cv_gai])
+     if test "$have_cv_gai" = yes; then
  	AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo()])
      fi
  fi
@@@ -639,7 -638,7 +637,7 @@@ want_ipv6=$enableval, want_ipv6="yes"
  if test "$want_ipv6" = "yes"
  then
      AC_MSG_CHECKING([for IPv6 support])
-     AC_CACHE_VAL([have_ipv6],[
+     AC_CACHE_VAL([have_cv_ipv6],[
  		AC_TRY_RUN([
  		    #include <sys/types.h>
  		    #include <sys/socket.h>
@@@ -662,12 -661,12 +660,12 @@@
  			return 0;
  		    }
  		],
- 		[have_ipv6=yes],
- 		[have_ipv6=no],
- 		[have_ipv6=no])
+ 		[have_cv_ipv6=yes],
+ 		[have_cv_ipv6=no],
+ 		[have_cv_ipv6=no])
  		])
-     AC_MSG_RESULT([$have_ipv6])
-     if test "$have_ipv6" = yes; then
+     AC_MSG_RESULT([$have_cv_ipv6])
+     if test "$have_cv_ipv6" = yes; then
  	AC_DEFINE(SUPPORT_IPv6, 1, [Support for IPv6])
      fi
  fi
@@@ -1383,68 -1382,68 +1381,68 @@@ dnl check for __attribute__((packed)
  dnl but only on compilers claiming to be gcc compatible
  dnl because for example Sun's compiler silently ignores the packed attribute.
  AC_MSG_CHECKING([for structure packing via __attribute__((packed))])
- AC_CACHE_VAL([have_attrib_packed],[
+ AC_CACHE_VAL([have_cv_attrib_packed],[
  	AC_TRY_COMPILE(,
  		[#ifdef __GNUC__
  		 struct { int i __attribute__((packed)); } s;
  		 #else
  		 #error Only checking for packed attribute on gcc-like compilers
  		 #endif],
- 		[have_attrib_packed=yes],
- 		[have_attrib_packed=no])
+ 		[have_cv_attrib_packed=yes],
+ 		[have_cv_attrib_packed=no])
  	])
- AC_MSG_RESULT([$have_attrib_packed])
+ AC_MSG_RESULT([$have_cv_attrib_packed])
  
- if test "$have_attrib_packed" = no; then
+ if test "$have_cv_attrib_packed" = no; then
  	AC_MSG_CHECKING([for structure packing via pragma])
- 	AC_CACHE_VAL([have_pragma_pack],[
+ 	AC_CACHE_VAL([have_cv_pragma_pack],[
  		AC_TRY_RUN([
  			    int main(int argc, char **argv) {
  #pragma pack(1)			/* has to be in column 1 ! */
  			struct { char c; long l; } s;
  			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
- 			[have_pragma_pack=yes],
- 			[have_pragma_pack=no])
+ 			[have_cv_pragma_pack=yes],
+ 			[have_cv_pragma_pack=no])
  		])
- 	AC_MSG_RESULT([$have_pragma_pack])
- 	if test "$have_pragma_pack" = yes; then
+ 	AC_MSG_RESULT([$have_cv_pragma_pack])
+ 	if test "$have_cv_pragma_pack" = yes; then
  		AC_DEFINE([HAVE_PRAGMA_PACK], 1, "pragma pack")
  	else
  		AC_MSG_CHECKING([for structure packing via hppa/hp-ux pragma])
- 		AC_CACHE_VAL([have_pragma_pack_hpux],[
+ 		AC_CACHE_VAL([have_cv_pragma_pack_hpux],[
  			AC_TRY_RUN([
  			/* hppa/hp-ux wants pragma outside of function */
  #pragma pack 1 /* has to be in column 1 ! */
  			struct { char c; long l; } s;
  			    int main(int argc, char **argv) {
  			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
- 			[have_pragma_pack_hpux=yes],
- 			[have_pragma_pack_hpux=no])
+ 			[have_cv_pragma_pack_hpux=yes],
+ 			[have_cv_pragma_pack_hpux=no])
  		])
- 		AC_MSG_RESULT([$have_pragma_pack_hpux])
+ 		AC_MSG_RESULT([$have_cv_pragma_pack_hpux])
  		AC_DEFINE([HAVE_PRAGMA_PACK_HPPA], 1, "pragma pack hppa/hp-ux style")
  	fi
  fi
  
  dnl check for __attribute__((aligned))
  AC_MSG_CHECKING([for type aligning via __attribute__((aligned))])
- AC_CACHE_VAL([have_attrib_aligned],[
+ AC_CACHE_VAL([have_cv_attrib_aligned],[
  	AC_TRY_COMPILE(,
  		[typedef int cl_aligned_int __attribute__((aligned));],
- 		[have_attrib_aligned=yes],
- 		[have_attrib_aligned=no])
+ 		[have_cv_attrib_aligned=yes],
+ 		[have_cv_attrib_aligned=no])
  	])
- AC_MSG_RESULT([$have_attrib_aligned])
+ AC_MSG_RESULT([$have_cv_attrib_aligned])
  
- if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then
+ if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
  	AC_MSG_ERROR(Need to know how to pack structures with this compiler)
  fi
  
- if test "$have_attrib_packed" = yes; then
+ if test "$have_cv_attrib_packed" = yes; then
  	AC_DEFINE([HAVE_ATTRIB_PACKED], 1, [attrib packed])
  fi
  
- if test "$have_attrib_aligned" = yes; then
+ if test "$have_cv_attrib_aligned" = yes; then
  	AC_DEFINE([HAVE_ATTRIB_ALIGNED], 1, [attrib aligned])
  fi
  
diff --combined etc/freshclam.conf
index e1a2724,3b0de6b..6e91bbc
--- a/etc/freshclam.conf
+++ b/etc/freshclam.conf
@@@ -14,7 -14,7 +14,7 @@@ Exampl
  
  # Path to the log file (make sure it has proper permissions)
  # Default: disabled
 -#UpdateLogFile /var/log/freshclam.log
 +#UpdateLogFile /var/log/clamav/freshclam.log
  
  # Maximum size of the log file.
  # Value of 0 disables the limit.
@@@ -43,7 -43,7 +43,7 @@@
  
  # This option allows you to save the process identifier of the daemon
  # Default: disabled
 -#PidFile /var/run/freshclam.pid
 +#PidFile /var/run/clamav/freshclam.pid
  
  # By default when started freshclam drops privileges and switches to the
  # "clamav" user. This directive allows you to change the database owner.
@@@ -159,3 -159,17 +159,17 @@@ DatabaseMirror database.clamav.ne
  # of the country of origin.
  # Default: disabled
  #DetectionStatsCountry country-code
+ 
+ # This option enables support for Google Safe Browsing. When activated for
+ # the first time, freshclam will download a new database file (safebrowsing.cvd)
+ # which will be automatically loaded by clamd and clamscan during the next
+ # reload, provided that the heuristic phishing detection is turned on. This
+ # database includes information about websites that may be phishing sites or
+ # possible sources of malware. When using this option, it's mandatory to run
+ # freshclam at least every 30 minutes.
+ # Freshclam uses the ClamAV's mirror infrastructure to distribute the
+ # database and its updates but all the contents are provided under Google's
+ # terms of use. See http://code.google.com/support/bin/answer.py?answer=70015
+ # and http://safebrowsing.clamav.net for more information.
+ # Default: disabled
+ #SafeBrowsing yes

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list