[Pkg-samba-maint] r2528 - branches/samba/experimental/debian/patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Wed Jan 28 19:05:23 UTC 2009


Author: bubulle
Date: 2009-01-28 19:05:22 +0000 (Wed, 28 Jan 2009)
New Revision: 2528

Removed:
   branches/samba/experimental/debian/patches/smb.conf.5-undefined-configure.patch
Modified:
   branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
   branches/samba/experimental/debian/patches/autoconf.patch
   branches/samba/experimental/debian/patches/documentation.patch
   branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
   branches/samba/experimental/debian/patches/series
   branches/samba/experimental/debian/patches/usershare.patch
Log:
Adapt patches for 3.3.0


Modified: branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -6,18 +6,18 @@
 
 Note: 
 
-Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
+Index: samba-3.3.0/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0rc2/docs/manpages/smb.conf.5
-@@ -750,8 +750,8 @@
+--- samba-3.3.0.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0/docs/manpages/smb.conf.5
+@@ -1141,8 +1141,8 @@
  Default:
- \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
+ \fI\fIadd machine script\fR\fR\fI = \fR\fI\FC\F[]\fR\fI \fR
  .sp
 -Example:
--\fI\fIadd machine script\fR\fR\fI = \fR\fI/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\fR\fI \fR
+-\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\F[]\fR\fI \fR
 +Example for Debian:
-+\fB\fIadd machine script\fR = /usr/sbin/adduser -n -g machines -c Machine -d /var/lib/samba -s /bin/false %u \fR
++\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/samba \-s /bin/false %u\F[]\fR\fI \fR
  .RE
  
  add port command (G)

Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/autoconf.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -25,59 +25,1552 @@
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba-3.3.0rc2/source/configure
+Index: samba-3.3.0/source/configure
 ===================================================================
---- samba-3.3.0rc2.orig/source/configure
-+++ samba-3.3.0rc2/source/configure
-@@ -791,6 +791,7 @@
- LIBTALLOC_SHARED
- LIBTALLOC_STATIC
- LIBTALLOC_LIBS
+--- samba-3.3.0.orig/source/configure
++++ samba-3.3.0/source/configure
+@@ -1,11 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for Samba 3.
++# Generated by GNU Autoconf 2.61 for Samba 3.
+ #
+ # Report bugs to <samba-technical at samba.org>.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -17,7 +17,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -39,45 +39,17 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='printf %s\n'
+-  as_echo_n='printf %s'
+-else
+-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+-    as_echo_n='/usr/ucb/echo -n'
+-  else
+-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+-    as_echo_n_body='eval
+-      arg=$1;
+-      case $arg in
+-      *"$as_nl"*)
+-	expr "X$arg" : "X\\(.*\\)$as_nl";
+-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+-      esac;
+-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+-    '
+-    export as_echo_n_body
+-    as_echo_n='sh -c $as_echo_n_body as_echo'
+-  fi
+-  export as_echo_body
+-  as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  PATH_SEPARATOR=:
+-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+-      PATH_SEPARATOR=';'
+-  }
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
+ fi
+ 
+ # Support unset when possible.
+@@ -93,6 +65,8 @@
+ # 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.
+@@ -115,7 +89,7 @@
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -128,10 +102,17 @@
+ PS4='+ '
+ 
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++  fi
++done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -153,7 +134,7 @@
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -179,7 +160,7 @@
+   as_have_required=no
+ fi
+ 
+-  if test $as_have_required = yes &&	 (eval ":
++  if test $as_have_required = yes && 	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+@@ -261,7 +242,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -282,7 +263,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -362,10 +343,10 @@
+ 
+       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
+ 
+ 
+@@ -434,10 +415,9 @@
+ 
+ test \$exitcode = 0") || {
+   echo No shell found that supports shell functions.
+-  echo Please tell bug-autoconf at gnu.org about your system,
+-  echo including any error possibly output before this message.
+-  echo This can help us improve future autoconf versions.
+-  echo Configuration will now proceed without shell functions.
++  echo Please tell autoconf at gnu.org about your system,
++  echo including any error possibly output before this
++  echo message
+ }
+ 
+ 
+@@ -473,7 +453,7 @@
+       s/-\n.*//
+     ' >$as_me.lineno &&
+   chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -501,6 +481,7 @@
+ *)
+   ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -513,22 +494,19 @@
+   rm -f conf$$.dir/conf$$.file
+ else
+   rm -f conf$$.dir
+-  mkdir conf$$.dir 2>/dev/null
++  mkdir conf$$.dir
+ 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
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+@@ -553,10 +531,10 @@
+   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
+@@ -638,334 +616,265 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='LTLIBOBJS
+-SMBD_LIBS
+-DEVELOPER_CFLAGS
+-GPEXT_MODULES
+-GPEXT_STATIC
+-VFS_MODULES
+-VFS_STATIC
+-AUTH_MODULES
+-AUTH_STATIC
+-CHARSET_MODULES
+-CHARSET_STATIC
+-NSS_INFO_MODULES
+-NSS_INFO_STATIC
+-IDMAP_MODULES
+-IDMAP_STATIC
+-RPC_MODULES
+-RPC_STATIC
+-PDB_MODULES
+-PDB_STATIC
+-INIPARSERLIBS
+-BUILD_INIPARSER
+-DNSSD_LIBS
+-FLAGS1
+-POPTLIBS
+-BUILD_POPT
+-WINBIND_KRB5_LOCATOR
+-PAM_WINBIND_EXTRA_LIBS
+-NSSSONAMEVERSIONSUFFIX
+-WINBIND_NSS_EXTRA_LIBS
+-WINBIND_NSS_EXTRA_OBJS
+-WINBIND_NSS_LDSHFLAGS
+-WINBIND_WINS_NSS
+-WINBIND_NSS
+-WINBIND_NSS_PTHREAD
+-LIBADDNS_SOVER
+-UNINSTALL_LIBADDNS
+-INSTALL_LIBADDNS
+-LIBADDNS_LIBS
+-LIBADDNS_STATIC
+-LIBADDNS_SHARED
+-LIBADDNS_STATIC_TARGET
+-LIBADDNS_SHARED_TARGET
+-LIBSMBSHAREMODES_SOVER
+-UNINSTALL_LIBSMBSHAREMODES
+-INSTALL_LIBSMBSHAREMODES
+-LIBSMBSHAREMODES_LIBS
+-LIBSMBSHAREMODES_STATIC
+-LIBSMBSHAREMODES_SHARED
+-LIBSMBSHAREMODES_STATIC_TARGET
+-LIBSMBSHAREMODES_SHARED_TARGET
+-LIBSMBCLIENT_SOVER
+-UNINSTALL_LIBSMBCLIENT
+-INSTALL_LIBSMBCLIENT
+-LIBSMBCLIENT_LIBS
+-LIBSMBCLIENT_STATIC
+-LIBSMBCLIENT_SHARED
+-LIBSMBCLIENT_STATIC_TARGET
+-LIBSMBCLIENT_SHARED_TARGET
+-LIBNETAPI_SOVER
+-UNINSTALL_LIBNETAPI
+-INSTALL_LIBNETAPI
+-LIBNETAPI_LIBS
+-LIBNETAPI_STATIC
+-LIBNETAPI_SHARED
+-LIBNETAPI_STATIC_TARGET
+-LIBNETAPI_SHARED_TARGET
+-LIBTDB_SOVER
+-UNINSTALL_LIBTDB
+-INSTALL_LIBTDB
+-LIBTDB_LIBS
+-LIBTDB_STATIC
+-LIBTDB_SHARED
+-LIBTDB_STATIC_TARGET
+-LIBTDB_SHARED_TARGET
+-LIBTALLOC_SOVER
+-UNINSTALL_LIBTALLOC
+-INSTALL_LIBTALLOC
+-LIBTALLOC_LIBS
+-LIBTALLOC_STATIC
+-LIBTALLOC_SHARED
+-LIBTALLOC_STATIC_TARGET
+-LIBTALLOC_SHARED_TARGET
+-USESHARED
+-KRB5CONFIG
+-LDBLDAP
+-SMBLDAPUTIL
+-SMBLDAP
+-FAKE_KASERVER_OBJ
+-SMB_FAM_LIBS
+-LIB_PATH_VAR
+-ROFF
+-SYMSEXT
+-LIBUNWIND_PTRACE
+-TERMLDFLAGS
+-TERMLIBS
+-CUPS_CONFIG
+-LIBREPLACE_OBJS
+-LIBDL
+-LIBOBJS
+-DYNEXP
+-PIDL_ARGS
+-BROKEN_CC
+-AR
+-PERL
+-AWK
+-SWAT_INSTALL_TARGETS
+-SWAT_SBIN_TARGETS
+-NSS_WRAPPER_OBJS
+-HAVE_NSS_WRAPPER
+-SOCKET_WRAPPER_OBJS
+-HAVE_SOCKET_WRAPPER
+-DEFAULT_TEST_OPTIONS
+-NSCD_LIBS
+-CONFIG_LIBS
+-EXTRA_ALL_TARGETS
+-EXTRA_SBIN_PROGS
+-UNINSTALL_CIFSUPCALL
+-INSTALL_CIFSUPCALL
+-CIFSUPCALL_PROGS
+-UNINSTALL_CIFSMOUNT
+-INSTALL_CIFSMOUNT
+-CIFSMOUNT_PROGS
+-EXTRA_BIN_PROGS
+-NSS_MODULES
+-UNINSTALL_PAM_MODULES
+-INSTALL_PAM_MODULES
+-PAM_MODULES
+-GPEXT_LIBS
+-LDAP_LIBS
+-UUID_LIBS
+-KRB5_LIBS
+-IDMAP_LIBS
+-PASSDB_LIBS
+-ACL_LIBS
+-AUTH_LIBS
+-PRINT_LIBS
+-LIBSAMBAUTIL_SHARED
+-WINBIND_LIBS
+-LIBWBCLIENT
+-LIBWBCLIENT_SOVER
+-LIBWBCLIENT_STATIC
+-LIBWBCLIENT_STATIC_TARGET
+-LIBWBCLIENT_SHARED
+-LIBWBCLIENT_SHARED_TARGET
+-UNINSTALL_LIBWBCLIENT
+-INSTALL_LIBWBCLIENT
+-UNINSTALLLIBCMD_A
+-UNINSTALLLIBCMD_SH
+-INSTALLLIBCMD_A
+-INSTALLLIBCMD_SH
+-SHLIBEXT
+-RELRO_LDFLAGS
+-PIE_LDFLAGS
+-PIE_CFLAGS
+-PICFLAG
+-HOST_OS
+-DSO_EXPORTS
+-MODULE_EXPORTS
+-SHLD
+-SONAMEFLAG
+-LDSHFLAGS
+-SAMBA_CPPFLAGS
+-TDB_OBJS
+-TDB_OBJ
+-TDB_CFLAGS
+-tdbdir
+-TALLOC_OBJS
+-TALLOC_LIBS
+-TALLOC_CFLAGS
+-TALLOC_OBJ
+-tallocdir
+-libreplace_cv_immediate_structures
+-INSTALL_DATA
+-INSTALL_SCRIPT
+-INSTALL_PROGRAM
+-EGREP
+-GREP
+-CPP
+-OBJEXT
+-EXEEXT
+-ac_ct_CC
+-CPPFLAGS
+-LDFLAGS
+-CFLAGS
+-CC
+-smbtorture4_path
+-selftest_prefix
+-modulesdir
+-pammodulesdir
+-rootsbindir
+-cachedir
+-statedir
+-codepagedir
+-swatdir
+-privatedir
+-ctdbdir
+-logfilebase
+-piddir
+-lockdir
+-configdir
+-target_os
+-target_vendor
+-target_cpu
+-target
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+-LIBREPLACEOBJ
+-libreplacedir
+-builddir
+-target_alias
+-host_alias
+-build_alias
+-LIBS
+-ECHO_T
+-ECHO_N
+-ECHO_C
+-DEFS
+-mandir
+-localedir
+-libdir
+-psdir
+-pdfdir
+-dvidir
+-htmldir
+-infodir
+-docdir
+-oldincludedir
+-includedir
+-localstatedir
+-sharedstatedir
+-sysconfdir
+-datadir
+-datarootdir
+-libexecdir
+-sbindir
+-bindir
+-program_transform_name
+-prefix
+-exec_prefix
+-PACKAGE_BUGREPORT
+-PACKAGE_STRING
+-PACKAGE_VERSION
+-PACKAGE_TARNAME
+-PACKAGE_NAME
++ac_subst_vars='SHELL
+ PATH_SEPARATOR
+-SHELL'
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++builddir
++libreplacedir
++LIBREPLACEOBJ
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++configdir
++lockdir
++piddir
++logfilebase
++ctdbdir
++privatedir
++swatdir
++codepagedir
++statedir
++cachedir
++rootsbindir
++pammodulesdir
++modulesdir
++selftest_prefix
++smbtorture4_path
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++CPP
++GREP
++EGREP
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++libreplace_cv_immediate_structures
++tallocdir
++TALLOC_OBJ
++TALLOC_CFLAGS
++TALLOC_LIBS
++TALLOC_OBJS
++tdbdir
++TDB_CFLAGS
++TDB_OBJ
++TDB_OBJS
++SAMBA_CPPFLAGS
++LDSHFLAGS
++SONAMEFLAG
++SHLD
++MODULE_EXPORTS
++DSO_EXPORTS
++HOST_OS
++PICFLAG
++PIE_CFLAGS
++PIE_LDFLAGS
++RELRO_LDFLAGS
++SHLIBEXT
++INSTALLLIBCMD_SH
++INSTALLLIBCMD_A
++UNINSTALLLIBCMD_SH
++UNINSTALLLIBCMD_A
++INSTALL_LIBWBCLIENT
++UNINSTALL_LIBWBCLIENT
++LIBWBCLIENT_SHARED_TARGET
++LIBWBCLIENT_SHARED
++LIBWBCLIENT_STATIC_TARGET
++LIBWBCLIENT_STATIC
++LIBWBCLIENT_SOVER
++LIBWBCLIENT
++WINBIND_LIBS
++LIBSAMBAUTIL_SHARED
++PRINT_LIBS
++AUTH_LIBS
++ACL_LIBS
++PASSDB_LIBS
++IDMAP_LIBS
++KRB5_LIBS
++UUID_LIBS
++LDAP_LIBS
++GPEXT_LIBS
++PAM_MODULES
++INSTALL_PAM_MODULES
++UNINSTALL_PAM_MODULES
++NSS_MODULES
++EXTRA_BIN_PROGS
++CIFSMOUNT_PROGS
++INSTALL_CIFSMOUNT
++UNINSTALL_CIFSMOUNT
++CIFSUPCALL_PROGS
++INSTALL_CIFSUPCALL
++UNINSTALL_CIFSUPCALL
++EXTRA_SBIN_PROGS
++EXTRA_ALL_TARGETS
++CONFIG_LIBS
++NSCD_LIBS
++DEFAULT_TEST_OPTIONS
++HAVE_SOCKET_WRAPPER
++SOCKET_WRAPPER_OBJS
++HAVE_NSS_WRAPPER
++NSS_WRAPPER_OBJS
++SWAT_SBIN_TARGETS
++SWAT_INSTALL_TARGETS
++AWK
++PERL
++AR
++BROKEN_CC
++PIDL_ARGS
++DYNEXP
++LIBOBJS
++LIBDL
++LIBREPLACE_OBJS
++CUPS_CONFIG
++TERMLIBS
++TERMLDFLAGS
++LIBUNWIND_PTRACE
++SYMSEXT
++ROFF
++LIB_PATH_VAR
++SMB_FAM_LIBS
++FAKE_KASERVER_OBJ
++SMBLDAP
++SMBLDAPUTIL
++LDBLDAP
++KRB5CONFIG
++USESHARED
++LIBTALLOC_SHARED_TARGET
++LIBTALLOC_STATIC_TARGET
++LIBTALLOC_SHARED
++LIBTALLOC_STATIC
++LIBTALLOC_LIBS
 +LIBTALLOC_TARGET
- INSTALL_LIBTALLOC
- UNINSTALL_LIBTALLOC
- LIBTALLOC_SOVER
-@@ -799,6 +800,7 @@
- LIBTDB_SHARED
- LIBTDB_STATIC
- LIBTDB_LIBS
++INSTALL_LIBTALLOC
++UNINSTALL_LIBTALLOC
++LIBTALLOC_SOVER
++LIBTDB_SHARED_TARGET
++LIBTDB_STATIC_TARGET
++LIBTDB_SHARED
++LIBTDB_STATIC
++LIBTDB_LIBS
 +LIBTDB_TARGET
- INSTALL_LIBTDB
- UNINSTALL_LIBTDB
- LIBTDB_SOVER
-@@ -807,6 +809,7 @@
- LIBNETAPI_SHARED
- LIBNETAPI_STATIC
- LIBNETAPI_LIBS
++INSTALL_LIBTDB
++UNINSTALL_LIBTDB
++LIBTDB_SOVER
++LIBNETAPI_SHARED_TARGET
++LIBNETAPI_STATIC_TARGET
++LIBNETAPI_SHARED
++LIBNETAPI_STATIC
++LIBNETAPI_LIBS
 +LIBNETAPI_TARGET
- INSTALL_LIBNETAPI
- UNINSTALL_LIBNETAPI
- LIBNETAPI_SOVER
-@@ -815,6 +818,7 @@
- LIBSMBCLIENT_SHARED
- LIBSMBCLIENT_STATIC
- LIBSMBCLIENT_LIBS
++INSTALL_LIBNETAPI
++UNINSTALL_LIBNETAPI
++LIBNETAPI_SOVER
++LIBSMBCLIENT_SHARED_TARGET
++LIBSMBCLIENT_STATIC_TARGET
++LIBSMBCLIENT_SHARED
++LIBSMBCLIENT_STATIC
++LIBSMBCLIENT_LIBS
 +LIBSMBCLIENT_TARGET
- INSTALL_LIBSMBCLIENT
- UNINSTALL_LIBSMBCLIENT
- LIBSMBCLIENT_SOVER
-@@ -823,6 +827,7 @@
- LIBSMBSHAREMODES_SHARED
- LIBSMBSHAREMODES_STATIC
- LIBSMBSHAREMODES_LIBS
++INSTALL_LIBSMBCLIENT
++UNINSTALL_LIBSMBCLIENT
++LIBSMBCLIENT_SOVER
++LIBSMBSHAREMODES_SHARED_TARGET
++LIBSMBSHAREMODES_STATIC_TARGET
++LIBSMBSHAREMODES_SHARED
++LIBSMBSHAREMODES_STATIC
++LIBSMBSHAREMODES_LIBS
 +LIBSMBSHAREMODES_TARGET
- INSTALL_LIBSMBSHAREMODES
- UNINSTALL_LIBSMBSHAREMODES
- LIBSMBSHAREMODES_SOVER
-@@ -831,6 +836,7 @@
- LIBADDNS_SHARED
- LIBADDNS_STATIC
- LIBADDNS_LIBS
++INSTALL_LIBSMBSHAREMODES
++UNINSTALL_LIBSMBSHAREMODES
++LIBSMBSHAREMODES_SOVER
++LIBADDNS_SHARED_TARGET
++LIBADDNS_STATIC_TARGET
++LIBADDNS_SHARED
++LIBADDNS_STATIC
++LIBADDNS_LIBS
 +LIBADDNS_TARGET
- INSTALL_LIBADDNS
- UNINSTALL_LIBADDNS
- LIBADDNS_SOVER
-@@ -2243,9 +2249,9 @@
++INSTALL_LIBADDNS
++UNINSTALL_LIBADDNS
++LIBADDNS_SOVER
++WINBIND_NSS_PTHREAD
++WINBIND_NSS
++WINBIND_WINS_NSS
++WINBIND_NSS_LDSHFLAGS
++WINBIND_NSS_EXTRA_OBJS
++WINBIND_NSS_EXTRA_LIBS
++NSSSONAMEVERSIONSUFFIX
++PAM_WINBIND_EXTRA_LIBS
++WINBIND_KRB5_LOCATOR
++BUILD_POPT
++POPTLIBS
++FLAGS1
++DNSSD_LIBS
++BUILD_INIPARSER
++INIPARSERLIBS
++PDB_STATIC
++PDB_MODULES
++RPC_STATIC
++RPC_MODULES
++IDMAP_STATIC
++IDMAP_MODULES
++NSS_INFO_STATIC
++NSS_INFO_MODULES
++CHARSET_STATIC
++CHARSET_MODULES
++AUTH_STATIC
++AUTH_MODULES
++VFS_STATIC
++VFS_MODULES
++GPEXT_STATIC
++GPEXT_MODULES
++DEVELOPER_CFLAGS
++SMBD_LIBS
++LTLIBOBJS'
+ ac_subst_files=''
+-ac_user_opts='
+-enable_option_checking
+-with_fhs
+-with_privatedir
+-with_rootsbindir
+-with_lockdir
+-with_piddir
+-with_swatdir
+-with_configdir
+-with_logfilebase
+-with_ctdb
+-with_modulesdir
+-with_pammodulesdir
+-with_mandir
+-with_localedir
+-with_selftest_prefix
+-with_smbtorture4_path
+-enable_debug
+-enable_developer
+-enable_krb5developer
+-enable_picky_developer
+-with_cfenc
+-enable_largefile
+-enable_socket_wrapper
+-enable_nss_wrapper
+-enable_swat
+-enable_dmalloc
+-with_profiling_data
+-enable_cups
+-enable_iprint
+-with_readline
+-enable_static
+-enable_shared
+-enable_pie
+-enable_relro
+-with_libiconv
+-enable_fam
+-with_afs
+-with_fake_kaserver
+-with_vfs_afsacl
+-with_dfs
+-with_ldap
+-with_ads
+-with_krb5
+-with_dnsupdate
+-with_automount
+-with_cifsmount
+-with_cifsupcall
+-with_pam
+-with_pam_smbpass
+-with_nisplus_home
+-with_syslog
+-with_syslog_facility
+-with_quotas
+-with_sys_quotas
+-with_utmp
+-enable_shared_libs
+-with_static_libs
+-with_libtalloc
+-with_libtdb
+-with_libnetapi
+-with_libsmbclient
+-with_libsmbsharemodes
+-with_libaddns
+-with_cluster_support
+-with_acl_support
+-with_aio_support
+-with_sendfile_support
+-with_winbind
+-with_included_popt
+-enable_dnssd
+-with_included_iniparser
+-with_static_modules
+-with_shared_modules
+-'
+       ac_precious_vars='build_alias
+ host_alias
+ target_alias
+@@ -980,8 +889,6 @@
+ # 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
+@@ -1080,21 +987,13 @@
+     datarootdir=$ac_optarg ;;
+ 
+   -disable-* | --disable-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"enable_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+-	 ac_unrecognized_sep=', ';;
+-    esac
+-    eval enable_$ac_useropt=no ;;
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++    eval enable_$ac_feature=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+     ac_prev=docdir ;;
+@@ -1107,21 +1006,13 @@
+     dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"enable_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+-	 ac_unrecognized_sep=', ';;
+-    esac
+-    eval enable_$ac_useropt=\$ac_optarg ;;
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
++    eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -1312,38 +1203,22 @@
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"with_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+-	 ac_unrecognized_sep=', ';;
+-    esac
+-    eval with_$ac_useropt=\$ac_optarg ;;
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++    eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"with_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+-	 ac_unrecognized_sep=', ';;
+-    esac
+-    eval with_$ac_useropt=no ;;
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
++    eval with_$ac_package=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -1363,7 +1238,7 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+     ;;
+@@ -1372,16 +1247,16 @@
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -1390,38 +1265,22 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
++  { echo "$as_me: error: missing argument to $ac_option" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-if test -n "$ac_unrecognized_opts"; then
+-  case $enable_option_checking in
+-    no) ;;
+-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+-   { (exit 1); exit 1; }; } ;;
+-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+-  esac
+-fi
+-
+-# Check all directory arguments for consistency.
++# Be sure to have absolute directory names.
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ 		libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+-  # Remove trailing slashes.
+-  case $ac_val in
+-    */ )
+-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+-      eval $ac_var=\$ac_val;;
+-  esac
+-  # Be sure to have absolute directory names.
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; }
+ done
+ 
+@@ -1436,7 +1295,7 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+@@ -1452,10 +1311,10 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
++  { echo "$as_me: error: Working directory cannot be determined" >&2
+    { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
++  { echo "$as_me: error: pwd does not report name of working directory" >&2
+    { (exit 1); exit 1; }; }
+ 
+ 
+@@ -1463,12 +1322,12 @@
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+   # Try the directory containing this script, then the parent directory.
+-  ac_confdir=`$as_dirname -- "$as_myself" ||
+-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_myself" : 'X\(//\)[^/]' \| \
+-	 X"$as_myself" : 'X\(//\)$' \| \
+-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_myself" |
++  ac_confdir=`$as_dirname -- "$0" ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$0" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -1495,12 +1354,12 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
++	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+    { (exit 1); exit 1; }; }
+ 	pwd)`
+ # When building in place, set srcdir=.
+@@ -1549,9 +1408,9 @@
+ 
+ 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
+@@ -1561,25 +1420,25 @@
+ 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/samba]
+-  --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/samba]
++  --htmldir=DIR          html documentation [DOCDIR]
++  --dvidir=DIR           dvi documentation [DOCDIR]
++  --pdfdir=DIR           pdf documentation [DOCDIR]
++  --psdir=DIR            ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1598,7 +1457,6 @@
+   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-debug          Turn on compiler debugging information (default=no)
+@@ -1731,17 +1589,15 @@
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d "$ac_dir" ||
+-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+-      continue
++    test -d "$ac_dir" || continue
+     ac_builddir=.
+ 
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+   case $ac_top_builddir_sub in
+   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -1777,7 +1633,7 @@
+       echo &&
+       $SHELL "$ac_srcdir/configure" --help=recursive
+     else
+-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi || ac_status=$?
+     cd "$ac_pwd" || { ac_status=$?; break; }
+   done
+@@ -1787,10 +1643,10 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ Samba configure 3
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.61
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1801,7 +1657,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by Samba $as_me 3, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1837,7 +1693,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  $as_echo "PATH: $as_dir"
++  echo "PATH: $as_dir"
+ done
+ IFS=$as_save_IFS
+ 
+@@ -1872,7 +1728,7 @@
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+     *\'*)
+-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+@@ -1924,12 +1780,11 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+       *) $as_unset $ac_var ;;
+       esac ;;
+     esac
+@@ -1959,9 +1814,9 @@
+     do
+       eval ac_val=\$$ac_var
+       case $ac_val in
+-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       esac
+-      $as_echo "$ac_var='\''$ac_val'\''"
++      echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+@@ -1976,9 +1831,9 @@
+       do
+ 	eval ac_val=\$$ac_var
+ 	case $ac_val in
+-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ 	esac
+-	$as_echo "$ac_var='\''$ac_val'\''"
++	echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1994,8 +1849,8 @@
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+-      $as_echo "$as_me: caught signal $ac_signal"
+-    $as_echo "$as_me: exit $exit_status"
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core *.core core.conftest.* &&
+     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+@@ -2037,24 +1892,21 @@
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer an explicitly selected file to automatically selected ones.
+-ac_site_file1=NONE
+-ac_site_file2=NONE
++# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  set x "$CONFIG_SITE"
+ elif test "x$prefix" != xNONE; then
+-  ac_site_file1=$prefix/share/config.site
+-  ac_site_file2=$prefix/etc/config.site
++  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
+-  ac_site_file1=$ac_default_prefix/share/config.site
+-  ac_site_file2=$ac_default_prefix/etc/config.site
++  set x "$ac_default_prefix/share/config.site" \
++	"$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++shift
++for ac_site_file
+ do
+-  test "x$ac_site_file" = xNONE && continue
+   if test -r "$ac_site_file"; then
+-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+@@ -2064,16 +1916,16 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-$as_echo "$as_me: loading cache $cache_file" >&6;}
++    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . "$cache_file";;
+       *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-$as_echo "$as_me: creating cache $cache_file" >&6;}
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+@@ -2087,38 +1939,29 @@
+   eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-	# differences in whitespace do not lead to failure.
+-	ac_old_val_w=`echo x $ac_old_val`
+-	ac_new_val_w=`echo x $ac_new_val`
+-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-	  ac_cache_corrupted=:
+-	else
+-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+-	  eval $ac_var=\$ac_old_val
+-	fi
+-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
++	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
++echo "$as_me:   former value:  $ac_old_val" >&2;}
++	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
++echo "$as_me:   current value: $ac_new_val" >&2;}
++	ac_cache_corrupted=:
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -2128,12 +1971,10 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2180,8 +2021,8 @@
+ 
+ case "$PATH" in
+     */usr/ucb*)
+-	{ $as_echo "$as_me:$LINENO: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&5
+-$as_echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&5
++echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
+ 	;;
+ esac
+ 
+@@ -2227,8 +2068,8 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2254,8 +2095,8 @@
+ 	fi
+ done
+ if test x"$libreplacedir" = "x"; then
+-	{ { $as_echo "$as_me:$LINENO: error: cannot find libreplace in $libreplacepaths" >&5
+-$as_echo "$as_me: error: cannot find libreplace in $libreplacepaths" >&2;}
++	{ { echo "$as_me:$LINENO: error: cannot find libreplace in $libreplacepaths" >&5
++echo "$as_me: error: cannot find libreplace in $libreplacepaths" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ LIBREPLACEOBJ="replace.o"
+@@ -2263,34 +2104,34 @@
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
++  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
+    { (exit 1); exit 1; }; };;
+ esac
+ build=$ac_cv_build
+@@ -2307,27 +2148,27 @@
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "x$host_alias" = x; then
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
+    { (exit 1); exit 1; }; };;
+ esac
+ host=$ac_cv_host
+@@ -2344,27 +2185,27 @@
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+-$as_echo_n "checking target system type... " >&6; }
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "x$target_alias" = x; then
+   ac_cv_target=$ac_cv_host
+ else
+   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
++    { { 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;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-$as_echo "$ac_cv_target" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
+ case $ac_cv_target in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
+    { (exit 1); exit 1; }; };;
+ esac
+ target=$ac_cv_target
+@@ -2408,9 +2249,9 @@
  pammodulesdir="${libdir}/security"
  configdir="${libdir}"
  swatdir="\${prefix}/swat"
@@ -90,7 +1583,7 @@
  localedir="\${prefix}/share/locale"
  
  
-@@ -2261,10 +2267,10 @@
+@@ -2426,10 +2267,10 @@
      test "${libdir}" || libdir="\${prefix}/lib"
      modulesdir="${libdir}/samba"
      configdir="\${sysconfdir}/samba"
@@ -103,7 +1596,10578 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define FHS_COMPATIBLE 1
-@@ -13110,6 +13116,27 @@
+@@ -2450,8 +2291,8 @@
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-privatedir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-privatedir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
+   ;;
+   * )
+     privatedir="$withval"
+@@ -2470,8 +2311,8 @@
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-rootsbindir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-rootsbindir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
+   ;;
+   * )
+     rootsbindir="$withval"
+@@ -2490,8 +2331,8 @@
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-lockdir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-lockdir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
+   ;;
+   * )
+     lockdir="$withval"
+@@ -2510,8 +2351,8 @@
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-piddir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-piddir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
+   ;;
+   * )
+     piddir="$withval"
+@@ -2530,8 +2371,8 @@
+   #
+   # Just in case anybody does it
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-swatdir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-swatdir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
+   ;;
+   * )
+     swatdir="$withval"
+@@ -2550,8 +2391,8 @@
+   #
+   # Just in case anybody does it
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-configdir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-configdir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
+   ;;
+   * )
+     configdir="$withval"
+@@ -2570,8 +2411,8 @@
+   #
+   # Just in case anybody does it
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-logfilebase called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-logfilebase called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
+   ;;
+   * )
+     logfilebase="$withval"
+@@ -2588,8 +2429,8 @@
+ if test "${with_ctdb+set}" = set; then
+   withval=$with_ctdb;  case "$withval" in
+   yes|no)
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
+-$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
++echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
+   ;;
+   * )
+     ctdbdir="$withval"
+@@ -2608,8 +2449,8 @@
+   #
+   # Just in case anybody does it
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-modulesdir without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-modulesdir without argument - will use default" >&5
++echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
+   ;;
+   * )
+     modulesdir="$withval"
+@@ -2628,8 +2469,8 @@
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-pammodulesdir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-pammodulesdir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
+   ;;
+   * )
+     pammodulesdir="$withval"
+@@ -2648,8 +2489,8 @@
+   #
+   # Just in case anybody does it
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-mandir without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-mandir without argument - will use default" >&5
++echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
+   ;;
+   * )
+     mandir="$withval"
+@@ -2668,8 +2509,8 @@
+     #
+     # Just in case anybody does it
+     #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-localedir called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-localedir called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
+   ;;
+   *)
+   localedir="$withval"
+@@ -2705,8 +2546,8 @@
+ if test "${with_selftest_prefix+set}" = set; then
+   withval=$with_selftest_prefix;  case "$withval" in
+   yes|no)
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-selftest-prefix called without argument - will use default" >&5
+-$as_echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
++    { echo "$as_me:$LINENO: WARNING: --with-selftest-prefix called without argument - will use default" >&5
++echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
+   ;;
+   * )
+     selftest_prefix="$withval"
+@@ -2725,15 +2566,15 @@
+ if test "${with_smbtorture4_path+set}" = set; then
+   withval=$with_smbtorture4_path;  case "$withval" in
+   yes|no)
+-    { { $as_echo "$as_me:$LINENO: error: --with-smbtorture4-path should take a path" >&5
+-$as_echo "$as_me: error: --with-smbtorture4-path should take a path" >&2;}
++    { { echo "$as_me:$LINENO: error: --with-smbtorture4-path should take a path" >&5
++echo "$as_me: error: --with-smbtorture4-path should take a path" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+   * )
+     smbtorture4_path="$withval"
+     if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
+-    	{ { $as_echo "$as_me:$LINENO: error: '$smbtorture_path' does not  exist!" >&5
+-$as_echo "$as_me: error: '$smbtorture_path' does not  exist!" >&2;}
++    	{ { echo "$as_me:$LINENO: error: '$smbtorture_path' does not  exist!" >&5
++echo "$as_me: error: '$smbtorture_path' does not  exist!" >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+   ;;
+@@ -2824,10 +2665,10 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2840,7 +2681,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2851,11 +2692,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -2864,10 +2705,10 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -2880,7 +2721,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2891,11 +2732,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_CC" = x; then
+@@ -2903,8 +2744,12 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -2917,10 +2762,10 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2933,7 +2778,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -2944,11 +2789,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -2957,10 +2802,10 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2978,7 +2823,7 @@
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3001,11 +2846,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -3016,10 +2861,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -3032,7 +2877,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3043,11 +2888,11 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+-$as_echo "$CC" >&6; }
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -3060,10 +2905,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -3076,7 +2921,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -3087,11 +2932,11 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -3103,8 +2948,12 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -3114,50 +2963,44 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
++echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++   { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
+ { (ac_try="$ac_compiler --version >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compiler --version >&5") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -v >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compiler -v >&5") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (ac_try="$ac_compiler -V >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -3176,22 +3019,27 @@
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-
+-# The possible output files:
+-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+-
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort.  b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
+ ac_rmfiles=
+ for ac_file in $ac_files
+ do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+   esac
+ done
+@@ -3202,11 +3050,10 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+@@ -3217,7 +3064,7 @@
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+@@ -3244,27 +3091,25 @@
+   ac_file=''
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
+ if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
++echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+ 
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -3273,53 +3118,49 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
++echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++   { (exit 1); exit 1; }; }
+     fi
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-$as_echo_n "checking for suffix of executables... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -3328,33 +3169,31 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	  break;;
+     * ) break;;
+   esac
+ done
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++   { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-$as_echo "$ac_cv_exeext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-$as_echo_n "checking for suffix of object files... " >&6; }
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3377,43 +3216,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++   { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-$as_echo "$ac_cv_objext" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3439,21 +3275,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_compiler_gnu=no
+@@ -3461,21 +3296,17 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+-  GCC=yes
+-else
+-  GCC=
++
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+@@ -3502,21 +3333,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	CFLAGS=""
+@@ -3541,21 +3371,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   :
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_c_werror_flag=$ac_save_c_werror_flag
+@@ -3581,21 +3410,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -3610,8 +3438,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3627,10 +3455,10 @@
+     CFLAGS=
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+@@ -3701,21 +3529,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -3731,15 +3558,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+ 
+ 
+@@ -3752,10 +3579,10 @@
+ CFLAGS=$savedCFLAGS
+ 
+ if test x"$GCC" != x"yes" ; then
+-   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+-$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
++   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c99+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_prog_cc_c99=no
+ ac_save_CC=$CC
+@@ -3902,7 +3729,7 @@
+   return 0;
+ }
+ _ACEOF
+-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
++for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+@@ -3911,21 +3738,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c99=$ac_arg
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -3941,15 +3767,15 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c99" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c99"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+-$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
+ esac
+ 
+ 
+@@ -3957,27 +3783,33 @@
+ fi
+ 
+ if test x"$GCC" = x"yes" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for version of gcc" >&5
+-$as_echo_n "checking for version of gcc... " >&6; }
++	{ echo "$as_me:$LINENO: checking for version of gcc" >&5
++echo $ECHO_N "checking for version of gcc... $ECHO_C" >&6; }
+ 	GCC_VERSION=`$CC -dumpversion`
+-	{ $as_echo "$as_me:$LINENO: result: ${GCC_VERSION}" >&5
+-$as_echo "${GCC_VERSION}" >&6; }
++	{ echo "$as_me:$LINENO: result: ${GCC_VERSION}" >&5
++echo "${ECHO_T}${GCC_VERSION}" >&6; }
+ fi
+ 
++cat >>confdefs.h <<\_ACEOF
++#define _GNU_SOURCE 1
++_ACEOF
++
++
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+   if test "${ac_cv_prog_CPP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+       # Double quotes because CPP needs to be expanded
+     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -4009,21 +3841,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   :
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+@@ -4047,14 +3878,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -4062,7 +3892,7 @@
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+@@ -4087,8 +3917,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -4116,21 +3946,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   :
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+@@ -4154,14 +3983,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -4169,7 +3997,7 @@
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+@@ -4185,13 +4013,11 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++   { (exit 1); exit 1; }; }
+ fi
+ 
+ ac_ext=c
+@@ -4201,37 +4027,42 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
+ if test "${ac_cv_path_GREP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -z "$GREP"; then
+   ac_path_GREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_prog in grep ggrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+-# Check for GNU ac_path_GREP and select it if it is found.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++    # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+ *GNU*)
+   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+ *)
+   ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   while :
+   do
+     cat "conftest.in" "conftest.in" >"conftest.tmp"
+     mv "conftest.tmp" "conftest.in"
+     cp "conftest.in" "conftest.nl"
+-    $as_echo 'GREP' >> "conftest.nl"
++    echo 'GREP' >> "conftest.nl"
+     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     ac_count=`expr $ac_count + 1`
+@@ -4246,60 +4077,74 @@
+   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ 
+-      $ac_path_GREP_found && break 3
+-    done
++
++    $ac_path_GREP_found && break 3
+   done
+ done
++
++done
+ IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_GREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+-  fi
++fi
++
+ else
+   ac_cv_path_GREP=$GREP
+ fi
+ 
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+-$as_echo "$ac_cv_path_GREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+  GREP="$ac_cv_path_GREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+ if test "${ac_cv_path_EGREP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+    then ac_cv_path_EGREP="$GREP -E"
+    else
+-     if test -z "$EGREP"; then
++     # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   ac_path_EGREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_prog in egrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++    # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+ *GNU*)
+   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ *)
+   ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+   while :
+   do
+     cat "conftest.in" "conftest.in" >"conftest.tmp"
+     mv "conftest.tmp" "conftest.in"
+     cp "conftest.in" "conftest.nl"
+-    $as_echo 'EGREP' >> "conftest.nl"
++    echo 'EGREP' >> "conftest.nl"
+     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     ac_count=`expr $ac_count + 1`
+@@ -4314,31 +4159,69 @@
+   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ 
+-      $ac_path_EGREP_found && break 3
+-    done
++
++    $ac_path_EGREP_found && break 3
+   done
+ done
++
++done
+ IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_EGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+-  fi
++fi
++
+ else
+   ac_cv_path_EGREP=$EGREP
+ fi
+ 
++
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+-$as_echo "$ac_cv_path_EGREP" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
++
++{ echo "$as_me:$LINENO: checking for AIX" >&5
++echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef _AIX
++  yes
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++cat >>confdefs.h <<\_ACEOF
++#define _ALL_SOURCE 1
++_ACEOF
++
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++rm -f conftest*
++
++
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4365,21 +4248,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_header_stdc=no
+@@ -4471,40 +4353,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -4526,11 +4405,11 @@
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4548,21 +4427,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Header=no"
+@@ -4570,15 +4448,12 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -4586,19 +4461,18 @@
+ done
+ 
+ 
+-
+-  if test "${ac_cv_header_minix_config_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+-$as_echo_n "checking for minix/config.h... " >&6; }
+ if test "${ac_cv_header_minix_config_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
++echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_minix_config_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+-$as_echo "$ac_cv_header_minix_config_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
++echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+-$as_echo_n "checking minix/config.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
++echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4614,33 +4488,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+-$as_echo_n "checking minix/config.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
++echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4654,52 +4527,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -4708,25 +4580,25 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+-$as_echo_n "checking for minix/config.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
++echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_minix_config_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_minix_config_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+-$as_echo "$ac_cv_header_minix_config_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
++echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_minix_config_h" = x""yes; then
++if test $ac_cv_header_minix_config_h = yes; then
+   MINIX=yes
+ else
+   MINIX=
+ fi
+ 
+ 
+-  if test "$MINIX" = yes; then
++if test "$MINIX" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _POSIX_SOURCE 1
+@@ -4742,14 +4614,22 @@
+ #define _MINIX 1
+ _ACEOF
+ 
+-  fi
++fi
++
++
++
++
++
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++
++
++
++  { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
++echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; }
+ if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -4774,21 +4654,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_safe_to_define___extensions__=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_safe_to_define___extensions__=no
+@@ -4796,22 +4675,14 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
++echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; }
+   test $ac_cv_safe_to_define___extensions__ = yes &&
+     cat >>confdefs.h <<\_ACEOF
+ #define __EXTENSIONS__ 1
+ _ACEOF
+ 
+   cat >>confdefs.h <<\_ACEOF
+-#define _ALL_SOURCE 1
+-_ACEOF
+-
+-  cat >>confdefs.h <<\_ACEOF
+-#define _GNU_SOURCE 1
+-_ACEOF
+-
+-  cat >>confdefs.h <<\_ACEOF
+ #define _POSIX_PTHREAD_SEMANTICS 1
+ _ACEOF
+ 
+@@ -4820,78 +4691,28 @@
+ _ACEOF
+ 
+ 
+-
+- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_bigendian=unknown
+-    # See if we're dealing with a universal compiler.
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if sys/param.h defines the BYTE_ORDER macro.
+-      cat >conftest.$ac_ext <<_ACEOF
++  # 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;
+@@ -4903,34 +4724,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   # 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;
+@@ -4942,21 +4762,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_bigendian=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_c_bigendian=no
+@@ -4964,69 +4783,29 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    fi
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+-	      bogus endian macros
+-	     #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
+-  # It does; now see whether it defined to _BIG_ENDIAN or not.
+-	 cat >conftest.$ac_ext <<_ACEOF
++	# 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
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <limits.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; }
+ int
+ main ()
+ {
+-#ifndef _BIG_ENDIAN
+-		 not big endian
+-		#endif
+-
++ _ascii (); _ebcdic ();
+   ;
+   return 0;
+ }
+@@ -5037,101 +4816,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  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
+-
+-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
+-
+-
++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
+-
+-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
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5150,14 +4858,14 @@
+ 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;
+@@ -5169,67 +4877,60 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_bigendian=no
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_c_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
+-{ $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)
+-      ;; #(
+-   universal)
++
++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
+-#define AC_APPLE_UNIVERSAL_BUILD 1
++#define WORDS_BIGENDIAN 1
+ _ACEOF
+-
+-     ;; #(
+-   *)
+-     { { $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;}
++ ;;
++  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
++esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+-$as_echo_n "checking for inline... " >&6; }
++{ echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ if test "${ac_cv_c_inline+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+@@ -5252,21 +4953,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5277,8 +4977,8 @@
+ done
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+ 
+ 
+ case $ac_cv_c_inline in
+@@ -5300,8 +5000,8 @@
+ saved_CFLAGS="$CFLAGS";
+ c99_init=no
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers" >&5
+-$as_echo_n "checking for C99 designated initializers... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers" >&5
++echo $ECHO_N "checking for C99 designated initializers... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5326,33 +5026,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -AC99" >&5
+-$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -AC99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -AC99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -AC99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5377,33 +5076,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=extc99" >&5
+-$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -qlanglvl=extc99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5428,33 +5126,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
+-$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -qlanglvl=stdc99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5479,33 +5176,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -c99" >&5
+-$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -c99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -c99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -c99"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5530,26 +5226,25 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -5570,8 +5265,8 @@
+ else
+     CFLAGS="$saved_CFLAGS"
+     saved_CFLAGS=""
+-    { $as_echo "$as_me:$LINENO: WARNING: c99 structure initializer are not supported" >&5
+-$as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
++    { echo "$as_me:$LINENO: WARNING: c99 structure initializer are not supported" >&5
++echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
+ fi
+ 
+ 
+@@ -5588,12 +5283,11 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -5622,29 +5316,17 @@
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+-	    rm -rf conftest.one conftest.two conftest.dir
+-	    echo one > conftest.one
+-	    echo two > conftest.two
+-	    mkdir conftest.dir
+-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+-	      test -s conftest.one && test -s conftest.two &&
+-	      test -s conftest.dir/conftest.one &&
+-	      test -s conftest.dir/conftest.two
+-	    then
+-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	      break 3
+-	    fi
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
+ 	  fi
+ 	fi
+       done
+     done
+     ;;
+ esac
+-
+ done
+ IFS=$as_save_IFS
+ 
+-rm -rf conftest.one conftest.two conftest.dir
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+@@ -5657,8 +5339,8 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -5669,10 +5351,10 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+ if test "${ac_cv_search_strerror+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -5710,30 +5392,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_strerror=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_strerror+set}" = set; then
+@@ -5748,8 +5426,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-$as_echo "$ac_cv_search_strerror" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -5774,10 +5452,10 @@
+ 
+ if test "$enable_largefile" != no; then
+ 
+-  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
++  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_sys_largefile_CC=no
+      if test "$GCC" != yes; then
+@@ -5814,21 +5492,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5842,21 +5519,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5869,16 +5545,16 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
++  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -5910,21 +5586,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_sys_file_offset_bits=no; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5961,21 +5636,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -5986,8 +5660,8 @@
+   break
+ done
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+ case $ac_cv_sys_file_offset_bits in #(
+   no | unknown) ;;
+   *)
+@@ -5996,12 +5670,12 @@
+ _ACEOF
+ ;;
+ esac
+-rm -rf conftest*
++rm -f conftest*
+   if test $ac_cv_sys_file_offset_bits = unknown; then
+-    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
++    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_large_files+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -6033,21 +5707,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_sys_large_files=no; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -6084,21 +5757,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_sys_large_files=1; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -6109,8 +5781,8 @@
+   break
+ done
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+-$as_echo "$ac_cv_sys_large_files" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+ case $ac_cv_sys_large_files in #(
+   no | unknown) ;;
+   *)
+@@ -6119,7 +5791,7 @@
+ _ACEOF
+ ;;
+ esac
+-rm -rf conftest*
++rm -f conftest*
+   fi
+ fi
+ 
+@@ -6138,13 +5810,13 @@
+ _ACEOF
+ 
+ 		if test "`uname -r`" = "B.11.00" -o "`uname -r`" = "B.11.11"; then
+-			{ $as_echo "$as_me:$LINENO: WARNING: Enabling HPUX 11.00/11.11 header bug workaround" >&5
+-$as_echo "$as_me: WARNING: Enabling HPUX 11.00/11.11 header bug workaround" >&2;}
++			{ echo "$as_me:$LINENO: WARNING: Enabling HPUX 11.00/11.11 header bug workaround" >&5
++echo "$as_me: WARNING: Enabling HPUX 11.00/11.11 header bug workaround" >&2;}
+ 			CFLAGS="$CFLAGS -Dpread=pread64 -Dpwrite=pwrite64"
+ 		fi
+ 		if test "`uname -r`" = "B.11.23"; then
+-			{ $as_echo "$as_me:$LINENO: WARNING: Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround" >&5
+-$as_echo "$as_me: WARNING: Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround" >&2;}
++			{ echo "$as_me:$LINENO: WARNING: Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround" >&5
++echo "$as_me: WARNING: Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround" >&2;}
+ 			CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED"
+ 		fi
+ 		;;
+@@ -6221,21 +5893,20 @@
+ 
+ for ac_header in standards.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -6251,33 +5922,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -6291,393 +5961,87 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-# Solaris needs HAVE_LONG_LONG defined
+-{ $as_echo "$as_me:$LINENO: checking for long long" >&5
+-$as_echo_n "checking for long long... " >&6; }
+-if test "${ac_cv_type_long_long+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_long_long=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (long long))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof ((long long)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_long_long=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+-$as_echo "$ac_cv_type_long_long" >&6; }
+-if test "x$ac_cv_type_long_long" = x""yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_LONG_LONG 1
+-_ACEOF
+-
+-
+-fi
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $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
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++## ---------------------------------------- ##
++_ASBOX
++     ) | 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; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  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_lo= ac_hi=
+ fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++done
++
++
++# Solaris needs HAVE_LONG_LONG defined
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -6685,12 +6049,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long long ac__type_new_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+-test_array [0] = 0
+-
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -6701,42 +6067,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ac_hi=$ac_mid
++  ac_cv_type_long_long=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_cv_type_long_long=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_int=$ac_lo;;
+-'') if test "$ac_cv_type_int" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (int)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_int=0
+-   fi ;;
+-esac
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
++if test $ac_cv_type_long_long = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_LONG_LONG 1
++_ACEOF
++
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
++if test "${ac_cv_type_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6745,103 +6112,56 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (int)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+-#include <stdio.h>
+-#include <stdlib.h>
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (int))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (int))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (int))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+-
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++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_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_int=`cat conftest.val`
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_type_int=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-if test "$ac_cv_type_int" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (int)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_int=0
+-   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
+-rm -f conftest.val
++	ac_cv_type_int=no
+ fi
+-{ $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
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of char" >&5
+-$as_echo_n "checking size of char... " >&6; }
+-if test "${ac_cv_sizeof_char+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -6852,10 +6172,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -6868,14 +6189,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -6889,10 +6209,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -6905,21 +6226,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -6933,7 +6253,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -6943,10 +6263,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -6959,14 +6280,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -6980,10 +6300,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -6996,21 +6317,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -7024,7 +6344,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -7044,10 +6364,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7060,21 +6381,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -7083,17 +6403,15 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+-?*) ac_cv_sizeof_char=$ac_lo;;
+-'') if test "$ac_cv_type_char" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') if test "$ac_cv_type_int" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (char)
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_char=0
++     ac_cv_sizeof_int=0
+    fi ;;
+ esac
+ else
+@@ -7104,8 +6422,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (char)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (char)); }
++   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -7115,22 +6434,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (char))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (char))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (char))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -7143,64 +6460,113 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_sizeof_char=`cat conftest.val`
++  ac_cv_sizeof_int=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-if test "$ac_cv_type_char" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
++if test "$ac_cv_type_int" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (char)
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_char=0
++     ac_cv_sizeof_int=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+-$as_echo "$ac_cv_sizeof_char" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ 
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_CHAR $ac_cv_sizeof_char
++#define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
++
++
++{ echo "$as_me:$LINENO: checking for char" >&5
++echo $ECHO_N "checking for char... $ECHO_C" >&6; }
++if test "${ac_cv_type_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef char ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_char=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_char=no
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
++echo "${ECHO_T}$ac_cv_type_char" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $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
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking size of char" >&5
++echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -7211,10 +6577,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef char ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7227,14 +6594,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -7248,10 +6614,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef char ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7264,21 +6631,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -7292,7 +6658,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -7302,10 +6668,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef char ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7318,14 +6685,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -7339,10 +6705,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef char ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7355,21 +6722,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -7383,7 +6749,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -7403,10 +6769,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef char ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7419,21 +6786,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -7442,17 +6808,15 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+-?*) ac_cv_sizeof_short=$ac_lo;;
+-'') if test "$ac_cv_type_short" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++?*) ac_cv_sizeof_char=$ac_lo;;
++'') if test "$ac_cv_type_char" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (short)
++echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_short=0
++     ac_cv_sizeof_char=0
+    fi ;;
+ esac
+ else
+@@ -7463,8 +6827,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (short)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
++   typedef char ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -7474,22 +6839,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (short))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (short))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (short))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -7502,64 +6865,113 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_sizeof_short=`cat conftest.val`
++  ac_cv_sizeof_char=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-if test "$ac_cv_type_short" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_char" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (short)
++echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_short=0
++     ac_cv_sizeof_char=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-$as_echo "$ac_cv_sizeof_short" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
+ 
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
++#define SIZEOF_CHAR $ac_cv_sizeof_char
++_ACEOF
++
++
++{ echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
++if test "${ac_cv_type_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef short ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_short=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_short=no
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $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
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -7570,10 +6982,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7586,14 +6999,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -7607,10 +7019,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7623,21 +7036,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -7651,7 +7063,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -7661,10 +7073,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7677,14 +7090,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -7698,10 +7110,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7714,21 +7127,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -7742,7 +7154,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -7762,10 +7174,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7778,21 +7191,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -7801,17 +7213,15 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+-?*) ac_cv_sizeof_long=$ac_lo;;
+-'') if test "$ac_cv_type_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') if test "$ac_cv_type_short" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_long=0
++     ac_cv_sizeof_short=0
+    fi ;;
+ esac
+ else
+@@ -7822,8 +7232,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (long)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
++   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -7833,22 +7244,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (long))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -7861,64 +7270,113 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_sizeof_long=`cat conftest.val`
++  ac_cv_sizeof_short=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-if test "$ac_cv_type_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_short" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_long=0
++     ac_cv_sizeof_short=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-$as_echo "$ac_cv_sizeof_long" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ 
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
++#define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
++
++
++{ echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef long ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_long=no
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $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
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -7929,10 +7387,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7945,14 +7404,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -7966,10 +7424,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -7982,21 +7441,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -8010,7 +7468,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -8020,10 +7478,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -8036,14 +7495,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -8057,10 +7515,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -8073,21 +7532,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -8101,7 +7559,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -8121,10 +7579,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -8137,21 +7596,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -8160,17 +7618,15 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+-?*) ac_cv_sizeof_long_long=$ac_lo;;
+-'') if test "$ac_cv_type_long_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') if test "$ac_cv_type_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long long)
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_long_long=0
++     ac_cv_sizeof_long=0
+    fi ;;
+ esac
+ else
+@@ -8181,8 +7637,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (long long)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
++   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -8192,22 +7649,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (long long))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (long long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (long long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -8220,201 +7675,56 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_sizeof_long_long=`cat conftest.val`
++  ac_cv_sizeof_long=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-if test "$ac_cv_type_long_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++if test "$ac_cv_type_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long long)
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+-     ac_cv_sizeof_long_long=0
++     ac_cv_sizeof_long=0
+    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
+ rm -f conftest.val
+ fi
+-{ $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
+-
+-
+-
+-{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
+-$as_echo_n "checking for uint_t... " >&6; }
+-if test "${ac_cv_type_uint_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_uint_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (uint_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 ((uint_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_uint_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ 
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
+-$as_echo "$ac_cv_type_uint_t" >&6; }
+-if test "x$ac_cv_type_uint_t" = x""yes; then
+-  :
+-else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define uint_t unsigned int
++#define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
+-$as_echo_n "checking for int8_t... " >&6; }
+-if test "${ac_cv_type_int8_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_int8_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (int8_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
+@@ -8422,115 +7732,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long long ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((int8_t)))
+-	  return 0;
+-  ;
++if ((ac__type_new_ *) 0)
+   return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_int8_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
+-$as_echo "$ac_cv_type_int8_t" >&6; }
+-if test "x$ac_cv_type_int8_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define int8_t char
+-_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
+-$as_echo_n "checking for uint8_t... " >&6; }
+-if test "${ac_cv_type_uint8_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_uint8_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (uint8_t))
+-       return 0;
+-  ;
++if (sizeof (ac__type_new_))
+   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 ((uint8_t)))
+-	  return 0;
+   ;
+   return 0;
+ }
+@@ -8541,54 +7750,41 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_uint8_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_long_long=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_long_long=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
+-$as_echo "$ac_cv_type_uint8_t" >&6; }
+-if test "x$ac_cv_type_uint8_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define uint8_t unsigned char
+-_ACEOF
+-
+-fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
+-$as_echo_n "checking for int16_t... " >&6; }
+-if test "${ac_cv_type_int16_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of long long" >&5
++echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_int16_t=no
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8596,11 +7792,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-if (sizeof (int16_t))
+-       return 0;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+@@ -8611,30 +7809,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_lo=0 ac_mid=0
++  while :; do
++    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
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-if (sizeof ((int16_t)))
+-	  return 0;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+@@ -8645,66 +7846,50 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_int16_t=yes
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
+-$as_echo "$ac_cv_type_int16_t" >&6; }
+-if test "x$ac_cv_type_int16_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define int16_t short
+-_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
+-$as_echo_n "checking for uint16_t... " >&6; }
+-if test "${ac_cv_type_uint16_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_uint16_t=no
+-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.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-if (sizeof (uint16_t))
+-       return 0;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+@@ -8715,30 +7900,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    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
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-if (sizeof ((uint16_t)))
+-	  return 0;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+@@ -8749,68 +7937,60 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_uint16_t=yes
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_lo= ac_hi=
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
+-$as_echo "$ac_cv_type_uint16_t" >&6; }
+-if test "x$ac_cv_type_uint16_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define uint16_t unsigned short
+-_ACEOF
+-
+-fi
+-
+ 
+-if test $ac_cv_sizeof_int -eq 4 ; then
+-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
+-$as_echo_n "checking for int32_t... " >&6; }
+-if test "${ac_cv_type_int32_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_int32_t=no
+-cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  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
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-if (sizeof (int32_t))
+-       return 0;
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+@@ -8821,18 +8001,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_long=$ac_lo;;
++'') if test "$ac_cv_type_long_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_long_long=0
++   fi ;;
++esac
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8840,81 +8042,110 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
+ int
+ main ()
+ {
+-if (sizeof ((int32_t)))
+-	  return 0;
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++    {
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%lu\n", i);
++    }
++  return ferror (f) || fclose (f) != 0;
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_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: \$? = $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") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_long=`cat conftest.val`
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_int32_t=yes
++( exit $ac_status )
++if test "$ac_cv_type_long_long" = yes; then
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++   else
++     ac_cv_sizeof_long_long=0
++   fi
+ 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
+-
+-
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
+-$as_echo "$ac_cv_type_int32_t" >&6; }
+-if test "x$ac_cv_type_int32_t" = x""yes; then
+-  :
+-else
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
++
++
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define int32_t int
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+ _ACEOF
+ 
+-fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+-$as_echo_n "checking for uint32_t... " >&6; }
+-if test "${ac_cv_type_uint32_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++
++{ echo "$as_me:$LINENO: checking for uint_t" >&5
++echo $ECHO_N "checking for uint_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_uint32_t=no
+-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.  */
+ $ac_includes_default
++typedef uint_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (uint32_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -8925,18 +8156,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint_t" >&6; }
++if test $ac_cv_type_uint_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint_t unsigned int
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for int8_t" >&5
++echo $ECHO_N "checking for int8_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_int8_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8944,11 +8201,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int8_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((uint32_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -8959,67 +8219,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_uint32_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_int8_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_int8_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+-$as_echo "$ac_cv_type_uint32_t" >&6; }
+-if test "x$ac_cv_type_uint32_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
++echo "${ECHO_T}$ac_cv_type_int8_t" >&6; }
++if test $ac_cv_type_int8_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define uint32_t unsigned int
++#define int8_t char
+ _ACEOF
+ 
+ fi
+ 
+-elif test $ac_cv_size_long -eq 4 ; then
+-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
+-$as_echo_n "checking for int32_t... " >&6; }
+-if test "${ac_cv_type_int32_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for uint8_t" >&5
++echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint8_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_int32_t=no
+-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.  */
+ $ac_includes_default
++typedef uint8_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (int32_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9030,18 +8282,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint8_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint8_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint8_t" >&6; }
++if test $ac_cv_type_uint8_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint8_t unsigned char
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for int16_t" >&5
++echo $ECHO_N "checking for int16_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_int16_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9049,11 +8327,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int16_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((int32_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9064,66 +8345,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_int32_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_int16_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_int16_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
+-$as_echo "$ac_cv_type_int32_t" >&6; }
+-if test "x$ac_cv_type_int32_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
++echo "${ECHO_T}$ac_cv_type_int16_t" >&6; }
++if test $ac_cv_type_int16_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define int32_t long
++#define int16_t short
+ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+-$as_echo_n "checking for uint32_t... " >&6; }
+-if test "${ac_cv_type_uint32_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for uint16_t" >&5
++echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint16_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_uint32_t=no
+-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.  */
+ $ac_includes_default
++typedef uint16_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (uint32_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9134,18 +8408,46 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint16_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint16_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint16_t" >&6; }
++if test $ac_cv_type_uint16_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint16_t unsigned short
++_ACEOF
++
++fi
++
++
++if test $ac_cv_sizeof_int -eq 4 ; then
++{ echo "$as_me:$LINENO: checking for int32_t" >&5
++echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_int32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9153,11 +8455,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int32_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((uint32_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9168,72 +8473,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_uint32_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_int32_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_int32_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+-$as_echo "$ac_cv_type_uint32_t" >&6; }
+-if test "x$ac_cv_type_uint32_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
++echo "${ECHO_T}$ac_cv_type_int32_t" >&6; }
++if test $ac_cv_type_int32_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define uint32_t unsigned long
++#define int32_t int
+ _ACEOF
+ 
+ fi
+ 
++{ echo "$as_me:$LINENO: checking for uint32_t" >&5
++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE no 32-bit type found" >&5
+-$as_echo "$as_me: error: LIBREPLACE no 32-bit type found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
+-$as_echo_n "checking for int64_t... " >&6; }
+-if test "${ac_cv_type_int64_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_int64_t=no
+-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.  */
+ $ac_includes_default
++typedef uint32_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (int64_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9244,18 +8536,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint32_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint32_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
++if test $ac_cv_type_uint32_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint32_t unsigned int
++_ACEOF
++
++fi
++
++elif test $ac_cv_size_long -eq 4 ; then
++{ echo "$as_me:$LINENO: checking for int32_t" >&5
++echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_int32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9263,11 +8582,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int32_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((int64_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9278,66 +8600,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_int32_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_int64_t=yes
++	ac_cv_type_int32_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
+-$as_echo "$ac_cv_type_int64_t" >&6; }
+-if test "x$ac_cv_type_int64_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
++echo "${ECHO_T}$ac_cv_type_int32_t" >&6; }
++if test $ac_cv_type_int32_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define int64_t long long
++#define int32_t long
+ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
+-$as_echo_n "checking for uint64_t... " >&6; }
+-if test "${ac_cv_type_uint64_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for uint32_t" >&5
++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_uint64_t=no
+-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.  */
+ $ac_includes_default
++typedef uint32_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (uint64_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9348,18 +8663,50 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint32_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint32_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
++if test $ac_cv_type_uint32_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint32_t unsigned long
++_ACEOF
++
++fi
++
++else
++{ { echo "$as_me:$LINENO: error: LIBREPLACE no 32-bit type found" >&5
++echo "$as_me: error: LIBREPLACE no 32-bit type found" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++{ echo "$as_me:$LINENO: checking for int64_t" >&5
++echo $ECHO_N "checking for int64_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_int64_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9367,11 +8714,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int64_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((uint64_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9382,67 +8732,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_int64_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_uint64_t=yes
++	ac_cv_type_int64_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
+-$as_echo "$ac_cv_type_uint64_t" >&6; }
+-if test "x$ac_cv_type_uint64_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
++echo "${ECHO_T}$ac_cv_type_int64_t" >&6; }
++if test $ac_cv_type_int64_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define uint64_t unsigned long long
++#define int64_t long long
+ _ACEOF
+ 
+ fi
+ 
+-
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
+-if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for uint64_t" >&5
++echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_uint64_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_size_t=no
+-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.  */
+ $ac_includes_default
++typedef uint64_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (size_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9453,18 +8795,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_uint64_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_uint64_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
++if test $ac_cv_type_uint64_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define uint64_t unsigned long long
++_ACEOF
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_size_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9472,11 +8841,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((size_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9487,39 +8859,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_size_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_size_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_size_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++if test $ac_cv_type_size_t = yes; then
+   :
+ else
+ 
+@@ -9529,24 +8892,26 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+-$as_echo_n "checking for ssize_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_ssize_t=no
+-cat >conftest.$ac_ext <<_ACEOF
++  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
++typedef ssize_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (ssize_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9557,18 +8922,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_ssize_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_ssize_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
++if test $ac_cv_type_ssize_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define ssize_t int
++_ACEOF
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_off_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9576,11 +8968,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef off_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((ssize_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -9591,57 +8986,38 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_ssize_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_off_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_off_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+-$as_echo "$ac_cv_type_ssize_t" >&6; }
+-if test "x$ac_cv_type_ssize_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ssize_t int
+-_ACEOF
+-
+-fi
+-
++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
+-$as_echo_n "checking size of off_t... " >&6; }
++{ echo "$as_me:$LINENO: checking size of off_t" >&5
++echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_off_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -9652,10 +9028,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef off_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -9668,14 +9045,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -9689,10 +9065,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef off_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -9705,21 +9082,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -9733,7 +9109,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -9743,10 +9119,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef off_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -9759,14 +9136,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -9780,10 +9156,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef off_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -9796,21 +9173,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -9824,7 +9200,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -9844,10 +9220,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef off_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -9860,21 +9237,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -9885,13 +9261,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_off_t=$ac_lo;;
+ '') if test "$ac_cv_type_off_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (off_t)
++echo "$as_me: error: cannot compute sizeof (off_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_off_t=0
+    fi ;;
+@@ -9904,8 +9278,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (off_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
++   typedef off_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -9915,22 +9290,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (off_t))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (off_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (off_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -9943,48 +9316,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_off_t=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_off_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (off_t)
++echo "$as_me: error: cannot compute sizeof (off_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_off_t=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
+-$as_echo "$ac_cv_sizeof_off_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
+ 
+ 
+ 
+@@ -9993,14 +9361,68 @@
+ _ACEOF
+ 
+ 
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_size_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef size_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_size_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_size_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+-$as_echo_n "checking size of size_t... " >&6; }
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -10011,10 +9433,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10027,14 +9450,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -10048,10 +9470,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10064,21 +9487,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -10092,7 +9514,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -10102,10 +9524,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10118,14 +9541,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -10139,10 +9561,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10155,21 +9578,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -10183,7 +9605,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -10203,10 +9625,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10219,21 +9642,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -10244,13 +9666,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+ '') if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_size_t=0
+    fi ;;
+@@ -10263,8 +9683,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (size_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
++   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -10274,22 +9695,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (size_t))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (size_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (size_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -10302,64 +9721,113 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_size_t=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_size_t=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ 
+ 
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+-_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
++_ACEOF
++
++
++{ echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_ssize_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef ssize_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_ssize_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_ssize_t=no
++fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of ssize_t" >&5
+-$as_echo_n "checking size of ssize_t... " >&6; }
++{ echo "$as_me:$LINENO: checking size of ssize_t" >&5
++echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_ssize_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -10370,10 +9838,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef ssize_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10386,14 +9855,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -10407,10 +9875,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef ssize_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10423,21 +9892,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -10451,7 +9919,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -10461,10 +9929,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef ssize_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10477,14 +9946,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -10498,10 +9966,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef ssize_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10514,21 +9983,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -10542,7 +10010,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -10562,10 +10030,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef ssize_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -10578,21 +10047,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -10603,13 +10071,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_ssize_t=$ac_lo;;
+ '') if test "$ac_cv_type_ssize_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (ssize_t)
++echo "$as_me: error: cannot compute sizeof (ssize_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_ssize_t=0
+    fi ;;
+@@ -10622,8 +10088,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (ssize_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (ssize_t)); }
++   typedef ssize_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -10633,22 +10100,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (ssize_t))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (ssize_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (ssize_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -10661,48 +10126,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_ssize_t=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_ssize_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (ssize_t)
++echo "$as_me: error: cannot compute sizeof (ssize_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_ssize_t=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
+-$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_ssize_t" >&6; }
+ 
+ 
+ 
+@@ -10712,46 +10172,11 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
+-$as_echo_n "checking for intptr_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for intptr_t" >&5
++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_intptr_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (intptr_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
+@@ -10759,11 +10184,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef intptr_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((intptr_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -10774,39 +10202,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_intptr_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_intptr_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_intptr_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+-$as_echo "$ac_cv_type_intptr_t" >&6; }
+-if test "x$ac_cv_type_intptr_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
++echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
++if test $ac_cv_type_intptr_t = yes; then
+   :
+ else
+ 
+@@ -10816,46 +10235,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
+-$as_echo_n "checking for uintptr_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for uintptr_t" >&5
++echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uintptr_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_uintptr_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (uintptr_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
+@@ -10863,11 +10247,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef uintptr_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((uintptr_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -10878,39 +10265,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_uintptr_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_uintptr_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_uintptr_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
+-$as_echo "$ac_cv_type_uintptr_t" >&6; }
+-if test "x$ac_cv_type_uintptr_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
++echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; }
++if test $ac_cv_type_uintptr_t = yes; then
+   :
+ else
+ 
+@@ -10920,46 +10298,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
+-$as_echo_n "checking for ptrdiff_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
++echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_ptrdiff_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_ptrdiff_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (ptrdiff_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
+@@ -10967,11 +10310,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef ptrdiff_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((ptrdiff_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -10982,39 +10328,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_ptrdiff_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_ptrdiff_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_ptrdiff_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
+-$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
+-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
++echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
++if test $ac_cv_type_ptrdiff_t = yes; then
+   :
+ else
+ 
+@@ -11026,23 +10363,23 @@
+ 
+ 
+ if test x"$ac_cv_type_long_long" != x"yes";then
+-	{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE needs type 'long long'" >&5
+-$as_echo "$as_me: error: LIBREPLACE needs type 'long long'" >&2;}
++	{ { echo "$as_me:$LINENO: error: LIBREPLACE needs type 'long long'" >&5
++echo "$as_me: error: LIBREPLACE needs type 'long long'" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test $ac_cv_sizeof_long_long -lt 8;then
+-	{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE needs sizeof(long long) >= 8" >&5
+-$as_echo "$as_me: error: LIBREPLACE needs sizeof(long long) >= 8" >&2;}
++	{ { echo "$as_me:$LINENO: error: LIBREPLACE needs sizeof(long long) >= 8" >&5
++echo "$as_me: error: LIBREPLACE needs sizeof(long long) >= 8" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ ############################################
+ # check if the compiler can do immediate structures
+ 
+-{ $as_echo "$as_me:$LINENO: checking for immediate structures" >&5
+-$as_echo_n "checking for immediate structures... " >&6; }
++{ echo "$as_me:$LINENO: checking for immediate structures" >&5
++echo $ECHO_N "checking for immediate structures... $ECHO_C" >&6; }
+ if test "${libreplace_cv_immediate_structures+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -11079,21 +10416,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_immediate_structures=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_immediate_structures=no
+@@ -11102,8 +10438,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_immediate_structures" >&5
+-$as_echo "$libreplace_cv_immediate_structures" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_immediate_structures" >&5
++echo "${ECHO_T}$libreplace_cv_immediate_structures" >&6; }
+ if test x"$libreplace_cv_immediate_structures" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -11127,8 +10463,8 @@
+ 	fi
+ done
+ if test x"$tallocdir" = "x"; then
+-   { { $as_echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
+-$as_echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
++   { { echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
++echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ TALLOC_OBJ="talloc.o"
+@@ -11140,14 +10476,68 @@
+ TALLOC_LIBS=""
+ 
+ 
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_size_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef size_t ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_size_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_size_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+-$as_echo_n "checking size of size_t... " >&6; }
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -11158,10 +10548,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11174,14 +10565,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -11195,10 +10585,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11211,21 +10602,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -11239,7 +10629,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -11249,10 +10639,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11265,14 +10656,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -11286,10 +10676,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11302,21 +10693,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -11330,7 +10720,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -11350,10 +10740,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11366,21 +10757,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -11391,13 +10781,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+ '') if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_size_t=0
+    fi ;;
+@@ -11410,8 +10798,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (size_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
++   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -11421,22 +10810,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (size_t))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (size_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (size_t))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -11449,48 +10836,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_size_t=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_size_t=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ 
+ 
+ 
+@@ -11499,14 +10881,68 @@
+ _ACEOF
+ 
+ 
++{ echo "$as_me:$LINENO: checking for void *" >&5
++echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
++if test "${ac_cv_type_void_p+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef void * ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_void_p=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_void_p=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
++echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
+-$as_echo_n "checking size of void *... " >&6; }
++{ echo "$as_me:$LINENO: checking size of void *" >&5
++echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_void_p+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -11517,10 +10953,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef void * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11533,14 +10970,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -11554,10 +10990,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef void * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11570,21 +11007,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -11598,7 +11034,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -11608,10 +11044,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef void * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11624,14 +11061,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -11645,10 +11081,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef void * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11661,21 +11098,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -11689,7 +11125,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -11709,10 +11145,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef void * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11725,21 +11162,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -11750,13 +11186,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_void_p=$ac_lo;;
+ '') if test "$ac_cv_type_void_p" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
++echo "$as_me: error: cannot compute sizeof (void *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_void_p=0
+    fi ;;
+@@ -11769,8 +11203,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (void *)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
++   typedef void * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -11780,22 +11215,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (void *))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (void *))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (void *))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -11808,48 +11241,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_void_p=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_void_p" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
++echo "$as_me: error: cannot compute sizeof (void *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_void_p=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+-$as_echo "$ac_cv_sizeof_void_p" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+ 
+ 
+ 
+@@ -11860,16 +11288,16 @@
+ 
+ 
+ if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: size_t cannot represent the amount of used memory of a process" >&5
+-$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: please report this to <samba-technical at samba.org>" >&5
+-$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
+-$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
+-$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
+-	{ { $as_echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
+-$as_echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: size_t cannot represent the amount of used memory of a process" >&5
++echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: please report this to <samba-technical at samba.org>" >&5
++echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
++echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
++echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
++	{ { echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
++echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -12068,10 +11496,10 @@
+ if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
+     	DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
+ 	# Add -Wdeclaration-after-statement if compiler supports it
+-	{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -Wdeclaration-after-statement" >&5
+-$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++	{ echo "$as_me:$LINENO: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++echo $ECHO_N "checking that the C compiler understands -Wdeclaration-after-statement... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -12105,32 +11533,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_Wdeclaration_after_statement=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_Wdeclaration_after_statement=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
+ 
+@@ -12147,18 +11572,18 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
+-$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++echo "${ECHO_T}$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+ 
+ 	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
+ 	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
+ 	fi
+ 
+ 	#-Werror-implicit-function-declaration
+-	{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
+-$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
++	{ echo "$as_me:$LINENO: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
++echo $ECHO_N "checking that the C compiler understands -Werror-implicit-function-declaration... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -12192,32 +11617,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_Werror_implicit_function_declaration=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
+ 
+@@ -12234,8 +11656,8 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
+-$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++echo "${ECHO_T}$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
+        if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
+ 	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
+        fi
+@@ -12274,15 +11696,15 @@
+ 
+ #################################################
+ # check for a shared memory profiling support
+-{ $as_echo "$as_me:$LINENO: checking whether to use profiling" >&5
+-$as_echo_n "checking whether to use profiling... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use profiling" >&5
++echo $ECHO_N "checking whether to use profiling... $ECHO_C" >&6; }
+ 
+ # Check whether --with-profiling-data was given.
+ if test "${with_profiling_data+set}" = set; then
+   withval=$with_profiling_data;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_PROFILE 1
+@@ -12291,14 +11713,14 @@
+     samba_cv_WITH_PROFILE=yes
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     samba_cv_WITH_PROFILE=no
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -12317,12 +11739,11 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -12351,29 +11772,17 @@
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+-	    rm -rf conftest.one conftest.two conftest.dir
+-	    echo one > conftest.one
+-	    echo two > conftest.two
+-	    mkdir conftest.dir
+-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+-	      test -s conftest.one && test -s conftest.two &&
+-	      test -s conftest.dir/conftest.one &&
+-	      test -s conftest.dir/conftest.two
+-	    then
+-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	      break 3
+-	    fi
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
+ 	  fi
+ 	fi
+       done
+     done
+     ;;
+ esac
+-
+ done
+ IFS=$as_save_IFS
+ 
+-rm -rf conftest.one conftest.two conftest.dir
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+@@ -12386,8 +11795,8 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -12401,10 +11810,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+@@ -12417,7 +11826,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -12428,11 +11837,11 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+-$as_echo "$AWK" >&6; }
++  { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -12441,10 +11850,10 @@
+ 
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PERL+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   case $PERL in
+   [\\/]* | ?:[\\/]*)
+@@ -12459,7 +11868,7 @@
+   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_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -12471,11 +11880,11 @@
+ fi
+ PERL=$ac_cv_path_PERL
+ if test -n "$PERL"; then
+-  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+-$as_echo "$PERL" >&6; }
++  { echo "$as_me:$LINENO: result: $PERL" >&5
++echo "${ECHO_T}$PERL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -12483,10 +11892,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -12499,7 +11908,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -12510,11 +11919,11 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+-$as_echo "$AR" >&6; }
++  { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -12523,10 +11932,10 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_AR"; then
+   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+@@ -12539,7 +11948,7 @@
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -12550,11 +11959,11 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_AR" = x; then
+@@ -12562,8 +11971,12 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     AR=$ac_ct_AR
+@@ -12574,10 +11987,10 @@
+ 
+ 
+ LD=ld
+-{ $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; }
++{ 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; }
+ if test "${ac_cv_prog_gnu_ld+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+@@ -12586,17 +11999,17 @@
+   ac_cv_prog_gnu_ld=no
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
+-$as_echo "$ac_cv_prog_gnu_ld" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6; }
+ 
+ 
+ if test "$ac_cv_prog_gnu_ld" = "yes"; then
+ 	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
+-	{ $as_echo "$as_me:$LINENO: checking GNU ld release date" >&5
+-$as_echo_n "checking GNU ld release date... " >&6; }
++	{ echo "$as_me:$LINENO: checking GNU ld release date" >&5
++echo $ECHO_N "checking GNU ld release date... $ECHO_C" >&6; }
+ 		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+-		{ $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_date}" >&5
+-$as_echo "${ac_cv_gnu_ld_date}" >&6; }
++		{ echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_date}" >&5
++echo "${ECHO_T}${ac_cv_gnu_ld_date}" >&6; }
+         if test -n "$ac_cv_gnu_ld_date"; then
+  	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
+  		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+@@ -12605,21 +12018,21 @@
+ 		ac_cv_gnu_ld_version_script=yes
+ 	fi
+         else
+-           { $as_echo "$as_me:$LINENO: checking GNU ld release version" >&5
+-$as_echo_n "checking GNU ld release version... " >&6; }
++           { echo "$as_me:$LINENO: checking GNU ld release version" >&5
++echo $ECHO_N "checking GNU ld release version... $ECHO_C" >&6; }
+                       ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+            ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
+            ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
+-                      { $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr}" >&5
+-$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
+-           { $as_echo "$as_me:$LINENO: checking GNU ld release version major" >&5
+-$as_echo_n "checking GNU ld release version major... " >&6; }
+-           { $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr_major}" >&5
+-$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
+-           { $as_echo "$as_me:$LINENO: checking GNU ld release version minor" >&5
+-$as_echo_n "checking GNU ld release version minor... " >&6; }
+-           { $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
+-$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
++                      { echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr}" >&5
++echo "${ECHO_T}${ac_cv_gnu_ld_vernr}" >&6; }
++           { echo "$as_me:$LINENO: checking GNU ld release version major" >&5
++echo $ECHO_N "checking GNU ld release version major... $ECHO_C" >&6; }
++           { echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr_major}" >&5
++echo "${ECHO_T}${ac_cv_gnu_ld_vernr_major}" >&6; }
++           { echo "$as_me:$LINENO: checking GNU ld release version minor" >&5
++echo $ECHO_N "checking GNU ld release version minor... $ECHO_C" >&6; }
++           { echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
++echo "${ECHO_T}${ac_cv_gnu_ld_vernr_minor}" >&6; }
+            if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
+              ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+            fi
+@@ -12632,16 +12045,16 @@
+ 
+ 
+ if test "x$CC" != xcc; then
+-  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
++echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
++echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+ fi
+-set dummy $CC; ac_cc=`$as_echo "$2" |
++set dummy $CC; ac_cc=`echo $2 |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+ if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -12667,21 +12080,19 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+    test -f conftest2.$ac_objext && { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+@@ -12692,11 +12103,10 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+       rm -f conftest2.*
+@@ -12704,21 +12114,19 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); };
+       then
+ 	# cc works too.
+@@ -12736,11 +12144,11 @@
+ 
+ fi
+ if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define NO_MINUS_C_MINUS_O 1
+@@ -12755,10 +12163,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -Werror" >&5
+-$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands -Werror" >&5
++echo $ECHO_N "checking that the C compiler understands -Werror... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_Werror+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -12792,32 +12200,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_Werror=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_Werror=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
+ 
+@@ -12833,15 +12238,15 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_Werror" >&5
+-$as_echo "$samba_cv_HAVE_Werror" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_Werror" >&5
++echo "${ECHO_T}$samba_cv_HAVE_Werror" >&6; }
+ if test x"$samba_cv_HAVE_Werror" = x"yes"; then
+    Werror_FLAGS="-Werror"
+ else
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -w2" >&5
+-$as_echo_n "checking that the C compiler understands -w2... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands -w2" >&5
++echo $ECHO_N "checking that the C compiler understands -w2... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_w2+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -12875,32 +12280,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_w2=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_w2=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
+ 
+@@ -12916,15 +12318,15 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_w2" >&5
+-$as_echo "$samba_cv_HAVE_w2" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_w2" >&5
++echo "${ECHO_T}$samba_cv_HAVE_w2" >&6; }
+ if test x"$samba_cv_HAVE_w2" = x"yes"; then
+    Werror_FLAGS="-w2"
+ else
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -errwarn" >&5
+-$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands -errwarn" >&5
++echo $ECHO_N "checking that the C compiler understands -errwarn... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_errwarn+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -12958,32 +12360,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_errwarn=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_errwarn=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
+ 
+@@ -12999,18 +12398,18 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_errwarn" >&5
+-$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_errwarn" >&5
++echo "${ECHO_T}$samba_cv_HAVE_errwarn" >&6; }
+ if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
+    Werror_FLAGS="-errwarn=%all"
+ fi
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands volatile" >&5
+-$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands volatile" >&5
++echo $ECHO_N "checking that the C compiler understands volatile... $ECHO_C" >&6; }
+ if test "${samba_cv_volatile+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -13034,21 +12433,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_volatile=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_volatile=no
+@@ -13056,8 +12454,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_volatile" >&5
+-$as_echo "$samba_cv_volatile" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_volatile" >&5
++echo "${ECHO_T}$samba_cv_volatile" >&6; }
+ if test x"$samba_cv_volatile" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -13071,20 +12469,18 @@
+ # and don't truncate the values to INT_MAX
+ # a runtime test is needed here
+ 
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands negative enum values" >&5
+-$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands negative enum values" >&5
++echo $ECHO_N "checking that the C compiler understands negative enum values... $ECHO_C" >&6; }
+ if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -13118,42 +12514,39 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv__CC_NEGATIVE_ENUM_VALUES=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
+-$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
++echo "${ECHO_T}$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
+ if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: using --unit-enums for pidl" >&5
+-$as_echo "$as_me: WARNING: using --unit-enums for pidl" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: using --unit-enums for pidl" >&5
++echo "$as_me: WARNING: using --unit-enums for pidl" >&2;}
+ 	PIDL_ARGS="$PIDL_ARGS --uint-enums"
+ fi
+ 
+@@ -13162,8 +12555,8 @@
+ saved_CFLAGS="$CFLAGS";
+ c99_init=no
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers" >&5
+-$as_echo_n "checking for C99 designated initializers... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers" >&5
++echo $ECHO_N "checking for C99 designated initializers... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13188,33 +12581,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -AC99" >&5
+-$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -AC99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -AC99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -AC99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13239,33 +12631,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=extc99" >&5
+-$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -qlanglvl=extc99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13290,33 +12681,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
+-$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -qlanglvl=stdc99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13341,33 +12731,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test x"$c99_init" = x"no"; then
+-    { $as_echo "$as_me:$LINENO: checking for C99 designated initializers with -c99" >&5
+-$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
++    { echo "$as_me:$LINENO: checking for C99 designated initializers with -c99" >&5
++echo $ECHO_N "checking for C99 designated initializers with -c99... $ECHO_C" >&6; }
+     CFLAGS="$saved_CFLAGS -c99"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13392,26 +12781,25 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; c99_init=yes
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }; c99_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -13432,41 +12820,41 @@
+ else
+     CFLAGS="$saved_CFLAGS"
+     saved_CFLAGS=""
+-    { { $as_echo "$as_me:$LINENO: error: c99 structure initializer are not supported" >&5
+-$as_echo "$as_me: error: c99 structure initializer are not supported" >&2;}
++    { { echo "$as_me:$LINENO: error: c99 structure initializer are not supported" >&5
++echo "$as_me: error: c99 structure initializer are not supported" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 
+ UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
+-{ $as_echo "$as_me:$LINENO: checking uname -s" >&5
+-$as_echo_n "checking uname -s... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: ${UNAME_S}" >&5
+-$as_echo "${UNAME_S}" >&6; }
++{ echo "$as_me:$LINENO: checking uname -s" >&5
++echo $ECHO_N "checking uname -s... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: ${UNAME_S}" >&5
++echo "${ECHO_T}${UNAME_S}" >&6; }
+ 
+ UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
+-{ $as_echo "$as_me:$LINENO: checking uname -r" >&5
+-$as_echo_n "checking uname -r... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: ${UNAME_R}" >&5
+-$as_echo "${UNAME_R}" >&6; }
++{ echo "$as_me:$LINENO: checking uname -r" >&5
++echo $ECHO_N "checking uname -r... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: ${UNAME_R}" >&5
++echo "${ECHO_T}${UNAME_R}" >&6; }
+ 
+ UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
+-{ $as_echo "$as_me:$LINENO: checking uname -m" >&5
+-$as_echo_n "checking uname -m... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: ${UNAME_M}" >&5
+-$as_echo "${UNAME_M}" >&6; }
++{ echo "$as_me:$LINENO: checking uname -m" >&5
++echo $ECHO_N "checking uname -m... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: ${UNAME_M}" >&5
++echo "${ECHO_T}${UNAME_M}" >&6; }
+ 
+ UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
+-{ $as_echo "$as_me:$LINENO: checking uname -p" >&5
+-$as_echo_n "checking uname -p... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: ${UNAME_P}" >&5
+-$as_echo "${UNAME_P}" >&6; }
++{ echo "$as_me:$LINENO: checking uname -p" >&5
++echo $ECHO_N "checking uname -p... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: ${UNAME_P}" >&5
++echo "${ECHO_T}${UNAME_P}" >&6; }
+ 
+ UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
+-{ $as_echo "$as_me:$LINENO: checking uname -i" >&5
+-$as_echo_n "checking uname -i... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: ${UNAME_I}" >&5
+-$as_echo "${UNAME_I}" >&6; }
++{ echo "$as_me:$LINENO: checking uname -i" >&5
++echo $ECHO_N "checking uname -i... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: ${UNAME_I}" >&5
++echo "${ECHO_T}${UNAME_I}" >&6; }
+ 
+   case "$host_os" in
+ 	*irix6*)
+@@ -13516,8 +12904,8 @@
+ #
+ # CRAY Unicos has broken const handling
+        *unicos*)
+-	  { $as_echo "$as_me:$LINENO: result: disabling const" >&5
+-$as_echo "disabling const" >&6; }
++	  { echo "$as_me:$LINENO: result: disabling const" >&5
++echo "${ECHO_T}disabling const" >&6; }
+ 	  CPPFLAGS="$CPPFLAGS -Dconst="
+ 	  ;;
+ 
+@@ -13526,8 +12914,8 @@
+ # files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
+ #
+     *aix4*)
+-	  { $as_echo "$as_me:$LINENO: result: enabling large file support" >&5
+-$as_echo "enabling large file support" >&6; }
++	  { echo "$as_me:$LINENO: result: enabling large file support" >&5
++echo "${ECHO_T}enabling large file support" >&6; }
+       CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -13553,12 +12941,12 @@
+ 
+ 		case `uname -r` in
+ 			5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
+-	  			{ $as_echo "$as_me:$LINENO: result: no large file support" >&5
+-$as_echo "no large file support" >&6; }
++	  			{ echo "$as_me:$LINENO: result: no large file support" >&5
++echo "${ECHO_T}no large file support" >&6; }
+ 				;;
+ 			5.*)
+-			{ $as_echo "$as_me:$LINENO: result: enabling large file support" >&5
+-$as_echo "enabling large file support" >&6; }
++			{ echo "$as_me:$LINENO: result: enabling large file support" >&5
++echo "${ECHO_T}enabling large file support" >&6; }
+ 			if test "$ac_cv_c_compiler_gnu" = yes; then
+ 				${CC-cc} -v >conftest.c 2>&1
+ 				ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
+@@ -13655,8 +13043,8 @@
+ #
+     *sysv4*)
+       if test $host = mips-sni-sysv4 ; then
+-        { $as_echo "$as_me:$LINENO: checking for LFS support" >&5
+-$as_echo_n "checking for LFS support... " >&6; }
++        { echo "$as_me:$LINENO: checking for LFS support" >&5
++echo $ECHO_N "checking for LFS support... $ECHO_C" >&6; }
+         old_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+         if test "$cross_compiling" = yes; then
+@@ -13684,32 +13072,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   SINIX_LFS_SUPPORT=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ SINIX_LFS_SUPPORT=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
+ 
+@@ -13726,16 +13111,37 @@
+           LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
+           LIBS="`getconf LFS64_LIBS` $LIBS"
+         fi
+-      { $as_echo "$as_me:$LINENO: result: $SINIX_LFS_SUPPORT" >&5
+-$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++      { echo "$as_me:$LINENO: result: $SINIX_LFS_SUPPORT" >&5
++echo "${ECHO_T}$SINIX_LFS_SUPPORT" >&6; }
        fi
      ;;
  
@@ -131,17 +12195,30569 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -41223,7 +41250,7 @@
+-        { $as_echo "$as_me:$LINENO: checking for LFS support" >&5
+-$as_echo_n "checking for LFS support... " >&6; }
++        { echo "$as_me:$LINENO: checking for LFS support" >&5
++echo $ECHO_N "checking for LFS support... $ECHO_C" >&6; }
+         old_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
+        if test "$cross_compiling" = yes; then
+@@ -13791,32 +13197,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LINUX_LFS_SUPPORT=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ LINUX_LFS_SUPPORT=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
+ 
+@@ -13840,8 +13243,8 @@
+ _ACEOF
+ 
+ 	fi
+-	{ $as_echo "$as_me:$LINENO: result: $LINUX_LFS_SUPPORT" >&5
+-$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++	{ echo "$as_me:$LINENO: result: $LINUX_LFS_SUPPORT" >&5
++echo "${ECHO_T}$LINUX_LFS_SUPPORT" >&6; }
+ 	;;
+ 
  #
+@@ -13860,8 +13263,8 @@
+ 
+ 	;;
+     *hurd*)
+-        { $as_echo "$as_me:$LINENO: checking for LFS support" >&5
+-$as_echo_n "checking for LFS support... " >&6; }
++        { echo "$as_me:$LINENO: checking for LFS support" >&5
++echo $ECHO_N "checking for LFS support... $ECHO_C" >&6; }
+         old_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
+         if test "$cross_compiling" = yes; then
+@@ -13889,32 +13292,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   GLIBC_LFS_SUPPORT=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ GLIBC_LFS_SUPPORT=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
+ 
+@@ -13933,8 +13333,8 @@
+ _ACEOF
+ 
+         fi
+-      { $as_echo "$as_me:$LINENO: result: $GLIBC_LFS_SUPPORT" >&5
+-$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
++      { echo "$as_me:$LINENO: result: $GLIBC_LFS_SUPPORT" >&5
++echo "${ECHO_T}$GLIBC_LFS_SUPPORT" >&6; }
+     ;;
+ 
+ esac
+@@ -13958,10 +13358,10 @@
+ 
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
+ 
+-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+-$as_echo_n "checking return type of signal handlers... " >&6; }
++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+ if test "${ac_cv_type_signal+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -13986,21 +13386,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=int
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_type_signal=void
+@@ -14008,18 +13407,18 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+-$as_echo "$ac_cv_type_signal" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -14039,8 +13438,8 @@
+ rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+-$as_echo "$ac_cv_type_uid_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+ if test $ac_cv_type_uid_t = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -14054,46 +13453,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+-$as_echo_n "checking for mode_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for mode_t" >&5
++echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_mode_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_mode_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (mode_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14101,11 +13465,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef mode_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((mode_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14116,39 +13483,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_mode_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_mode_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_mode_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+-$as_echo "$ac_cv_type_mode_t" >&6; }
+-if test "x$ac_cv_type_mode_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
++echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
++if test $ac_cv_type_mode_t = yes; then
+   :
+ else
+ 
+@@ -14158,46 +13516,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+-$as_echo_n "checking for off_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_off_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_off_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (off_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14205,11 +13528,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef off_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((off_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14220,39 +13546,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_off_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_off_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_off_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-$as_echo "$ac_cv_type_off_t" >&6; }
+-if test "x$ac_cv_type_off_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
++if test $ac_cv_type_off_t = yes; then
+   :
+ else
+ 
+@@ -14262,46 +13579,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_size_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (size_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14309,11 +13591,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((size_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14324,39 +13609,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_size_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_size_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_size_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++if test $ac_cv_type_size_t = yes; then
+   :
+ else
+ 
+@@ -14366,46 +13642,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for pid_t" >&5
++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_pid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_pid_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (pid_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14413,11 +13654,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef pid_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((pid_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14428,39 +13672,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_pid_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_pid_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_pid_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-$as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
++echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
++if test $ac_cv_type_pid_t = yes; then
+   :
+ else
+ 
+@@ -14470,10 +13705,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
+-$as_echo_n "checking for struct stat.st_rdev... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
++echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -14498,21 +13733,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_stat_st_rdev=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -14538,21 +13772,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_stat_st_rdev=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_stat_st_rdev=no
+@@ -14563,166 +13796,27 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_RDEV 1
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ST_RDEV 1
+-_ACEOF
+-
+-fi
+-
+-
+-{ $as_echo "$as_me:$LINENO: checking for ino_t" >&5
+-$as_echo_n "checking for ino_t... " >&6; }
+-if test "${ac_cv_type_ino_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_ino_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (ino_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 ((ino_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_ino_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
+-$as_echo "$ac_cv_type_ino_t" >&6; }
+-if test "x$ac_cv_type_ino_t" = x""yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ino_t unsigned
+-_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for loff_t" >&5
+-$as_echo_n "checking for loff_t... " >&6; }
+-if test "${ac_cv_type_loff_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_loff_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (loff_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
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
++echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
++if test $ac_cv_member_struct_stat_st_rdev = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_RDEV 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ST_RDEV 1
++_ACEOF
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for ino_t" >&5
++echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_ino_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14730,11 +13824,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef ino_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((loff_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14745,66 +13842,59 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_loff_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_ino_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_ino_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
+-$as_echo "$ac_cv_type_loff_t" >&6; }
+-if test "x$ac_cv_type_loff_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
++echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
++if test $ac_cv_type_ino_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define loff_t off_t
++#define ino_t unsigned
+ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for offset_t" >&5
+-$as_echo_n "checking for offset_t... " >&6; }
+-if test "${ac_cv_type_offset_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++{ echo "$as_me:$LINENO: checking for loff_t" >&5
++echo $ECHO_N "checking for loff_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_loff_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_offset_t=no
+-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.  */
+ $ac_includes_default
++typedef loff_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof (offset_t))
+-       return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14815,18 +13905,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  ac_cv_type_loff_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_loff_t=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
++echo "${ECHO_T}$ac_cv_type_loff_t" >&6; }
++if test $ac_cv_type_loff_t = yes; then
++  :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for offset_t" >&5
++echo $ECHO_N "checking for offset_t... $ECHO_C" >&6; }
++if test "${ac_cv_type_offset_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -14834,11 +13950,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef offset_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((offset_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -14849,39 +13968,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_offset_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_offset_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_offset_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_offset_t" >&5
+-$as_echo "$ac_cv_type_offset_t" >&6; }
+-if test "x$ac_cv_type_offset_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_offset_t" >&5
++echo "${ECHO_T}$ac_cv_type_offset_t" >&6; }
++if test $ac_cv_type_offset_t = yes; then
+   :
+ else
+ 
+@@ -14892,10 +14002,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
+-$as_echo_n "checking for working memcmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for working memcmp" >&5
++echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+ if test "${ac_cv_func_memcmp_working+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_memcmp_working=no
+@@ -14945,39 +14055,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memcmp_working=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_memcmp_working=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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+-$as_echo "$ac_cv_func_memcmp_working" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
++echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+   *" memcmp.$ac_objext "* ) ;;
+   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+@@ -14998,11 +14105,11 @@
+ 
+ for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -15055,42 +14162,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -15102,21 +14202,20 @@
+ 
+ for ac_header in stdbool.h stdint.h sys/select.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15132,33 +14231,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15172,52 +14270,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -15226,24 +14323,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -15253,21 +14347,20 @@
+ 
+ for ac_header in setjmp.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15283,33 +14376,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15323,52 +14415,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -15377,24 +14468,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -15403,17 +14491,17 @@
+ 
+ 
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
+-$as_echo_n "checking for stdint.h... " >&6; }
++  { echo "$as_me:$LINENO: checking for stdint.h" >&5
++echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
+-$as_echo "$ac_cv_header_stdint_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
++echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking stdint.h usability" >&5
+-$as_echo_n "checking stdint.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking stdint.h usability" >&5
++echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15429,33 +14517,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking stdint.h presence" >&5
+-$as_echo_n "checking stdint.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking stdint.h presence" >&5
++echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15469,52 +14556,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: stdint.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: stdint.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -15523,18 +14609,18 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
+-$as_echo_n "checking for stdint.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for stdint.h" >&5
++echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_stdint_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
+-$as_echo "$ac_cv_header_stdint_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
++echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_stdint_h" = x""yes; then
++if test $ac_cv_header_stdint_h = yes; then
+    ac_config_commands="$ac_config_commands rm-stdint.h"
+ 
+ else
+@@ -15546,17 +14632,17 @@
+ 
+ 
+ if test "${ac_cv_header_stdbool_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for stdbool.h" >&5
+-$as_echo_n "checking for stdbool.h... " >&6; }
++  { echo "$as_me:$LINENO: checking for stdbool.h" >&5
++echo $ECHO_N "checking for stdbool.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdbool_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+-$as_echo "$ac_cv_header_stdbool_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
++echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking stdbool.h usability" >&5
+-$as_echo_n "checking stdbool.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking stdbool.h usability" >&5
++echo $ECHO_N "checking stdbool.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15572,33 +14658,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking stdbool.h presence" >&5
+-$as_echo_n "checking stdbool.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking stdbool.h presence" >&5
++echo $ECHO_N "checking stdbool.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -15612,52 +14697,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: stdbool.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: stdbool.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: stdbool.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: stdbool.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: stdbool.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: stdbool.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: stdbool.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: stdbool.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: stdbool.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: stdbool.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: stdbool.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: stdbool.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: stdbool.h: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -15666,18 +14750,18 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for stdbool.h" >&5
+-$as_echo_n "checking for stdbool.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for stdbool.h" >&5
++echo $ECHO_N "checking for stdbool.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdbool_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_stdbool_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+-$as_echo "$ac_cv_header_stdbool_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
++echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_stdbool_h" = x""yes; then
++if test $ac_cv_header_stdbool_h = yes; then
+    ac_config_commands="$ac_config_commands rm-stdbool.h"
+ 
+ else
+@@ -15689,52 +14773,11 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for bool" >&5
+-$as_echo_n "checking for bool... " >&6; }
++{ echo "$as_me:$LINENO: checking for bool" >&5
++echo $ECHO_N "checking for bool... $ECHO_C" >&6; }
+ if test "${ac_cv_type_bool+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_bool=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
+-#ifdef HAVE_STDBOOL_H
+-#include <stdbool.h>
+-#endif
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (bool))
+-       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
+@@ -15748,11 +14791,14 @@
+ #endif
+ 
+ 
++typedef bool ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((bool)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -15763,39 +14809,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_bool=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_bool=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_bool=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_bool" >&5
+-$as_echo "$ac_cv_type_bool" >&6; }
+-if test "x$ac_cv_type_bool" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_bool" >&5
++echo "${ECHO_T}$ac_cv_type_bool" >&6; }
++if test $ac_cv_type_bool = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_BOOL 1
+@@ -15804,52 +14841,11 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+-$as_echo_n "checking for _Bool... " >&6; }
++{ echo "$as_me:$LINENO: checking for _Bool" >&5
++echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
+ if test "${ac_cv_type__Bool+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type__Bool=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
+-#ifdef HAVE_STDBOOL_H
+-#include <stdbool.h>
+-#endif
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (_Bool))
+-       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
+@@ -15863,11 +14859,14 @@
+ #endif
+ 
+ 
++typedef _Bool ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((_Bool)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -15878,39 +14877,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type__Bool=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type__Bool=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type__Bool=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+-$as_echo "$ac_cv_type__Bool" >&6; }
+-if test "x$ac_cv_type__Bool" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
++echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
++if test $ac_cv_type__Bool = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE__Bool 1
+@@ -15919,10 +14909,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+-$as_echo_n "checking for working mmap... " >&6; }
++{ echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_MMAP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -15942,39 +14932,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_MMAP=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_MMAP=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_MMAP" >&5
+-$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_MMAP" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_MMAP" >&6; }
+ if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -15988,21 +14975,20 @@
+ 
+ for ac_header in sys/syslog.h syslog.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16018,33 +15004,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16058,52 +15043,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -16112,24 +15096,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16140,21 +15121,20 @@
+ 
+ for ac_header in sys/time.h time.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16170,33 +15150,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16210,52 +15189,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -16264,24 +15242,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16292,21 +15267,20 @@
+ 
+ for ac_header in stdarg.h vararg.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16322,33 +15296,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16362,52 +15335,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -16416,24 +15388,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16444,21 +15413,20 @@
+ 
+ for ac_header in sys/mount.h mntent.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16474,33 +15442,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16514,52 +15481,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -16568,24 +15534,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16595,21 +15558,20 @@
+ 
+ for ac_header in stropts.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16625,33 +15587,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16665,52 +15626,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -16719,24 +15679,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16753,11 +15710,11 @@
+ 
+ for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -16810,42 +15767,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16859,11 +15809,11 @@
+ 
+ for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -16916,42 +15866,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -16965,11 +15908,11 @@
+ 
+ for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17022,42 +15965,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -17071,11 +16007,11 @@
+ 
+ for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17128,42 +16064,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -17172,11 +16101,11 @@
+ 
+ for ac_func in isatty
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17229,52 +16158,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for setresuid declaration" >&5
+-$as_echo_n "checking for setresuid declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for setresuid declaration" >&5
++echo $ECHO_N "checking for setresuid declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_setresuid_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -17298,21 +16220,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_setresuid_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_setresuid_decl=no
+@@ -17320,8 +16241,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_setresuid_decl" >&5
+-$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_setresuid_decl" >&5
++echo "${ECHO_T}$ac_cv_have_setresuid_decl" >&6; }
+  if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -17331,10 +16252,10 @@
+  fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for setresgid declaration" >&5
+-$as_echo_n "checking for setresgid declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for setresgid declaration" >&5
++echo $ECHO_N "checking for setresgid declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_setresgid_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -17358,21 +16279,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_setresgid_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_setresgid_decl=no
+@@ -17380,8 +16300,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_setresgid_decl" >&5
+-$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_setresgid_decl" >&5
++echo "${ECHO_T}$ac_cv_have_setresgid_decl" >&6; }
+  if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -17391,10 +16311,10 @@
+  fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for errno declaration" >&5
+-$as_echo_n "checking for errno declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for errno declaration" >&5
++echo $ECHO_N "checking for errno declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_errno_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -17418,21 +16338,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_errno_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_errno_decl=no
+@@ -17440,8 +16359,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_errno_decl" >&5
+-$as_echo "$ac_cv_have_errno_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_errno_decl" >&5
++echo "${ECHO_T}$ac_cv_have_errno_decl" >&6; }
+  if test x"$ac_cv_have_errno_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -17451,10 +16370,10 @@
+  fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for secure mkstemp" >&5
+-$as_echo_n "checking for secure mkstemp... " >&6; }
++{ echo "$as_me:$LINENO: checking for secure mkstemp" >&5
++echo $ECHO_N "checking for secure mkstemp... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -17487,39 +16406,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_SECURE_MKSTEMP=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_SECURE_MKSTEMP=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
+-$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
+ if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -17532,21 +16448,20 @@
+ 
+ for ac_header in stdio.h strings.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -17562,33 +16477,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -17602,52 +16516,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -17656,34 +16569,31 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
+-$as_echo_n "checking whether snprintf is declared... " >&6; }
++{ echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
++echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_snprintf+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17709,21 +16619,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_snprintf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_decl_snprintf=no
+@@ -17731,9 +16640,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
+-$as_echo "$ac_cv_have_decl_snprintf" >&6; }
+-if test "x$ac_cv_have_decl_snprintf" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6; }
++if test $ac_cv_have_decl_snprintf = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_SNPRINTF 1
+@@ -17747,10 +16656,10 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5
+-$as_echo_n "checking whether vsnprintf is declared... " >&6; }
++{ echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5
++echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17776,21 +16685,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_vsnprintf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_decl_vsnprintf=no
+@@ -17798,9 +16706,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5
+-$as_echo "$ac_cv_have_decl_vsnprintf" >&6; }
+-if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6; }
++if test $ac_cv_have_decl_vsnprintf = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_VSNPRINTF 1
+@@ -17814,10 +16722,10 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking whether asprintf is declared" >&5
+-$as_echo_n "checking whether asprintf is declared... " >&6; }
++{ echo "$as_me:$LINENO: checking whether asprintf is declared" >&5
++echo $ECHO_N "checking whether asprintf is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_asprintf+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17843,21 +16751,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_asprintf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_decl_asprintf=no
+@@ -17865,9 +16772,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_asprintf" >&5
+-$as_echo "$ac_cv_have_decl_asprintf" >&6; }
+-if test "x$ac_cv_have_decl_asprintf" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_asprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl_asprintf" >&6; }
++if test $ac_cv_have_decl_asprintf = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_ASPRINTF 1
+@@ -17881,10 +16788,10 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking whether vasprintf is declared" >&5
+-$as_echo_n "checking whether vasprintf is declared... " >&6; }
++{ echo "$as_me:$LINENO: checking whether vasprintf is declared" >&5
++echo $ECHO_N "checking whether vasprintf is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_vasprintf+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -17910,21 +16817,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_vasprintf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_decl_vasprintf=no
+@@ -17932,9 +16838,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_vasprintf" >&5
+-$as_echo "$ac_cv_have_decl_vasprintf" >&6; }
+-if test "x$ac_cv_have_decl_vasprintf" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vasprintf" >&5
++echo "${ECHO_T}$ac_cv_have_decl_vasprintf" >&6; }
++if test $ac_cv_have_decl_vasprintf = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_VASPRINTF 1
+@@ -17956,11 +16862,11 @@
+ 
+ for ac_func in snprintf vsnprintf asprintf vasprintf
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -18013,52 +16919,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5
+-$as_echo_n "checking for C99 vsnprintf... " >&6; }
++{ echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5
++echo $ECHO_N "checking for C99 vsnprintf... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -18110,39 +17009,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_C99_VSNPRINTF=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_C99_VSNPRINTF=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
+-$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
+ if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18152,10 +17048,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for va_copy" >&5
+-$as_echo_n "checking for va_copy... " >&6; }
++{ echo "$as_me:$LINENO: checking for va_copy" >&5
++echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -18180,35 +17076,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   libreplace_cv_HAVE_VA_COPY=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_VA_COPY=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_VA_COPY" >&5
+-$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_VA_COPY" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_VA_COPY" >&6; }
+ if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18218,10 +17110,10 @@
+ fi
+ 
+ if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for __va_copy" >&5
+-$as_echo_n "checking for __va_copy... " >&6; }
++{ echo "$as_me:$LINENO: checking for __va_copy" >&5
++echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -18246,35 +17138,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   libreplace_cv_HAVE___VA_COPY=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE___VA_COPY=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE___VA_COPY" >&5
+-$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE___VA_COPY" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE___VA_COPY" >&6; }
+ if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18284,10 +17172,10 @@
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
+-$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++{ echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
++echo $ECHO_N "checking for __FUNCTION__ macro... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -18311,21 +17199,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_HAVE_FUNCTION_MACRO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_FUNCTION_MACRO=no
+@@ -18333,8 +17220,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
+-$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
+ if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18342,10 +17229,10 @@
+ _ACEOF
+ 
+ else
+-        { $as_echo "$as_me:$LINENO: checking for __func__ macro" >&5
+-$as_echo_n "checking for __func__ macro... " >&6; }
++        { echo "$as_me:$LINENO: checking for __func__ macro" >&5
++echo $ECHO_N "checking for __func__ macro... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -18369,21 +17256,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_HAVE_func_MACRO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_func_MACRO=no
+@@ -18391,8 +17277,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_func_MACRO" >&5
+-$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_func_MACRO" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_func_MACRO" >&6; }
+     if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18406,21 +17292,20 @@
+ 
+ for ac_header in sys/param.h limits.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -18436,33 +17321,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -18476,52 +17360,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -18530,24 +17413,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -18555,46 +17435,11 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for comparison_fn_t" >&5
+-$as_echo_n "checking for comparison_fn_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for comparison_fn_t" >&5
++echo $ECHO_N "checking for comparison_fn_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_comparison_fn_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_comparison_fn_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (comparison_fn_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
+@@ -18602,11 +17447,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef comparison_fn_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((comparison_fn_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -18617,39 +17465,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_comparison_fn_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_comparison_fn_t=yes
++	ac_cv_type_comparison_fn_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_comparison_fn_t" >&5
+-$as_echo "$ac_cv_type_comparison_fn_t" >&6; }
+-if test "x$ac_cv_type_comparison_fn_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_comparison_fn_t" >&5
++echo "${ECHO_T}$ac_cv_type_comparison_fn_t" >&6; }
++if test $ac_cv_type_comparison_fn_t = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_COMPARISON_FN_T 1
+@@ -18659,10 +17498,10 @@
+ 
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for setenv declaration" >&5
+-$as_echo_n "checking for setenv declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for setenv declaration" >&5
++echo $ECHO_N "checking for setenv declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_setenv_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -18686,21 +17525,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_setenv_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_setenv_decl=no
+@@ -18708,8 +17546,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_setenv_decl" >&5
+-$as_echo "$ac_cv_have_setenv_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_setenv_decl" >&5
++echo "${ECHO_T}$ac_cv_have_setenv_decl" >&6; }
+  if test x"$ac_cv_have_setenv_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -18722,11 +17560,11 @@
+ 
+ for ac_func in setenv unsetenv
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -18779,42 +17617,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -18824,11 +17655,11 @@
+ 
+ for ac_func in strnlen
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -18881,42 +17712,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -18930,11 +17754,11 @@
+ 
+ for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -18987,42 +17811,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -19046,14 +17863,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -19064,7 +17880,7 @@
+ _ACEOF
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -19073,10 +17889,10 @@
+ rm -f conftest.err conftest.$ac_ext
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sig_atomic_t type" >&5
+-$as_echo_n "checking for sig_atomic_t type... " >&6; }
++{ echo "$as_me:$LINENO: checking for sig_atomic_t type" >&5
++echo $ECHO_N "checking for sig_atomic_t type... $ECHO_C" >&6; }
+ if test "${libreplace_cv_sig_atomic_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -19106,21 +17922,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_sig_atomic_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_sig_atomic_t=no
+@@ -19128,8 +17943,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_sig_atomic_t" >&5
+-$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_sig_atomic_t" >&5
++echo "${ECHO_T}$libreplace_cv_sig_atomic_t" >&6; }
+ if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -19139,10 +17954,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for O_DIRECT flag to open(2)" >&5
+-$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++{ echo "$as_me:$LINENO: checking for O_DIRECT flag to open(2)" >&5
++echo $ECHO_N "checking for O_DIRECT flag to open(2)... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -19170,21 +17985,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_HAVE_OPEN_O_DIRECT=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_OPEN_O_DIRECT=no
+@@ -19192,8 +18006,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
+-$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
+ if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -19203,10 +18017,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking that the C compiler understands volatile" >&5
+-$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++{ echo "$as_me:$LINENO: checking that the C compiler understands volatile" >&5
++echo $ECHO_N "checking that the C compiler understands volatile... $ECHO_C" >&6; }
+ if test "${libreplace_cv_volatile+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -19230,21 +18044,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_volatile=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_volatile=no
+@@ -19252,8 +18065,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_volatile" >&5
+-$as_echo "$libreplace_cv_volatile" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_volatile" >&5
++echo "${ECHO_T}$libreplace_cv_volatile" >&6; }
+ if test x"$libreplace_cv_volatile" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -19270,11 +18083,11 @@
+ 
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -19300,21 +18113,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Header=no"
+@@ -19322,15 +18134,12 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ ac_header_dirent=$ac_hdr; break
+@@ -19339,10 +18148,10 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-$as_echo_n "checking for library containing opendir... " >&6; }
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -19380,30 +18189,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_opendir=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
+@@ -19418,8 +18223,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-$as_echo "$ac_cv_search_opendir" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ ac_res=$ac_cv_search_opendir
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -19427,10 +18232,10 @@
+ fi
+ 
+ else
+-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-$as_echo_n "checking for library containing opendir... " >&6; }
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -19468,30 +18273,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_opendir=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
+@@ -19506,8 +18307,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-$as_echo "$ac_cv_search_opendir" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ ac_res=$ac_cv_search_opendir
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -19526,21 +18327,20 @@
+ 
+ for ac_header in fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19556,33 +18356,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19596,52 +18395,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -19650,24 +18448,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -19678,21 +18473,20 @@
+ 
+ for ac_header in sys/acl.h acl/libacl.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19708,33 +18502,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19748,52 +18541,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -19802,24 +18594,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -19831,21 +18620,20 @@
+ 
+ for ac_header in sys/select.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19861,33 +18649,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19901,52 +18688,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -19955,24 +18741,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -19985,21 +18768,20 @@
+ 
+ for ac_header in sys/time.h utime.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20015,33 +18797,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20055,52 +18836,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -20109,34 +18889,31 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -20163,21 +18940,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_header_time=no
+@@ -20185,8 +18961,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-$as_echo "$ac_cv_header_time" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -20199,11 +18975,11 @@
+ 
+ for ac_func in utime utimes
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -20256,42 +19032,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -20299,10 +19068,10 @@
+ 
+ 
+ # wait
+-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
++{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_wait_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -20335,21 +19104,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_header_sys_wait_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_header_sys_wait_h=no
+@@ -20357,8 +19125,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+ if test $ac_cv_header_sys_wait_h = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -20372,21 +19140,20 @@
+ 
+ for ac_header in sys/capability.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20402,33 +19169,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20442,52 +19208,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -20496,24 +19261,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -20523,10 +19285,10 @@
+ 
+ case "$host_os" in
+ *linux*)
+-{ $as_echo "$as_me:$LINENO: checking for broken RedHat 7.2 system header files" >&5
+-$as_echo_n "checking for broken RedHat 7.2 system header files... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken RedHat 7.2 system header files" >&5
++echo $ECHO_N "checking for broken RedHat 7.2 system header files... $ECHO_C" >&6; }
+ if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -20559,21 +19321,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
+@@ -20582,8 +19343,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
+-$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
++echo "${ECHO_T}$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
+ if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -20592,10 +19353,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken RHEL5 sys/capability.h" >&5
+-$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken RHEL5 sys/capability.h" >&5
++echo $ECHO_N "checking for broken RHEL5 sys/capability.h... $ECHO_C" >&6; }
+ if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -20626,21 +19387,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes
+@@ -20649,8 +19409,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5
+-$as_echo "$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5
++echo "${ECHO_T}$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&6; }
+ if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -20671,21 +19431,20 @@
+ 
+ for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20701,33 +19460,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20741,52 +19499,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -20795,24 +19552,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -20824,11 +19578,11 @@
+ 
+ for ac_func in getpwnam_r getpwuid_r getpwent_r
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -20881,52 +19635,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for getpwent_r declaration" >&5
+-$as_echo_n "checking for getpwent_r declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for getpwent_r declaration" >&5
++echo $ECHO_N "checking for getpwent_r declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_getpwent_r_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -20953,21 +19700,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_getpwent_r_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_getpwent_r_decl=no
+@@ -20975,8 +19721,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_getpwent_r_decl" >&5
+-$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_getpwent_r_decl" >&5
++echo "${ECHO_T}$ac_cv_have_getpwent_r_decl" >&6; }
+  if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -20985,10 +19731,10 @@
+ 
+  fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
+-$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
++echo $ECHO_N "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21019,14 +19765,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -21035,7 +19780,7 @@
+ 		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -21046,8 +19791,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
+-$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
+ if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then
+ 
+ 
+@@ -21059,10 +19804,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
+-$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
++echo $ECHO_N "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21093,14 +19838,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -21109,7 +19853,7 @@
+ 		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -21120,8 +19864,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
+-$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
+ if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then
+ 
+ 
+@@ -21138,11 +19882,11 @@
+ 
+ for ac_func in getgrnam_r getgrgid_r getgrent_r
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21195,52 +19939,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for getgrent_r declaration" >&5
+-$as_echo_n "checking for getgrent_r declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for getgrent_r declaration" >&5
++echo $ECHO_N "checking for getgrent_r declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_getgrent_r_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -21267,21 +20004,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_getgrent_r_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_getgrent_r_decl=no
+@@ -21289,8 +20025,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_getgrent_r_decl" >&5
+-$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_getgrent_r_decl" >&5
++echo "${ECHO_T}$ac_cv_have_getgrent_r_decl" >&6; }
+  if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -21299,10 +20035,10 @@
+ 
+  fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
+-$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
++echo $ECHO_N "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21333,14 +20069,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -21349,7 +20084,7 @@
+ 		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -21360,8 +20095,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
+-$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
+ if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then
+ 
+ 
+@@ -21374,10 +20109,10 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
+-$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
++echo $ECHO_N "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21408,14 +20143,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -21424,7 +20158,7 @@
+ 		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -21435,8 +20169,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
+-$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
+ if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then
+ 
+ 
+@@ -21454,21 +20188,20 @@
+ 
+ for ac_header in ctype.h locale.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21484,33 +20217,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21524,52 +20256,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -21578,24 +20309,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -21607,21 +20335,20 @@
+ 
+ for ac_header in fnmatch.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21637,33 +20364,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21677,52 +20403,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -21731,24 +20456,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -21762,21 +20484,20 @@
+ 
+ for ac_header in sys/ipc.h sys/mman.h sys/shm.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21792,33 +20513,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21832,52 +20552,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -21886,24 +20605,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -21917,21 +20633,20 @@
+ 
+ for ac_header in termios.h termio.h sys/termio.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21947,33 +20662,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21987,52 +20701,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -22041,24 +20754,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -22071,10 +20781,10 @@
+ LIBS=""
+ 
+ libreplace_cv_dlfcn=no
+-{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+-$as_echo_n "checking for library containing dlopen... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5
++echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_search_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -22112,30 +20822,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_dlopen=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_dlopen+set}" = set; then
+@@ -22150,8 +20856,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+-$as_echo "$ac_cv_search_dlopen" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
++echo "${ECHO_T}$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"
+@@ -22162,21 +20868,20 @@
+ 
+ for ac_header in dlfcn.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22192,33 +20897,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22232,52 +20936,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -22286,24 +20989,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -22316,11 +21016,11 @@
+ 
+ for ac_func in dlopen dlsym dlerror dlclose
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22373,42 +21073,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -22418,10 +21111,10 @@
+ 
+ 
+ libreplace_cv_shl=no
+-{ $as_echo "$as_me:$LINENO: checking for library containing shl_load" >&5
+-$as_echo_n "checking for library containing shl_load... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing shl_load" >&5
++echo $ECHO_N "checking for library containing shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_search_shl_load+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -22459,30 +21152,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_shl_load=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_shl_load+set}" = set; then
+@@ -22497,8 +21186,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shl_load" >&5
+-$as_echo "$ac_cv_search_shl_load" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_shl_load" >&5
++echo "${ECHO_T}$ac_cv_search_shl_load" >&6; }
+ ac_res=$ac_cv_search_shl_load
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -22508,21 +21197,20 @@
+ 
+ for ac_header in dl.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22538,33 +21226,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22578,52 +21265,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -22632,24 +21318,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -22661,11 +21344,11 @@
+ 
+ for ac_func in shl_load shl_unload shl_findsym
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22718,42 +21401,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -22762,10 +21438,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
+-$as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
++echo $ECHO_N "checking for prototype void *dlopen(const char* filename, unsigned int flags)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22792,14 +21468,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -22808,7 +21483,7 @@
+ 		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -22819,8 +21494,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
+-$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
+ if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then
+ 
+ 
+@@ -22841,10 +21516,10 @@
+ 
+ LIBS="$save_LIBS"
+ 
+-{ $as_echo "$as_me:$LINENO: checking for getpass" >&5
+-$as_echo_n "checking for getpass... " >&6; }
++{ echo "$as_me:$LINENO: checking for getpass" >&5
++echo $ECHO_N "checking for getpass... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getpass+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22897,43 +21572,39 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_getpass=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_getpass=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpass" >&5
+-$as_echo "$ac_cv_func_getpass" >&6; }
+-if test "x$ac_cv_func_getpass" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getpass" >&5
++echo "${ECHO_T}$ac_cv_func_getpass" >&6; }
++if test $ac_cv_func_getpass = yes; then
+   libreplace_cv_HAVE_GETPASS=yes
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for getpassphrase" >&5
+-$as_echo_n "checking for getpassphrase... " >&6; }
++{ echo "$as_me:$LINENO: checking for getpassphrase" >&5
++echo $ECHO_N "checking for getpassphrase... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getpassphrase+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22986,36 +21657,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_getpassphrase=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_getpassphrase=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpassphrase" >&5
+-$as_echo "$ac_cv_func_getpassphrase" >&6; }
+-if test "x$ac_cv_func_getpassphrase" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getpassphrase" >&5
++echo "${ECHO_T}$ac_cv_func_getpassphrase" >&6; }
++if test $ac_cv_func_getpassphrase = yes; then
+   libreplace_cv_HAVE_GETPASSPHRASE=yes
+ fi
+ 
+@@ -23033,10 +21700,10 @@
+ 	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+ else
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether getpass should be replaced" >&5
+-$as_echo_n "checking whether getpass should be replaced... " >&6; }
++{ echo "$as_me:$LINENO: checking whether getpass should be replaced" >&5
++echo $ECHO_N "checking whether getpass should be replaced... $ECHO_C" >&6; }
+ if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -23066,21 +21733,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_REPLACE_GETPASS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_REPLACE_GETPASS=no
+@@ -23090,8 +21756,8 @@
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_REPLACE_GETPASS" >&5
+-$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_REPLACE_GETPASS" >&5
++echo "${ECHO_T}$libreplace_cv_REPLACE_GETPASS" >&6; }
+ if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -23103,10 +21769,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether strptime is available and works" >&5
+-$as_echo_n "checking whether strptime is available and works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether strptime is available and works" >&5
++echo $ECHO_N "checking whether strptime is available and works... $ECHO_C" >&6; }
+ if test "${libreplace_cv_STRPTIME_OK+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	if test "$cross_compiling" = yes; then
+@@ -23129,40 +21795,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_STRPTIME_OK=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_STRPTIME_OK=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_STRPTIME_OK" >&5
+-$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_STRPTIME_OK" >&5
++echo "${ECHO_T}$libreplace_cv_STRPTIME_OK" >&6; }
+ if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -23178,21 +21841,20 @@
+ 
+ for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23208,33 +21870,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23248,52 +21909,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -23302,24 +21962,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -23329,10 +21986,10 @@
+ 
+ #######################################
+ # Check for mkdir mode
+-{ $as_echo "$as_me:$LINENO: checking whether mkdir supports mode" >&5
+-$as_echo_n "checking whether mkdir supports mode... " >&6; }
++{ echo "$as_me:$LINENO: checking whether mkdir supports mode" >&5
++echo $ECHO_N "checking whether mkdir supports mode... $ECHO_C" >&6; }
+ if test "${libreplace_cv_mkdir_has_mode+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23362,21 +22019,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_mkdir_has_mode="yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_mkdir_has_mode="no"
+@@ -23384,8 +22040,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_mkdir_has_mode" >&5
+-$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_mkdir_has_mode" >&5
++echo "${ECHO_T}$libreplace_cv_mkdir_has_mode" >&6; }
+ 
+ if test "$libreplace_cv_mkdir_has_mode" = "yes"
+ then
+@@ -23399,11 +22055,11 @@
+ 
+ for ac_func in timegm
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23456,42 +22112,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -23500,10 +22149,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken readdir" >&5
+-$as_echo_n "checking for broken readdir... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken readdir" >&5
++echo $ECHO_N "checking for broken readdir... $ECHO_C" >&6; }
+ if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	if test "$cross_compiling" = yes; then
+@@ -23525,40 +22174,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_READDIR_NEEDED=no
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_READDIR_NEEDED=yes
+ fi
+-rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_NEEDED" >&5
+-$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_NEEDED" >&5
++echo "${ECHO_T}$libreplace_cv_READDIR_NEEDED" >&6; }
+ 
  #
+ # try to replace with getdirentries() if needed
+@@ -23567,11 +22213,11 @@
+ 
+ for ac_func in getdirentries
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23624,51 +22270,44 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype long telldir(const DIR *dir)" >&5
+-$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype long telldir(const DIR *dir)" >&5
++echo $ECHO_N "checking for prototype long telldir(const DIR *dir)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23695,14 +22334,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -23711,7 +22349,7 @@
+ 		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -23722,8 +22360,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
+-$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
+ if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then
+ 
+ 
+@@ -23736,10 +22374,10 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
+-$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
++{ echo "$as_me:$LINENO: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
++echo $ECHO_N "checking for prototype int seekdir(DIR *dir, long ofs)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23766,14 +22404,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -23782,7 +22419,7 @@
+ 		ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -23793,8 +22430,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
+-$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
++echo "${ECHO_T}$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
+ if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then
+ 
+ 
+@@ -23806,20 +22443,18 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for replacing readdir using getdirentries()" >&5
+-$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
++{ echo "$as_me:$LINENO: checking for replacing readdir using getdirentries()" >&5
++echo $ECHO_N "checking for replacing readdir using getdirentries()... $ECHO_C" >&6; }
+ if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -23839,40 +22474,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_READDIR_GETDIRENTRIES=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_READDIR_GETDIRENTRIES=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
+-$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
++echo "${ECHO_T}$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
+ fi
+ if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
+ 
+@@ -23896,11 +22528,11 @@
+ 
+ for ac_func in getdents
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -23953,61 +22585,52 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking for replacing readdir using getdents()" >&5
+-$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++{ echo "$as_me:$LINENO: checking for replacing readdir using getdents()" >&5
++echo $ECHO_N "checking for replacing readdir using getdents()... $ECHO_C" >&6; }
+ if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -24028,40 +22651,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_READDIR_GETDENTS=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_READDIR_GETDENTS=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_GETDENTS" >&5
+-$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_READDIR_GETDENTS" >&5
++echo "${ECHO_T}$libreplace_cv_READDIR_GETDENTS" >&6; }
+ fi
+ if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
+ 
+@@ -24078,16 +22698,16 @@
+ 	libreplace_cv_READDIR_NEEDED=no
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking a usable readdir()" >&5
+-$as_echo_n "checking a usable readdir()... " >&6; }
++{ echo "$as_me:$LINENO: checking a usable readdir()" >&5
++echo $ECHO_N "checking a usable readdir()... $ECHO_C" >&6; }
+ if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ $as_echo "$as_me:$LINENO: WARNING: the provided readdir() is broken" >&5
+-$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++	{ echo "$as_me:$LINENO: WARNING: the provided readdir() is broken" >&5
++echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
+ else
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ fi
+ 
+ 
+@@ -24097,11 +22717,11 @@
+ 
+ for ac_func in syslog printf memset memcpy
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -24154,47 +22774,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: Required function not found" >&5
+-$as_echo "$as_me: error: Required function not found" >&2;}
++  { { echo "$as_me:$LINENO: error: Required function not found" >&5
++echo "$as_me: error: Required function not found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ done
+@@ -24219,21 +22832,20 @@
+ 
+ for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24249,33 +22861,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24289,52 +22900,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -24343,24 +22953,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -24373,21 +22980,20 @@
+ 
+ for ac_header in netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24403,33 +23009,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24443,52 +23048,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -24497,24 +23101,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -24525,21 +23126,20 @@
+ 
+ for ac_header in sys/sockio.h sys/un.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24555,33 +23155,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24595,52 +23194,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -24649,24 +23247,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -24674,10 +23269,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for usable net/if.h" >&5
+-$as_echo_n "checking for usable net/if.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for usable net/if.h" >&5
++echo $ECHO_N "checking for usable net/if.h... $ECHO_C" >&6; }
+ if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -24700,21 +23295,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_USABLE_NET_IF_H=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_USABLE_NET_IF_H=no
+@@ -24724,8 +23318,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_USABLE_NET_IF_H" >&5
+-$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_USABLE_NET_IF_H" >&5
++echo "${ECHO_T}$libreplace_cv_USABLE_NET_IF_H" >&6; }
+ if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -24737,10 +23331,10 @@
+ 
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+-$as_echo_n "checking for socklen_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -24765,21 +23359,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -24788,51 +23381,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+-$as_echo_n "checking for socklen_t... " >&6; }
++	{ echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_socklen_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (socklen_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
+@@ -24840,11 +23398,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef socklen_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((socklen_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -24855,39 +23416,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_socklen_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_socklen_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_socklen_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+-$as_echo "$ac_cv_type_socklen_t" >&6; }
+-if test "x$ac_cv_type_socklen_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
++echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
++if test $ac_cv_type_socklen_t = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SOCKLEN_T 1
+@@ -24907,10 +23459,10 @@
+ 
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for sa_family_t" >&5
+-$as_echo_n "checking for sa_family_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for sa_family_t" >&5
++echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -24935,21 +23487,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -24958,51 +23509,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for sa_family_t" >&5
+-$as_echo_n "checking for sa_family_t... " >&6; }
++	{ echo "$as_me:$LINENO: checking for sa_family_t" >&5
++echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_sa_family_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (sa_family_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
+@@ -25010,11 +23526,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef sa_family_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((sa_family_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -25025,39 +23544,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_sa_family_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_sa_family_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_sa_family_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sa_family_t" >&5
+-$as_echo "$ac_cv_type_sa_family_t" >&6; }
+-if test "x$ac_cv_type_sa_family_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_sa_family_t" >&5
++echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6; }
++if test $ac_cv_type_sa_family_t = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SA_FAMILY_T 1
+@@ -25077,10 +23587,10 @@
+ 
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
+-$as_echo_n "checking for struct addrinfo... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct addrinfo" >&5
++echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25105,21 +23615,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -25128,51 +23637,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
+-$as_echo_n "checking for struct addrinfo... " >&6; }
++	{ echo "$as_me:$LINENO: checking for struct addrinfo" >&5
++echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_struct_addrinfo=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (struct addrinfo))
+-       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
+@@ -25180,11 +23654,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef struct addrinfo ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct addrinfo)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -25195,39 +23672,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_struct_addrinfo=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_struct_addrinfo=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_struct_addrinfo=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
+-$as_echo "$ac_cv_type_struct_addrinfo" >&6; }
+-if test "x$ac_cv_type_struct_addrinfo" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
++echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6; }
++if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ADDRINFO 1
+@@ -25247,10 +23715,10 @@
+ 
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr" >&5
+-$as_echo_n "checking for struct sockaddr... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr" >&5
++echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25275,21 +23743,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -25298,51 +23765,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for struct sockaddr" >&5
+-$as_echo_n "checking for struct sockaddr... " >&6; }
++	{ echo "$as_me:$LINENO: checking for struct sockaddr" >&5
++echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_struct_sockaddr=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (struct sockaddr))
+-       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
+@@ -25350,11 +23782,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef struct sockaddr ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct sockaddr)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -25365,39 +23800,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_struct_sockaddr=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_struct_sockaddr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_struct_sockaddr=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr" >&5
+-$as_echo "$ac_cv_type_struct_sockaddr" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6; }
++if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR 1
+@@ -25417,10 +23843,10 @@
+ 
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
+-$as_echo_n "checking for struct sockaddr_storage... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
++echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25449,21 +23875,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -25472,51 +23897,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
+-$as_echo_n "checking for struct sockaddr_storage... " >&6; }
++	{ echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
++echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_struct_sockaddr_storage=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (struct sockaddr_storage))
+-       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
+@@ -25524,11 +23914,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef struct sockaddr_storage ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct sockaddr_storage)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -25539,39 +23932,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_struct_sockaddr_storage=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_struct_sockaddr_storage=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_struct_sockaddr_storage=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
+-$as_echo "$ac_cv_type_struct_sockaddr_storage" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6; }
++if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_STORAGE 1
+@@ -25591,10 +23975,10 @@
+ 
+ 
+ cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
+-$as_echo_n "checking for struct sockaddr_in6... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
++echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6; }
+ if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25623,21 +24007,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "ac_cv_type_$cv=no"
+@@ -25646,51 +24029,16 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
+-$as_echo_n "checking for struct sockaddr_in6... " >&6; }
++	{ echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
++echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_struct_sockaddr_in6=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (struct sockaddr_in6))
+-       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
+@@ -25698,11 +24046,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef struct sockaddr_in6 ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct sockaddr_in6)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -25713,39 +24064,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_struct_sockaddr_in6=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_struct_sockaddr_in6=yes
++	ac_cv_type_struct_sockaddr_in6=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
+-$as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr_in6" >&6; }
++if test $ac_cv_type_struct_sockaddr_in6 = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_IN6 1
+@@ -25764,10 +24106,10 @@
+ 
+ 
+ if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5
+-$as_echo_n "checking for struct sockaddr_storage.ss_family... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5
++echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_storage_ss_family+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25797,21 +24139,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_storage_ss_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -25842,21 +24183,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_storage_ss_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_sockaddr_storage_ss_family=no
+@@ -25867,9 +24207,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5
+-$as_echo "$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; }
++if test $ac_cv_member_struct_sockaddr_storage_ss_family = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SS_FAMILY 1
+@@ -25879,10 +24219,10 @@
+ 
+ 
+ if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_family" >&5
+-$as_echo_n "checking for struct sockaddr_storage.__ss_family... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_family" >&5
++echo $ECHO_N "checking for struct sockaddr_storage.__ss_family... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_storage___ss_family+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25912,21 +24252,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_storage___ss_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -25957,21 +24296,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_storage___ss_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_sockaddr_storage___ss_family=no
+@@ -25982,9 +24320,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_family" >&5
+-$as_echo "$ac_cv_member_struct_sockaddr_storage___ss_family" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_family" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage___ss_family" >&6; }
++if test $ac_cv_member_struct_sockaddr_storage___ss_family = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE___SS_FAMILY 1
+@@ -25995,10 +24333,10 @@
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sin_len in sock" >&5
+-$as_echo_n "checking for sin_len in sock... " >&6; }
++{ echo "$as_me:$LINENO: checking for sin_len in sock" >&5
++echo $ECHO_N "checking for sin_len in sock... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -26028,14 +24366,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -26044,7 +24381,7 @@
+ 		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -26055,8 +24392,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
+-$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
+ if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -26067,10 +24404,10 @@
+ 
+ ############################################
+ # check for unix domain sockets
+-{ $as_echo "$as_me:$LINENO: checking for unix domain sockets" >&5
+-$as_echo_n "checking for unix domain sockets... " >&6; }
++{ echo "$as_me:$LINENO: checking for unix domain sockets" >&5
++echo $ECHO_N "checking for unix domain sockets... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -26103,14 +24440,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -26119,7 +24455,7 @@
+ 		libreplace_cv_HAVE_UNIXSOCKET=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -26130,8 +24466,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
+-$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
+ if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -26143,11 +24479,11 @@
+ 
+ for ac_func in connect
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26200,42 +24536,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -26251,10 +24580,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for connect in -lnsl_s" >&5
+-$as_echo_n "checking for connect in -lnsl_s... " >&6; }
++        { echo "$as_me:$LINENO: checking for connect in -lnsl_s" >&5
++echo $ECHO_N "checking for connect in -lnsl_s... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26284,38 +24613,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_nsl_s_connect=yes;
+ 		  ac_cv_lib_ext_nsl_s=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_nsl_s_connect=no;
+ 		  ac_cv_lib_ext_nsl_s=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_s_connect" >&5
+-$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_s_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_nsl_s_connect" >&6; }
+     if test $ac_cv_lib_ext_nsl_s_connect = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_CONNECT 1
+@@ -26350,10 +24675,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for connect in -lnsl" >&5
+-$as_echo_n "checking for connect in -lnsl... " >&6; }
++        { echo "$as_me:$LINENO: checking for connect in -lnsl" >&5
++echo $ECHO_N "checking for connect in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26383,38 +24708,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_nsl_connect=yes;
+ 		  ac_cv_lib_ext_nsl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_nsl_connect=no;
+ 		  ac_cv_lib_ext_nsl=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_connect" >&5
+-$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_nsl_connect" >&6; }
+     if test $ac_cv_lib_ext_nsl_connect = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_CONNECT 1
+@@ -26449,10 +24770,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-$as_echo_n "checking for connect in -lsocket... " >&6; }
++        { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_socket_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26482,38 +24803,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_socket_connect=yes;
+ 		  ac_cv_lib_ext_socket=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_socket_connect=no;
+ 		  ac_cv_lib_ext_socket=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_socket_connect" >&5
+-$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_socket_connect" >&6; }
+     if test $ac_cv_lib_ext_socket_connect = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_CONNECT 1
+@@ -26548,10 +24865,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for connect in -linet" >&5
+-$as_echo_n "checking for connect in -linet... " >&6; }
++        { echo "$as_me:$LINENO: checking for connect in -linet" >&5
++echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_inet_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26581,38 +24898,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_inet_connect=yes;
+ 		  ac_cv_lib_ext_inet=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_inet_connect=no;
+ 		  ac_cv_lib_ext_inet=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_inet_connect" >&5
+-$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_inet_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_inet_connect" >&6; }
+     if test $ac_cv_lib_ext_inet_connect = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_CONNECT 1
+@@ -26654,11 +24967,11 @@
+ 
+ for ac_func in gethostbyname
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26711,42 +25024,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -26762,10 +25068,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl_s" >&5
+-$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl_s" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl_s... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26795,38 +25101,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_nsl_s_gethostbyname=yes;
+ 		  ac_cv_lib_ext_nsl_s=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_nsl_s_gethostbyname=no;
+ 		  ac_cv_lib_ext_nsl_s=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
+     if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+@@ -26861,10 +25163,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26894,38 +25196,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_nsl_gethostbyname=yes;
+ 		  ac_cv_lib_ext_nsl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_nsl_gethostbyname=no;
+ 		  ac_cv_lib_ext_nsl=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
+     if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+@@ -26960,10 +25258,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
+-$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
++echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -26993,38 +25291,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_socket_gethostbyname=yes;
+ 		  ac_cv_lib_ext_socket=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_socket_gethostbyname=no;
+ 		  ac_cv_lib_ext_socket=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_socket_gethostbyname" >&6; }
+     if test $ac_cv_lib_ext_socket_gethostbyname = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+@@ -27065,11 +25359,11 @@
+ 
+ for ac_func in if_nametoindex
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27122,42 +25416,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -27173,10 +25460,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for if_nametoindex in -lipv6" >&5
+-$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
++        { echo "$as_me:$LINENO: checking for if_nametoindex in -lipv6" >&5
++echo $ECHO_N "checking for if_nametoindex in -lipv6... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27206,38 +25493,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_ipv6_if_nametoindex=yes;
+ 		  ac_cv_lib_ext_ipv6=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_ipv6_if_nametoindex=no;
+ 		  ac_cv_lib_ext_ipv6=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
+-$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
+     if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_IF_NAMETOINDEX 1
+@@ -27282,11 +25565,11 @@
+ 
+ for ac_func in socketpair
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27339,42 +25622,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -27383,10 +25659,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken inet_ntoa" >&5
+-$as_echo_n "checking for broken inet_ntoa... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken inet_ntoa" >&5
++echo $ECHO_N "checking for broken inet_ntoa... $ECHO_C" >&6; }
+ if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -27417,48 +25693,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_REPLACE_INET_NTOA=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_REPLACE_INET_NTOA=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
+-$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
++echo "${ECHO_T}$libreplace_cv_REPLACE_INET_NTOA" >&6; }
+ 
+ 
+ for ac_func in inet_ntoa
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27511,42 +25784,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -27566,11 +25832,11 @@
+ 
+ for ac_func in inet_aton
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27623,42 +25889,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -27670,11 +25929,11 @@
+ 
+ for ac_func in inet_ntop
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27727,42 +25986,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -27774,11 +26026,11 @@
+ 
+ for ac_func in inet_pton
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -27831,42 +26083,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+@@ -27875,10 +26120,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for getaddrinfo" >&5
+-$as_echo_n "checking for getaddrinfo... " >&6; }
++{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
++echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27921,35 +26166,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   libreplace_cv_HAVE_GETADDRINFO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_GETADDRINFO=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
+-$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_GETADDRINFO" >&6; }
+ if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -27978,21 +26219,20 @@
+ 
+ for ac_header in ifaddrs.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28008,33 +26248,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28048,52 +26287,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -28102,24 +26340,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -28127,10 +26362,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+-$as_echo_n "checking for struct sockaddr.sa_len... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
++echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -28156,21 +26391,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -28197,21 +26431,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sockaddr_sa_len=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_sockaddr_sa_len=no
+@@ -28222,9 +26455,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+-$as_echo "$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
++if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
+@@ -28238,10 +26471,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for getifaddrs and freeifaddrs" >&5
+-$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++{ echo "$as_me:$LINENO: checking for getifaddrs and freeifaddrs" >&5
++echo $ECHO_N "checking for getifaddrs and freeifaddrs... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28279,21 +26512,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   libreplace_cv_HAVE_GETIFADDRS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	libreplace_cv_HAVE_GETIFADDRS=no
+@@ -28301,8 +26533,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
+-$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_GETIFADDRS" >&6; }
+ if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28324,10 +26556,10 @@
+ ##################
+ # look for a method of finding the list of network interfaces
+ iface=no;
+-{ $as_echo "$as_me:$LINENO: checking for iface getifaddrs" >&5
+-$as_echo_n "checking for iface getifaddrs... " >&6; }
++{ echo "$as_me:$LINENO: checking for iface getifaddrs" >&5
++echo $ECHO_N "checking for iface getifaddrs... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -28357,39 +26589,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
+-$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
+ if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
+     iface=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -28402,10 +26631,10 @@
+ 
+ 
+ if test $iface = no; then
+-{ $as_echo "$as_me:$LINENO: checking for iface AIX" >&5
+-$as_echo_n "checking for iface AIX... " >&6; }
++{ echo "$as_me:$LINENO: checking for iface AIX" >&5
++echo $ECHO_N "checking for iface AIX... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -28436,39 +26665,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_IFACE_AIX=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_IFACE_AIX=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
+-$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_IFACE_AIX" >&6; }
+ if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
+     iface=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -28480,10 +26706,10 @@
+ 
+ 
+ if test $iface = no; then
+-{ $as_echo "$as_me:$LINENO: checking for iface ifconf" >&5
+-$as_echo_n "checking for iface ifconf... " >&6; }
++{ echo "$as_me:$LINENO: checking for iface ifconf" >&5
++echo $ECHO_N "checking for iface ifconf... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -28513,39 +26739,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_IFACE_IFCONF=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_IFACE_IFCONF=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
+-$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
+ if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
+     iface=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -28556,10 +26779,10 @@
+ fi
+ 
+ if test $iface = no; then
+-{ $as_echo "$as_me:$LINENO: checking for iface ifreq" >&5
+-$as_echo_n "checking for iface ifreq... " >&6; }
++{ echo "$as_me:$LINENO: checking for iface ifreq" >&5
++echo $ECHO_N "checking for iface ifreq... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -28589,39 +26812,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   libreplace_cv_HAVE_IFACE_IFREQ=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ libreplace_cv_HAVE_IFACE_IFREQ=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
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
+-$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
+ if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
+     iface=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -28631,10 +26851,10 @@
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ipv6 support" >&5
+-$as_echo_n "checking for ipv6 support... " >&6; }
++{ echo "$as_me:$LINENO: checking for ipv6 support" >&5
++echo $ECHO_N "checking for ipv6 support... $ECHO_C" >&6; }
+ if test "${libreplace_cv_HAVE_IPV6+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -28674,26 +26894,23 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ 		libreplace_cv_HAVE_IPV6=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -28701,13 +26918,12 @@
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IPV6" >&5
+-$as_echo "$libreplace_cv_HAVE_IPV6" >&6; }
++{ echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IPV6" >&5
++echo "${ECHO_T}$libreplace_cv_HAVE_IPV6" >&6; }
+ if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28746,21 +26962,20 @@
+ 
+ for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28776,33 +26991,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28816,52 +27030,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -28870,24 +27083,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -28902,21 +27112,20 @@
+ 
+ for ac_header in unistd.h utime.h grp.h sys/id.h memory.h alloca.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28932,33 +27141,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28972,52 +27180,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29026,24 +27233,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29056,21 +27260,20 @@
+ 
+ for ac_header in limits.h float.h pthread.h libintl.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29086,33 +27289,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29126,52 +27328,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29180,24 +27381,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29209,21 +27407,20 @@
+ 
+ for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29239,33 +27436,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29279,52 +27475,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29333,24 +27528,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29366,21 +27558,20 @@
+ 
+ for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29396,33 +27587,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29436,52 +27626,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29490,24 +27679,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29523,21 +27709,20 @@
+ 
+ for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29553,33 +27738,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29593,52 +27777,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29647,24 +27830,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29679,21 +27859,20 @@
+ 
+ for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29709,33 +27888,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29749,52 +27927,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29803,24 +27980,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29834,21 +28008,20 @@
+ 
+ for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29864,33 +28037,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -29904,52 +28076,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -29958,24 +28129,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -29985,21 +28153,20 @@
+ 
+ for ac_header in sys/sysmacros.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30015,33 +28182,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30055,52 +28221,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30109,24 +28274,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30137,21 +28299,20 @@
+ 
+ for ac_header in sys/syslog.h syslog.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30167,33 +28328,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30207,52 +28367,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30261,24 +28420,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30289,21 +28445,20 @@
+ 
+ for ac_header in langinfo.h locale.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30319,33 +28474,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30359,52 +28513,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30413,24 +28566,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30440,21 +28590,20 @@
+ 
+ for ac_header in xfs/libxfs.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30470,33 +28619,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30510,52 +28658,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30564,24 +28711,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30591,21 +28735,20 @@
+ 
+ for ac_header in netgroup.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30621,33 +28764,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30661,52 +28803,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30715,24 +28856,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30743,11 +28881,11 @@
+ 
+ for ac_header in rpcsvc/yp_prot.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -30769,21 +28907,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Header=no"
+@@ -30791,15 +28928,12 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30811,21 +28945,20 @@
+ 
+ for ac_header in sys/mode.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30841,33 +28974,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30881,52 +29013,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -30935,24 +29066,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -30966,21 +29094,20 @@
+ 
+ for ac_header in CoreFoundation/CFStringEncodingConverter.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30996,33 +29123,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31036,52 +29162,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31090,45 +29215,41 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+ 
+ for ac_header in CFStringEncodingConverter.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31144,33 +29265,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31184,52 +29304,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31238,24 +29357,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -31275,21 +29391,20 @@
+ 
+ for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31305,33 +29420,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31345,52 +29459,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31399,24 +29512,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -31467,21 +29577,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_header_shadow_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_header_shadow_h=no
+@@ -31500,21 +29609,20 @@
+ 
+ for ac_header in shadow.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31530,33 +29638,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31570,52 +29677,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31624,24 +29730,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -31655,21 +29758,20 @@
+ 
+ for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31685,33 +29787,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31725,52 +29826,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31779,24 +29879,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -31807,21 +29904,20 @@
+ 
+ for ac_header in syscall.h sys/syscall.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31837,33 +29933,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31877,52 +29972,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -31931,24 +30025,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -31963,21 +30054,20 @@
+ 
+ for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -31993,33 +30083,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32033,52 +30122,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -32087,24 +30175,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -32115,21 +30200,20 @@
+ 
+ for ac_header in sys/ea.h sys/proplist.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32145,33 +30229,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32185,52 +30268,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -32239,24 +30321,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -32268,21 +30347,20 @@
+ 
+ for ac_header in sys/cdefs.h glob.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32298,33 +30376,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32338,52 +30415,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -32392,24 +30468,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -32423,21 +30496,20 @@
+ 
+ for ac_header in utmp.h utmpx.h lastlog.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32453,33 +30525,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32493,52 +30564,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -32547,24 +30617,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -32572,14 +30639,68 @@
+ done
+ 
+ 
++{ echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
++if test "${ac_cv_type_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef int ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_int=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+-$as_echo_n "checking size of int... " >&6; }
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -32590,10 +30711,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32606,14 +30728,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -32627,10 +30748,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32643,21 +30765,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -32671,7 +30792,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -32681,10 +30802,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32697,14 +30819,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -32718,10 +30839,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32734,21 +30856,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -32762,7 +30883,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -32782,10 +30903,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32798,21 +30920,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -32823,13 +30944,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+ '') if test "$ac_cv_type_int" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (int)
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_int=0
+    fi ;;
+@@ -32842,8 +30961,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (int)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
++   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -32853,22 +30973,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (int))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (int))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (int))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -32881,48 +30999,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_int=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_int" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (int)
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_int=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-$as_echo "$ac_cv_sizeof_int" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ 
+ 
+ 
+@@ -32931,14 +31044,68 @@
+ _ACEOF
+ 
+ 
++{ echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef long ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_long=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+-$as_echo_n "checking size of long... " >&6; }
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -32949,10 +31116,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -32965,14 +31133,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -32986,10 +31153,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33002,21 +31170,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -33030,7 +31197,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -33040,10 +31207,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33056,14 +31224,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -33077,10 +31244,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33093,21 +31261,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -33121,7 +31288,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -33141,10 +31308,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33157,21 +31325,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -33182,13 +31349,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+ '') if test "$ac_cv_type_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_long=0
+    fi ;;
+@@ -33201,8 +31366,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (long)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
++   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -33212,22 +31378,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (long))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -33240,48 +31404,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_long=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-$as_echo "$ac_cv_sizeof_long" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ 
+ 
+ 
+@@ -33290,14 +31449,68 @@
+ _ACEOF
+ 
+ 
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef long long ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_long_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_long_long=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
+-$as_echo_n "checking size of long long... " >&6; }
++{ echo "$as_me:$LINENO: checking size of long long" >&5
++echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long_long+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -33308,10 +31521,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33324,14 +31538,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -33345,10 +31558,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33361,21 +31575,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -33389,7 +31602,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -33399,10 +31612,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33415,14 +31629,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -33436,10 +31649,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33452,21 +31666,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -33480,7 +31693,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -33500,10 +31713,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef long long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33516,21 +31730,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -33541,13 +31754,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long_long=$ac_lo;;
+ '') if test "$ac_cv_type_long_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long long)
++echo "$as_me: error: cannot compute sizeof (long long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_long_long=0
+    fi ;;
+@@ -33560,8 +31771,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (long long)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
++   typedef long long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -33571,22 +31783,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (long long))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (long long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (long long))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -33599,48 +31809,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long_long=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_long_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (long long)
++echo "$as_me: error: cannot compute sizeof (long long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_long_long=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+-$as_echo "$ac_cv_sizeof_long_long" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+ 
+ 
+ 
+@@ -33649,14 +31854,68 @@
+ _ACEOF
+ 
+ 
++{ echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
++if test "${ac_cv_type_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++typedef short ac__type_new_;
++int
++main ()
++{
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_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_short=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_short=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+-$as_echo_n "checking size of short... " >&6; }
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -33667,10 +31926,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33683,14 +31943,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -33704,10 +31963,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33720,21 +31980,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr $ac_mid + 1`
+@@ -33748,7 +32007,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -33758,10 +32017,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33774,14 +32034,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -33795,10 +32054,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33811,21 +32071,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_hi=`expr '(' $ac_mid ')' - 1`
+@@ -33839,7 +32098,7 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo= ac_hi=
+@@ -33859,10 +32118,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -33875,21 +32135,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -33900,13 +32159,11 @@
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+ '') if test "$ac_cv_type_short" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (short)
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_short=0
+    fi ;;
+@@ -33919,8 +32176,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-static long int longval () { return (long int) (sizeof (short)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
++   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -33930,22 +32188,20 @@
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+-  if (((long int) (sizeof (short))) < 0)
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+       long int i = longval ();
+-      if (i != ((long int) (sizeof (short))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%ld", i);
++      fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (short))))
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+ 	return 1;
+-      fprintf (f, "%lu", i);
++      fprintf (f, "%lu\n", i);
+     }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+ 
+   ;
+@@ -33958,48 +32214,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_short=`cat conftest.val`
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ if test "$ac_cv_type_short" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (short)
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++   { (exit 77); exit 77; }; }
+    else
+      ac_cv_sizeof_short=0
+    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
+ rm -f conftest.val
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-$as_echo "$ac_cv_sizeof_short" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ 
+ 
+ 
+@@ -34009,10 +32260,10 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+ if test "${ac_cv_c_const+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34084,21 +32335,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_c_const=no
+@@ -34106,20 +32356,20 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+-$as_echo "$ac_cv_c_const" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define const /**/
++#define const
+ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+-$as_echo_n "checking for inline... " >&6; }
++{ echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ if test "${ac_cv_c_inline+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+@@ -34142,21 +32392,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -34167,8 +32416,8 @@
+ done
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+ 
+ 
+ case $ac_cv_c_inline in
+@@ -34186,78 +32435,28 @@
+     ;;
+ esac
+ 
+-
+- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_bigendian=unknown
+-    # See if we're dealing with a universal compiler.
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if sys/param.h defines the BYTE_ORDER macro.
+-      cat >conftest.$ac_ext <<_ACEOF
++  # 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;
+@@ -34269,34 +32468,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   # 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;
+@@ -34308,21 +32506,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_bigendian=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_c_bigendian=no
+@@ -34330,69 +32527,29 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    fi
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+-	      bogus endian macros
+-	     #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
+-  # It does; now see whether it defined to _BIG_ENDIAN or not.
+-	 cat >conftest.$ac_ext <<_ACEOF
++	# 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
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <limits.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; }
+ int
+ main ()
+ {
+-#ifndef _BIG_ENDIAN
+-		 not big endian
+-		#endif
+-
++ _ascii (); _ebcdic ();
+   ;
+   return 0;
+ }
+@@ -34403,101 +32560,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
++  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
+-
+-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
+-
+-
++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
+-
+-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
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -34516,14 +32602,14 @@
+ 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;
+@@ -34535,68 +32621,61 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_bigendian=no
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_c_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
+-{ $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)
+-      ;; #(
+-   universal)
++
++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
+-#define AC_APPLE_UNIVERSAL_BUILD 1
++#define WORDS_BIGENDIAN 1
+ _ACEOF
+-
+-     ;; #(
+-   *)
+-     { { $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;}
++ ;;
++  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
++esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
+-$as_echo_n "checking whether char is unsigned... " >&6; }
++{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
++echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
+ if test "${ac_cv_c_char_unsigned+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34621,21 +32700,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_c_char_unsigned=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_c_char_unsigned=yes
+@@ -34643,8 +32721,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
+-$as_echo "$ac_cv_c_char_unsigned" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
++echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
+ if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define __CHAR_UNSIGNED__ 1
+@@ -34653,10 +32731,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+-$as_echo_n "checking return type of signal handlers... " >&6; }
++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+ if test "${ac_cv_type_signal+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34681,21 +32759,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=int
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_type_signal=void
+@@ -34703,18 +32780,18 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+-$as_echo "$ac_cv_type_signal" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34734,8 +32811,8 @@
+ rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+-$as_echo "$ac_cv_type_uid_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+ if test $ac_cv_type_uid_t = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -34749,46 +32826,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+-$as_echo_n "checking for mode_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for mode_t" >&5
++echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_mode_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_mode_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (mode_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34796,11 +32838,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef mode_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((mode_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -34811,39 +32856,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_mode_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_mode_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_mode_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+-$as_echo "$ac_cv_type_mode_t" >&6; }
+-if test "x$ac_cv_type_mode_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
++echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
++if test $ac_cv_type_mode_t = yes; then
+   :
+ else
+ 
+@@ -34853,46 +32889,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+-$as_echo_n "checking for off_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_off_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_off_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (off_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34900,11 +32901,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef off_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((off_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -34915,39 +32919,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_off_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_off_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_off_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-$as_echo "$ac_cv_type_off_t" >&6; }
+-if test "x$ac_cv_type_off_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
++if test $ac_cv_type_off_t = yes; then
+   :
+ else
+ 
+@@ -34957,46 +32952,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_size_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (size_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35004,11 +32964,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((size_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -35019,39 +32982,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_size_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_size_t=yes
++	ac_cv_type_size_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
++if test $ac_cv_type_size_t = yes; then
+   :
+ else
+ 
+@@ -35061,46 +33015,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for pid_t" >&5
++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_pid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_pid_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (pid_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35108,11 +33027,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef pid_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((pid_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -35123,39 +33045,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_pid_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_pid_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_pid_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-$as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
++echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
++if test $ac_cv_type_pid_t = yes; then
+   :
+ else
+ 
+@@ -35165,10 +33078,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
+-$as_echo_n "checking for struct stat.st_rdev... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
++echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -35193,21 +33106,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_stat_st_rdev=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -35233,21 +33145,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_stat_st_rdev=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_stat_st_rdev=no
+@@ -35258,9 +33169,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
++echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
++if test $ac_cv_member_struct_stat_st_rdev = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_RDEV 1
+@@ -35274,10 +33185,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for d_off in dirent" >&5
+-$as_echo_n "checking for d_off in dirent... " >&6; }
++{ echo "$as_me:$LINENO: checking for d_off in dirent" >&5
++echo $ECHO_N "checking for d_off in dirent... $ECHO_C" >&6; }
+ if test "${ac_cv_dirent_d_off+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -35303,21 +33214,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_dirent_d_off=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_dirent_d_off=no
+@@ -35325,8 +33235,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_dirent_d_off" >&5
+-$as_echo "$ac_cv_dirent_d_off" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_dirent_d_off" >&5
++echo "${ECHO_T}$ac_cv_dirent_d_off" >&6; }
+ if test $ac_cv_dirent_d_off = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35335,46 +33245,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+-$as_echo_n "checking for ssize_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_ssize_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (ssize_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35382,11 +33257,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef ssize_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((ssize_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -35397,39 +33275,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_ssize_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_ssize_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_ssize_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+-$as_echo "$ac_cv_type_ssize_t" >&6; }
+-if test "x$ac_cv_type_ssize_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
++if test $ac_cv_type_ssize_t = yes; then
+   :
+ else
+ 
+@@ -35439,46 +33308,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
+-$as_echo_n "checking for wchar_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for wchar_t" >&5
++echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_wchar_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (wchar_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
+@@ -35486,11 +33320,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef wchar_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((wchar_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -35501,39 +33338,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_wchar_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_wchar_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_wchar_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+-$as_echo "$ac_cv_type_wchar_t" >&6; }
+-if test "x$ac_cv_type_wchar_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
++echo "${ECHO_T}$ac_cv_type_wchar_t" >&6; }
++if test $ac_cv_type_wchar_t = yes; then
+   :
+ else
+ 
+@@ -35556,10 +33384,10 @@
+ if test x$enable_cups != xno; then
+ 	# Extract the first word of "cups-config", so it can be a program name with args.
+ set dummy cups-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   case $CUPS_CONFIG in
+   [\\/]* | ?:[\\/]*)
+@@ -35574,7 +33402,7 @@
+   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_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -35586,11 +33414,11 @@
+ fi
+ CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
+ if test -n "$CUPS_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
+-$as_echo "$CUPS_CONFIG" >&6; }
++  { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
++echo "${ECHO_T}$CUPS_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -35607,21 +33435,20 @@
+ 
+ for ac_header in cups/cups.h cups/language.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35637,33 +33464,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35677,52 +33503,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -35731,24 +33556,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -35764,16 +33586,16 @@
+ 
+ 			samba_cv_HAVE_CUPS=yes
+ 		else
+-			{ $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
+-$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
++			{ echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
++echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
+ 			CFLAGS=$ac_save_CFLAGS
+ 			LDFLAGS=$ac_save_LDFLAGS
+ 			PRINT_LIBS=$ac_save_PRINT_LIBS
+ 		fi
+ 
+ 	elif test x"$enable_cups" = x"yes"; then
+-		{ { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&5
+-$as_echo "$as_me: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&2;}
++		{ { echo "$as_me:$LINENO: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&5
++echo "$as_me: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&2;}
+    { (exit 1); exit 1; }; }
+         fi
+ fi
+@@ -35792,18 +33614,18 @@
+ _ACEOF
+ 
+ 	elif test x"$enable_iprint" = x"yes"; then
+-		{ { $as_echo "$as_me:$LINENO: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&5
+-$as_echo "$as_me: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&2;}
++		{ { echo "$as_me:$LINENO: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&5
++echo "$as_me: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&2;}
+    { (exit 1); exit 1; }; }
+         fi
+ fi
+ 
+ ############################################
+ # check if the compiler will optimize out function calls
+-{ $as_echo "$as_me:$LINENO: checking if the compiler will optimize out function calls" >&5
+-$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
++{ echo "$as_me:$LINENO: checking if the compiler will optimize out function calls" >&5
++echo $ECHO_N "checking if the compiler will optimize out function calls... $ECHO_C" >&6; }
+ if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35835,35 +33657,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_optimize_out_funcation_calls=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_optimize_out_funcation_calls=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_optimize_out_funcation_calls" >&5
+-$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_optimize_out_funcation_calls" >&5
++echo "${ECHO_T}$samba_cv_optimize_out_funcation_calls" >&6; }
+ if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35874,10 +33692,10 @@
+ 
+ #############################################
+ # check for fd passing struct via msg_control
+-{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_control" >&5
+-$as_echo_n "checking for fd passing via msg_control... " >&6; }
++{ echo "$as_me:$LINENO: checking for fd passing via msg_control" >&5
++echo $ECHO_N "checking for fd passing via msg_control... $ECHO_C" >&6; }
+ if test "${samba_cv_msghdr_msg_control+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35914,21 +33732,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_msghdr_msg_control=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_msghdr_msg_control=no
+@@ -35936,8 +33753,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
+-$as_echo "$samba_cv_msghdr_msg_control" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
++echo "${ECHO_T}$samba_cv_msghdr_msg_control" >&6; }
+ if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35948,10 +33765,10 @@
+ 
+ #############################################
+ # check for fd passing struct via msg_acctrights
+-{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_acctrights" >&5
+-$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
++{ echo "$as_me:$LINENO: checking for fd passing via msg_acctrights" >&5
++echo $ECHO_N "checking for fd passing via msg_acctrights... $ECHO_C" >&6; }
+ if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35985,21 +33802,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_msghdr_msg_acctrights=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_msghdr_msg_acctrights=no
+@@ -36007,8 +33823,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
+-$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
++echo "${ECHO_T}$samba_cv_msghdr_msg_acctrights" >&6; }
+ if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36020,11 +33836,11 @@
+ 
+ for ac_func in dirfd
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -36077,42 +33893,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -36122,10 +33931,10 @@
+ 	default_shared_modules="$default_shared_modules vfs_syncops"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sig_atomic_t type" >&5
+-$as_echo_n "checking for sig_atomic_t type... " >&6; }
++{ echo "$as_me:$LINENO: checking for sig_atomic_t type" >&5
++echo $ECHO_N "checking for sig_atomic_t type... $ECHO_C" >&6; }
+ if test "${samba_cv_sig_atomic_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36155,21 +33964,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_sig_atomic_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_sig_atomic_t=no
+@@ -36177,8 +33985,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_sig_atomic_t" >&5
+-$as_echo "$samba_cv_sig_atomic_t" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_sig_atomic_t" >&5
++echo "${ECHO_T}$samba_cv_sig_atomic_t" >&6; }
+ if test x"$samba_cv_sig_atomic_t" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36187,10 +33995,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
+-$as_echo_n "checking for struct sigevent type... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sigevent type" >&5
++echo $ECHO_N "checking for struct sigevent type... $ECHO_C" >&6; }
+ if test "${samba_cv_struct_sigevent+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36220,21 +34028,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_struct_sigevent=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_struct_sigevent=no
+@@ -36242,18 +34049,18 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_sigevent" >&5
+-$as_echo "$samba_cv_struct_sigevent" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_struct_sigevent" >&5
++echo "${ECHO_T}$samba_cv_struct_sigevent" >&6; }
+ if test x"$samba_cv_struct_sigevent" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRUCT_SIGEVENT 1
+ _ACEOF
+ 
+-   { $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sival_ptr" >&5
+-$as_echo_n "checking for struct sigevent.sigev_value.sival_ptr... " >&6; }
++   { echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sival_ptr" >&5
++echo $ECHO_N "checking for struct sigevent.sigev_value.sival_ptr... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sigevent_sigev_value_sival_ptr+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -36279,21 +34086,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -36320,21 +34126,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
+@@ -36345,9 +34150,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&5
+-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&6; }
+-if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&6; }
++if test $ac_cv_member_struct_sigevent_sigev_value_sival_ptr = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
+@@ -36355,10 +34160,10 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sigval_ptr" >&5
+-$as_echo_n "checking for struct sigevent.sigev_value.sigval_ptr... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sigval_ptr" >&5
++echo $ECHO_N "checking for struct sigevent.sigev_value.sigval_ptr... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sigevent_sigev_value_sigval_ptr+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -36384,21 +34189,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -36425,21 +34229,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
+@@ -36450,9 +34253,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
+-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
+-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
++if test $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
+@@ -36463,10 +34266,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
+-$as_echo_n "checking for struct timespec type... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct timespec type" >&5
++echo $ECHO_N "checking for struct timespec type... $ECHO_C" >&6; }
+ if test "${samba_cv_struct_timespec+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36506,21 +34309,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_struct_timespec=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_struct_timespec=no
+@@ -36528,8 +34330,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5
+-$as_echo "$samba_cv_struct_timespec" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5
++echo "${ECHO_T}$samba_cv_struct_timespec" >&6; }
+ if test x"$samba_cv_struct_timespec" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36540,10 +34342,10 @@
+ 
+ # stupid headers have the functions but no declaration. grrrr.
+ 
+- { $as_echo "$as_me:$LINENO: checking for errno declaration" >&5
+-$as_echo_n "checking for errno declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for errno declaration" >&5
++echo $ECHO_N "checking for errno declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_errno_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36567,21 +34369,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_errno_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_errno_decl=no
+@@ -36589,8 +34390,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_errno_decl" >&5
+-$as_echo "$ac_cv_have_errno_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_errno_decl" >&5
++echo "${ECHO_T}$ac_cv_have_errno_decl" >&6; }
+  if test x"$ac_cv_have_errno_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36600,10 +34401,10 @@
+  fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for setresuid declaration" >&5
+-$as_echo_n "checking for setresuid declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for setresuid declaration" >&5
++echo $ECHO_N "checking for setresuid declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_setresuid_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36627,21 +34428,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_setresuid_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_setresuid_decl=no
+@@ -36649,8 +34449,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_setresuid_decl" >&5
+-$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_setresuid_decl" >&5
++echo "${ECHO_T}$ac_cv_have_setresuid_decl" >&6; }
+  if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36660,10 +34460,10 @@
+  fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for setresgid declaration" >&5
+-$as_echo_n "checking for setresgid declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for setresgid declaration" >&5
++echo $ECHO_N "checking for setresgid declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_setresgid_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -36687,21 +34487,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_setresgid_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_setresgid_decl=no
+@@ -36709,8 +34508,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_setresgid_decl" >&5
+-$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_setresgid_decl" >&5
++echo "${ECHO_T}$ac_cv_have_setresgid_decl" >&6; }
+  if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36722,10 +34521,10 @@
+ 
+ # and glibc has setresuid under linux but the function does
+ # nothing until kernel 2.1.44! very dumb.
+-{ $as_echo "$as_me:$LINENO: checking for real setresuid" >&5
+-$as_echo_n "checking for real setresuid... " >&6; }
++{ echo "$as_me:$LINENO: checking for real setresuid" >&5
++echo $ECHO_N "checking for real setresuid... $ECHO_C" >&6; }
+ if test "${samba_cv_have_setresuid+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "$cross_compiling" = yes; then
+@@ -36746,39 +34545,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_have_setresuid=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_have_setresuid=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
+-$as_echo "$samba_cv_have_setresuid" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
++echo "${ECHO_T}$samba_cv_have_setresuid" >&6; }
+ if test x"$samba_cv_have_setresuid" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36789,10 +34585,10 @@
+ 
+ # Do the same check for setresguid...
+ #
+-{ $as_echo "$as_me:$LINENO: checking for real setresgid" >&5
+-$as_echo_n "checking for real setresgid... " >&6; }
++{ echo "$as_me:$LINENO: checking for real setresgid" >&5
++echo $ECHO_N "checking for real setresgid... $ECHO_C" >&6; }
+ if test "${samba_cv_have_setresgid+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "$cross_compiling" = yes; then
+@@ -36814,39 +34610,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_have_setresgid=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_have_setresgid=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
+-$as_echo "$samba_cv_have_setresgid" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
++echo "${ECHO_T}$samba_cv_have_setresgid" >&6; }
+ if test x"$samba_cv_have_setresgid" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36855,10 +34648,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
+-$as_echo_n "checking for working memcmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for working memcmp" >&5
++echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+ if test "${ac_cv_func_memcmp_working+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_memcmp_working=no
+@@ -36908,39 +34701,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memcmp_working=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_memcmp_working=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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+-$as_echo "$ac_cv_func_memcmp_working" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
++echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+   *" memcmp.$ac_objext "* ) ;;
+   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+@@ -36954,36 +34744,35 @@
+ test "${with_readline+set}" != "set" && with_readline=yes
+ 
+ # test for where we get readline() from
+-{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
+-$as_echo_n "checking whether to use readline... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use readline" >&5
++echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6; }
+ 
+ # Check whether --with-readline was given.
+ if test "${with_readline+set}" = set; then
+   withval=$with_readline;   case "$with_readline" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 
+ 
+ 
+ for ac_header in readline.h history.h readline/readline.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36999,33 +34788,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37039,52 +34827,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -37093,24 +34880,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -37120,21 +34904,20 @@
+ 
+ for ac_header in readline/history.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37150,33 +34933,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37190,52 +34972,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -37244,24 +35025,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -37273,21 +35051,20 @@
+ 
+ for ac_header in readline.h readline/readline.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37303,33 +35080,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37343,52 +35119,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -37397,32 +35172,29 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+       for termlib in ncurses curses termcap terminfo termlib tinfo; do
+-       as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
++       as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
++echo $ECHO_N "checking for tgetent in -l${termlib}... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l${termlib}  $LIBS"
+@@ -37454,49 +35226,42 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_Lib=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Lib=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
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-		 $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_Lib'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   TERMLIBS="-l${termlib}"; break
+ fi
+ 
+       done
+-      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
+-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
++      { echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
++echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMLIBS $LIBS"
+@@ -37528,37 +35293,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_readline_rl_callback_handler_install=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_readline_rl_callback_handler_install=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
++echo "${ECHO_T}$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
++if test $ac_cv_lib_readline_rl_callback_handler_install = yes; then
+   TERMLIBS="-lreadline $TERMLIBS"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -37576,12 +35337,12 @@
+ 
+     ;;
+   no)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+     # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
+     # alternate readline path
+@@ -37597,21 +35358,20 @@
+ 
+ for ac_header in readline.h history.h readline/readline.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37627,33 +35387,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37667,52 +35426,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -37721,24 +35479,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -37748,21 +35503,20 @@
+ 
+ for ac_header in readline/history.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37778,33 +35532,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37818,52 +35571,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -37872,24 +35624,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -37901,21 +35650,20 @@
+ 
+ for ac_header in readline.h readline/readline.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37931,33 +35679,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37971,52 +35718,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -38025,32 +35771,29 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+       for termlib in ncurses curses termcap terminfo termlib; do
+-       as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
++       as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
++echo $ECHO_N "checking for tgetent in -l${termlib}... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l${termlib}  $LIBS"
+@@ -38082,49 +35825,42 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_Lib=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Lib=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
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-		 $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_Lib'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   TERMLIBS="-l${termlib}"; break
+ fi
+ 
+       done
+-      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
+-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
++      { echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
++echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMLIBS $LIBS"
+@@ -38156,37 +35892,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_readline_rl_callback_handler_install=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_readline_rl_callback_handler_install=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
++echo "${ECHO_T}$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
++if test $ac_cv_lib_readline_rl_callback_handler_install = yes; then
+   TERMLDFLAGS="-L$with_readline/lib"
+        TERMCPPFLAGS="-I$with_readline/include"
+        CPPFLAGS="-I$with_readline/include $CPPFLAGS"
+@@ -38210,8 +35942,8 @@
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -38221,10 +35953,10 @@
+ # The readline API changed slightly from readline3 to readline4, so
+ # code will generate warnings on one of them unless we have a few
+ # special cases.
+-{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
+-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
++{ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
++echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMLIBS $LIBS"
+@@ -38256,37 +35988,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_readline_rl_completion_matches=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_readline_rl_completion_matches=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
++echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6; }
++if test $ac_cv_lib_readline_rl_completion_matches = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NEW_LIBREADLINE 1
+@@ -38296,10 +36024,10 @@
+ 
+ 
+ # not all readline libs have rl_event_hook or history_list
+-{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
+-$as_echo_n "checking whether rl_event_hook is declared... " >&6; }
++{ echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
++echo $ECHO_N "checking whether rl_event_hook is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -38326,21 +36054,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_decl_rl_event_hook=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_decl_rl_event_hook=no
+@@ -38348,9 +36075,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
+-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
+-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
++echo "${ECHO_T}$ac_cv_have_decl_rl_event_hook" >&6; }
++if test $ac_cv_have_decl_rl_event_hook = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_RL_EVENT_HOOK 1
+@@ -38366,10 +36093,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
+-$as_echo_n "checking for history_list in -lreadline... " >&6; }
++{ echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
++echo $ECHO_N "checking for history_list in -lreadline... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_readline_history_list+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMLIBS $LIBS"
+@@ -38401,37 +36128,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_readline_history_list=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_readline_history_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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
+-$as_echo "$ac_cv_lib_readline_history_list" >&6; }
+-if test "x$ac_cv_lib_readline_history_list" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
++echo "${ECHO_T}$ac_cv_lib_readline_history_list" >&6; }
++if test $ac_cv_lib_readline_history_list = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HISTORY_LIST 1
+@@ -38442,10 +36165,10 @@
+ 
+ ###############################################
+ # test for where we get yp_get_default_domain() from
+-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
+-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
++echo $ECHO_N "checking for library containing yp_get_default_domain... $ECHO_C" >&6; }
+ if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -38483,30 +36206,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_yp_get_default_domain=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+@@ -38521,8 +36240,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
+-$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
++echo "${ECHO_T}$ac_cv_search_yp_get_default_domain" >&6; }
+ ac_res=$ac_cv_search_yp_get_default_domain
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -38532,11 +36251,11 @@
+ 
+ for ac_func in yp_get_default_domain
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -38589,42 +36308,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -38635,11 +36347,11 @@
+ 
+ for ac_func in execl
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -38692,42 +36404,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -38754,11 +36459,11 @@
+ 
+ for ac_func in waitpid getcwd strdup strndup strnlen strerror chown fchown lchown chmod fchmod chroot link mknod mknod64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -38811,42 +36516,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -38860,11 +36558,11 @@
+ 
+ for ac_func in strtol strtoll strtoul strtoull strtouq __strtoull
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -38917,42 +36615,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -38965,11 +36656,11 @@
+ 
+ for ac_func in fstat strchr utime utimes chflags
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39022,42 +36713,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39072,11 +36756,11 @@
+ 
+ for ac_func in getrlimit fsync fdatasync memset strlcpy strlcat setpgid
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39129,42 +36813,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39179,11 +36856,11 @@
+ 
+ for ac_func in memmove setsid glob strpbrk pipe crypt16 getauthuid
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39236,42 +36913,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39288,11 +36958,11 @@
+ 
+ for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39345,42 +37015,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39396,11 +37059,11 @@
+ 
+ for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf realpath
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39453,42 +37116,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39507,11 +37163,11 @@
+ 
+ for ac_func in setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate chsize stat64 fstat64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39564,42 +37220,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39614,11 +37263,11 @@
+ 
+ for ac_func in lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39671,42 +37320,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39721,11 +37363,11 @@
+ 
+ for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39778,42 +37420,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39827,11 +37462,11 @@
+ 
+ for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39884,42 +37519,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -39928,11 +37556,11 @@
+ 
+ for ac_func in getpwent_r
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -39985,42 +37613,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40030,11 +37651,11 @@
+ 
+ for ac_func in getdents getdents64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40087,42 +37708,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40141,11 +37755,11 @@
+ 
+ for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40198,42 +37812,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40244,11 +37851,11 @@
+ 
+ for ac_func in syslog vsyslog timegm
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40301,42 +37908,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40346,11 +37946,11 @@
+ 
+ for ac_func in setlocale nl_langinfo
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40403,42 +38003,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40447,11 +38040,11 @@
+ 
+ for ac_func in nanosleep
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40504,42 +38097,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40551,11 +38137,11 @@
+ 
+ for ac_func in mlock munlock mlockall munlockall
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40608,42 +38194,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40654,11 +38233,11 @@
+ 
+ for ac_func in memalign posix_memalign hstrerror
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40711,42 +38290,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40755,21 +38327,20 @@
+ 
+ for ac_header in sys/mman.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40785,33 +38356,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40825,52 +38395,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -40879,24 +38448,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -40909,11 +38475,11 @@
+ 
+ for ac_func in setbuffer shmget shm_open
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40966,42 +38532,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -41011,11 +38570,11 @@
+ 
+ for ac_func in gettext dgettext
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -41068,42 +38627,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -41116,21 +38668,20 @@
+ 
+ for ac_header in execinfo.h libexc.h libunwind.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41146,33 +38697,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41186,52 +38736,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -41240,24 +38789,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -41265,10 +38811,10 @@
+ done
+ 
+ # libexecinfo provides backtrace_symbols on FreeBSD
+-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
+-$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
++echo $ECHO_N "checking for library containing backtrace_symbols... $ECHO_C" >&6; }
+ if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -41306,30 +38852,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_backtrace_symbols=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+@@ -41344,8 +38886,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
+-$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
++echo "${ECHO_T}$ac_cv_search_backtrace_symbols" >&6; }
+ ac_res=$ac_cv_search_backtrace_symbols
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -41355,11 +38897,11 @@
+ 
+ for ac_func in backtrace_symbols
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -41412,52 +38954,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
+-$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
++{ echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
++echo $ECHO_N "checking for trace_back_stack in -lexc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexc  $LIBS"
+@@ -41489,37 +39024,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_exc_trace_back_stack=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_exc_trace_back_stack=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
+-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
++echo "${ECHO_T}$ac_cv_lib_exc_trace_back_stack" >&6; }
++if test $ac_cv_lib_exc_trace_back_stack = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBEXC 1
+ _ACEOF
+@@ -41553,30 +39084,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_GPFS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_GPFS=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ echo $samba_cv_HAVE_GPFS
+@@ -41614,30 +39141,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_GPFS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_GPFS=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ echo $samba_cv_HAVE_GPFS
+@@ -41654,8 +39177,8 @@
+ # Note that all the libunwind symbols in the API are defined to internal
+ # platform-specific version, so we must include libunwind.h before checking
+ # any of them.
+-{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
+-$as_echo_n "checking for libunwind... " >&6; }
++{ echo "$as_me:$LINENO: checking for libunwind" >&5
++echo $ECHO_N "checking for libunwind... $ECHO_C" >&6; }
+ save_LIBS=$LIBS
+ 
+ UNWIND_ARCH="unknown"
+@@ -41714,24 +39237,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBUNWIND 1
+@@ -41744,21 +39264,20 @@
+ 
+ for ac_header in libunwind-ptrace.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41774,33 +39293,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41814,52 +39332,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -41868,34 +39385,31 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
+-$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
++	{ echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
++echo $ECHO_N "checking for _UPT_create in -lunwind-ptrace... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lunwind-ptrace  $LIBS"
+@@ -41927,37 +39441,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_unwind_ptrace__UPT_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_unwind_ptrace__UPT_create=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
++echo "${ECHO_T}$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
++if test $ac_cv_lib_unwind_ptrace__UPT_create = yes; then
+ 
+ 		LIBUNWIND_PTRACE="-lunwind-ptrace";
+ 
+@@ -41974,17 +39484,16 @@
+ 	LIBS=$save_LIBS
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	LIBS=$save_LIBS
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -41993,21 +39502,20 @@
+ 
+ for ac_header in sys/ptrace.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42023,33 +39531,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42063,52 +39570,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -42117,32 +39623,29 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-    { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
+-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
++    { echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
++echo $ECHO_N "checking for the Linux ptrace(2) interface... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42179,24 +39682,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LINUX_PTRACE 1
+@@ -42204,17 +39704,16 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		LIBUNWIND_PTRACE=""
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -42230,11 +39729,11 @@
+ 
+ for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42287,42 +39786,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42337,11 +39829,11 @@
+ 
+ for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42394,42 +39886,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42439,11 +39924,11 @@
+ 
+ for ac_func in __getcwd _getcwd
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42496,42 +39981,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42542,11 +40020,11 @@
+ 
+ for ac_func in __xstat __fxstat __lxstat
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42599,42 +40077,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42648,11 +40119,11 @@
+ 
+ for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42705,42 +40176,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42756,11 +40220,11 @@
+ 
+ for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42813,42 +40277,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42862,11 +40319,11 @@
+ 
+ for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -42919,42 +40376,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -42968,11 +40418,11 @@
+ 
+ for ac_func in getdents __getdents _lseek __lseek _read __read
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43025,42 +40475,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43073,11 +40516,11 @@
+ 
+ for ac_func in getdirentries _write __write _fork __fork
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43130,42 +40573,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43179,11 +40615,11 @@
+ 
+ for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43236,42 +40672,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43286,11 +40715,11 @@
+ 
+ for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43343,42 +40772,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43392,11 +40814,11 @@
+ 
+ for ac_func in pread _pread __pread pread64 _pread64 __pread64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43449,42 +40871,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43498,11 +40913,11 @@
+ 
+ for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43555,42 +40970,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43602,11 +41010,11 @@
+ 
+ for ac_func in open64 _open64 __open64 creat64
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43659,42 +41067,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43703,11 +41104,11 @@
+ 
+ for ac_func in prctl
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43760,42 +41161,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -43827,14 +41221,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -43845,7 +41238,7 @@
+ _ACEOF
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -43857,16 +41250,14 @@
+ #
+ #
  case "$host_os" in
 -    *linux*)
 +    linux*-gnu* | gnu* | k*bsd*-gnu)
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -46459,11 +46486,14 @@
+-  { { $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
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -43898,32 +41289,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   linux_getgrouplist_ok=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
+ ( exit $ac_status )
+ linux_getgrouplist_ok=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
+ 
+@@ -43940,11 +41328,11 @@
+ 
+ for ac_func in getgrouplist
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -43997,42 +41385,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -44046,8 +41427,8 @@
+ #
+ 
+ if test x$ac_cv_func_stat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
++  { echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
++echo $ECHO_N "checking for stat64 in <sys/stat.h>... $ECHO_C" >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44074,34 +41455,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_stat64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
+-$as_echo "$ac_cv_func_stat64" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
++echo "${ECHO_T}$ac_cv_func_stat64" >&6; }
+   if test x$ac_cv_func_stat64 = xyes ; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -44112,8 +41489,8 @@
+ fi
+ 
+ if test x$ac_cv_func_lstat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
++  { echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
++echo $ECHO_N "checking for lstat64 in <sys/stat.h>... $ECHO_C" >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44140,34 +41517,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_lstat64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
+-$as_echo "$ac_cv_func_lstat64" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
++echo "${ECHO_T}$ac_cv_func_lstat64" >&6; }
+   if test x$ac_cv_func_lstat64 = xyes ; then
+     cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LSTAT64 Whether lstat64() is available
+@@ -44177,8 +41550,8 @@
+ fi
+ 
+ if test x$ac_cv_func_fstat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
++  { echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
++echo $ECHO_N "checking for fstat64 in <sys/stat.h>... $ECHO_C" >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44205,34 +41578,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_fstat64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
+-$as_echo "$ac_cv_func_fstat64" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
++echo "${ECHO_T}$ac_cv_func_fstat64" >&6; }
+   if test x$ac_cv_func_fstat64 = xyes ; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -44254,10 +41623,10 @@
+ # "struct timespec" or "timespec_t". Linux doesn't have timespec_t, so we
+ # prefer struct timespec.
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps" >&5
+-$as_echo_n "checking whether struct stat has sub-second timestamps... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps" >&5
++echo $ECHO_N "checking whether struct stat has sub-second timestamps... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_hires+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -44304,21 +41673,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_stat_hires=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_stat_hires=no
+@@ -44327,8 +41695,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_hires" >&5
+-$as_echo "$samba_cv_stat_hires" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_hires" >&5
++echo "${ECHO_T}$samba_cv_stat_hires" >&6; }
+ 
+ if test x"$samba_cv_stat_hires" = x"yes" ; then
+ 
+@@ -44353,10 +41721,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec" >&5
+-$as_echo_n "checking whether struct stat has sub-second timestamps without struct timespec... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec" >&5
++echo $ECHO_N "checking whether struct stat has sub-second timestamps without struct timespec... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_hires_notimespec+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -44403,21 +41771,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_stat_hires=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_stat_hires=no
+@@ -44426,8 +41793,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_hires_notimespec" >&5
+-$as_echo "$samba_cv_stat_hires_notimespec" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_hires_notimespec" >&5
++echo "${ECHO_T}$samba_cv_stat_hires_notimespec" >&6; }
+ 
+ if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
+ 
+@@ -44452,10 +41819,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has st_birthtimespec" >&5
+-$as_echo_n "checking whether struct stat has st_birthtimespec... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has st_birthtimespec" >&5
++echo $ECHO_N "checking whether struct stat has st_birthtimespec... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_st_birthtimespec+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -44497,21 +41864,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_stat_st_birthtimespec=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_stat_birthtimespec=no
+@@ -44520,8 +41886,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtimespec" >&5
+-$as_echo "$samba_cv_stat_st_birthtimespec" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtimespec" >&5
++echo "${ECHO_T}$samba_cv_stat_st_birthtimespec" >&6; }
+ 
+ if test x"$samba_cv_stat_st_birthtimespec" = x"yes" ; then
+ 
+@@ -44531,10 +41897,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has st_birthtimensec" >&5
+-$as_echo_n "checking whether struct stat has st_birthtimensec... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has st_birthtimensec" >&5
++echo $ECHO_N "checking whether struct stat has st_birthtimensec... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_st_birthtimensec+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -44576,21 +41942,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_stat_st_birthtimensec=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_stat_birthtimensec=no
+@@ -44599,8 +41964,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtimensec" >&5
+-$as_echo "$samba_cv_stat_st_birthtimensec" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtimensec" >&5
++echo "${ECHO_T}$samba_cv_stat_st_birthtimensec" >&6; }
+ 
+ if test x"$samba_cv_stat_st_birthtimensec" = x"yes" ; then
+ 
+@@ -44610,10 +41975,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has st_birthtime" >&5
+-$as_echo_n "checking whether struct stat has st_birthtime... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has st_birthtime" >&5
++echo $ECHO_N "checking whether struct stat has st_birthtime... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_st_birthtime+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -44655,21 +42020,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_stat_st_birthtime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_stat_birthtime=no
+@@ -44678,8 +42042,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtime" >&5
+-$as_echo "$samba_cv_stat_st_birthtime" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_st_birthtime" >&5
++echo "${ECHO_T}$samba_cv_stat_st_birthtime" >&6; }
+ 
+ if test x"$samba_cv_stat_st_birthtime" = x"yes" ; then
+ 
+@@ -44692,10 +42056,10 @@
+ #####################################
+ # needed for SRV lookups
+ 
+-{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
++{ echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
++echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+@@ -44727,37 +42091,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_resolv_dn_expand=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_resolv_dn_expand=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
++if test $ac_cv_lib_resolv_dn_expand = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -44767,10 +42127,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
+-$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
++{ echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
++echo $ECHO_N "checking for _dn_expand in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+@@ -44802,37 +42162,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_resolv__dn_expand=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_resolv__dn_expand=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv__dn_expand" >&6; }
++if test $ac_cv_lib_resolv__dn_expand = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -44842,10 +42198,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
+-$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
++{ echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
++echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+@@ -44877,37 +42233,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_resolv___dn_expand=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_resolv___dn_expand=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }
++if test $ac_cv_lib_resolv___dn_expand = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -44927,11 +42279,11 @@
+ 
+ for ac_func in putprpwnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -44984,42 +42336,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # putprpwnam was found in libc or existing $LIBS
+@@ -45044,10 +42389,10 @@
+ 	    ;;
+           *)
+ 	    # putprpwnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
++	    { echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
++echo $ECHO_N "checking for putprpwnam in -lsecurity... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsecurity  $LIBS"
+@@ -45079,37 +42424,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_security_putprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_security_putprpwnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
++echo "${ECHO_T}$ac_cv_lib_security_putprpwnam" >&6; }
++if test $ac_cv_lib_security_putprpwnam = yes; then
+ 
+ 		LIBS="-lsecurity $LIBS"
+ 
+@@ -45141,11 +42482,11 @@
+ 
+ for ac_func in putprpwnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -45198,42 +42539,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # putprpwnam was found in libc or existing $LIBS
+@@ -45258,10 +42592,10 @@
+ 	    ;;
+           *)
+ 	    # putprpwnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
+-$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
++	    { echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
++echo $ECHO_N "checking for putprpwnam in -lsec... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsec  $LIBS"
+@@ -45293,37 +42627,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sec_putprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sec_putprpwnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
++echo "${ECHO_T}$ac_cv_lib_sec_putprpwnam" >&6; }
++if test $ac_cv_lib_sec_putprpwnam = yes; then
+ 
+ 		LIBS="-lsec $LIBS"
+ 
+@@ -45356,11 +42686,11 @@
+ 
+ for ac_func in set_auth_parameters
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -45413,42 +42743,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # set_auth_parameters was found in libc or existing $LIBS
+@@ -45473,10 +42796,10 @@
+ 	    ;;
+           *)
+ 	    # set_auth_parameters was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
++	    { echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
++echo $ECHO_N "checking for set_auth_parameters in -lsecurity... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsecurity  $LIBS"
+@@ -45508,37 +42831,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_security_set_auth_parameters=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_security_set_auth_parameters=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
++echo "${ECHO_T}$ac_cv_lib_security_set_auth_parameters" >&6; }
++if test $ac_cv_lib_security_set_auth_parameters = yes; then
+ 
+ 		LIBS="-lsecurity $LIBS"
+ 
+@@ -45570,11 +42889,11 @@
+ 
+ for ac_func in set_auth_parameters
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -45627,42 +42946,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # set_auth_parameters was found in libc or existing $LIBS
+@@ -45687,10 +42999,10 @@
+ 	    ;;
+           *)
+ 	    # set_auth_parameters was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
++	    { echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
++echo $ECHO_N "checking for set_auth_parameters in -lsec... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsec  $LIBS"
+@@ -45722,37 +43034,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sec_set_auth_parameters=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sec_set_auth_parameters=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
++echo "${ECHO_T}$ac_cv_lib_sec_set_auth_parameters" >&6; }
++if test $ac_cv_lib_sec_set_auth_parameters = yes; then
+ 
+ 		LIBS="-lsec $LIBS"
+ 
+@@ -45786,11 +43094,11 @@
+ 
+ for ac_func in getspnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -45843,42 +43151,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # getspnam was found in libc or existing $LIBS
+@@ -45903,10 +43204,10 @@
+ 	    ;;
+           *)
+ 	    # getspnam was not found, try adding libgen
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
+-$as_echo_n "checking for getspnam in -lgen... " >&6; }
++	    { echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
++echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_gen_getspnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+@@ -45938,37 +43239,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_gen_getspnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_gen_getspnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
+-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
++echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6; }
++if test $ac_cv_lib_gen_getspnam = yes; then
+ 
+ 		LIBS="-lgen $LIBS"
+ 
+@@ -46001,11 +43298,11 @@
+ 
+ for ac_func in getspnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -46058,42 +43355,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # getspnam was found in libc or existing $LIBS
+@@ -46118,10 +43408,10 @@
+ 	    ;;
+           *)
+ 	    # getspnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
+-$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
++	    { echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
++echo $ECHO_N "checking for getspnam in -lsecurity... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_security_getspnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsecurity  $LIBS"
+@@ -46153,37 +43443,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_security_getspnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_security_getspnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
+-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
++echo "${ECHO_T}$ac_cv_lib_security_getspnam" >&6; }
++if test $ac_cv_lib_security_getspnam = yes; then
+ 
+ 		LIBS="-lsecurity $LIBS"
+ 
+@@ -46215,11 +43501,11 @@
+ 
+ for ac_func in getspnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -46272,42 +43558,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # getspnam was found in libc or existing $LIBS
+@@ -46332,10 +43611,10 @@
+ 	    ;;
+           *)
+ 	    # getspnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
+-$as_echo_n "checking for getspnam in -lsec... " >&6; }
++	    { echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
++echo $ECHO_N "checking for getspnam in -lsec... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sec_getspnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsec  $LIBS"
+@@ -46367,37 +43646,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sec_getspnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sec_getspnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
+-$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
+-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
++echo "${ECHO_T}$ac_cv_lib_sec_getspnam" >&6; }
++if test $ac_cv_lib_sec_getspnam = yes; then
+ 
+ 		LIBS="-lsec $LIBS"
+ 
+@@ -46430,11 +43705,11 @@
+ 
+ for ac_func in bigcrypt
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -46487,42 +43762,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # bigcrypt was found in libc or existing $LIBS
+@@ -46547,10 +43815,10 @@
+ 	    ;;
+           *)
+ 	    # bigcrypt was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
+-$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
++	    { echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
++echo $ECHO_N "checking for bigcrypt in -lsecurity... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsecurity  $LIBS"
+@@ -46582,37 +43850,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_security_bigcrypt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_security_bigcrypt=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_security_bigcrypt" >&6; }
++if test $ac_cv_lib_security_bigcrypt = yes; then
+ 
+ 		LIBS="-lsecurity $LIBS"
+ 
+@@ -46644,11 +43908,11 @@
+ 
+ for ac_func in bigcrypt
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -46701,42 +43965,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # bigcrypt was found in libc or existing $LIBS
+@@ -46761,10 +44018,10 @@
+ 	    ;;
+           *)
+ 	    # bigcrypt was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
+-$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
++	    { echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
++echo $ECHO_N "checking for bigcrypt in -lsec... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsec  $LIBS"
+@@ -46796,37 +44053,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sec_bigcrypt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sec_bigcrypt=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
++echo "${ECHO_T}$ac_cv_lib_sec_bigcrypt" >&6; }
++if test $ac_cv_lib_sec_bigcrypt = yes; then
+ 
+ 		LIBS="-lsec $LIBS"
+ 
+@@ -46859,11 +44112,11 @@
+ 
+ for ac_func in getprpwnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -46916,42 +44169,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # getprpwnam was found in libc or existing $LIBS
+@@ -46976,10 +44222,10 @@
+ 	    ;;
+           *)
+ 	    # getprpwnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
++	    { echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
++echo $ECHO_N "checking for getprpwnam in -lsecurity... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsecurity  $LIBS"
+@@ -47011,37 +44257,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_security_getprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_security_getprpwnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
++echo "${ECHO_T}$ac_cv_lib_security_getprpwnam" >&6; }
++if test $ac_cv_lib_security_getprpwnam = yes; then
+ 
+ 		LIBS="-lsecurity $LIBS"
+ 
+@@ -47073,11 +44315,11 @@
+ 
+ for ac_func in getprpwnam
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47130,42 +44372,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # getprpwnam was found in libc or existing $LIBS
+@@ -47190,10 +44425,10 @@
+ 	    ;;
+           *)
+ 	    # getprpwnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
+-$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
++	    { echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
++echo $ECHO_N "checking for getprpwnam in -lsec... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsec  $LIBS"
+@@ -47225,37 +44460,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sec_getprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sec_getprpwnam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
++echo "${ECHO_T}$ac_cv_lib_sec_getprpwnam" >&6; }
++if test $ac_cv_lib_sec_getprpwnam = yes; then
+ 
+ 		LIBS="-lsec $LIBS"
+ 
+@@ -47287,11 +44518,11 @@
+ 
+ for ac_func in strsignal
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47344,42 +44575,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -47390,10 +44614,10 @@
+ # Check if we have libattr
+ case "$host_os" in
+   *osf*)
+-	{ $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
+-$as_echo_n "checking for library containing getproplist... " >&6; }
++	{ echo "$as_me:$LINENO: checking for library containing getproplist" >&5
++echo $ECHO_N "checking for library containing getproplist... $ECHO_C" >&6; }
+ if test "${ac_cv_search_getproplist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -47431,30 +44655,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_getproplist=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_getproplist+set}" = set; then
+@@ -47469,8 +44689,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
+-$as_echo "$ac_cv_search_getproplist" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
++echo "${ECHO_T}$ac_cv_search_getproplist" >&6; }
+ ac_res=$ac_cv_search_getproplist
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -47483,11 +44703,11 @@
+ 
+ for ac_func in getproplist fgetproplist setproplist fsetproplist
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47540,42 +44760,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -47587,11 +44800,11 @@
+ 
+ for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47644,42 +44857,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -47688,11 +44894,11 @@
+ 
+ for ac_func in sizeof_proplist_entry
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47745,42 +44951,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -47788,10 +44987,10 @@
+ 
+   ;;
+   *)
+-	{ $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
+-$as_echo_n "checking for library containing getxattr... " >&6; }
++	{ echo "$as_me:$LINENO: checking for library containing getxattr" >&5
++echo $ECHO_N "checking for library containing getxattr... $ECHO_C" >&6; }
+ if test "${ac_cv_search_getxattr+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -47829,30 +45028,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_getxattr=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_getxattr+set}" = set; then
+@@ -47867,8 +45062,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getxattr" >&5
+-$as_echo "$ac_cv_search_getxattr" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_getxattr" >&5
++echo "${ECHO_T}$ac_cv_search_getxattr" >&6; }
+ ac_res=$ac_cv_search_getxattr
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -47882,11 +45077,11 @@
+ 
+ for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -47939,42 +45134,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -47988,11 +45176,11 @@
+ 
+ for ac_func in getea fgetea lgetea listea flistea llistea
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48045,42 +45233,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48094,11 +45275,11 @@
+ 
+ for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48151,42 +45332,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48198,11 +45372,11 @@
+ 
+ for ac_func in flistxattr removexattr lremovexattr fremovexattr
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48255,42 +45429,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48301,11 +45468,11 @@
+ 
+ for ac_func in setxattr lsetxattr fsetxattr
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48358,42 +45525,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48405,11 +45565,11 @@
+ 
+ for ac_func in attr_get attr_list attr_set attr_remove
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48462,42 +45622,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48509,11 +45662,11 @@
+ 
+ for ac_func in attr_getf attr_listf attr_setf attr_removef
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48566,42 +45719,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48617,11 +45763,11 @@
+ 
+ for ac_func in attropen
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48674,42 +45820,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48721,10 +45860,10 @@
+ ########################################################
+ # Do xattr functions take additional options like on Darwin?
+ if test x"$ac_cv_func_getxattr" = x"yes" ; then
+-	{ $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
+-$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
++	{ echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
++echo $ECHO_N "checking whether xattr interface takes additional options... $ECHO_C" >&6; }
+ if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		old_LIBS=$LIBS
+@@ -48759,21 +45898,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   smb_attr_cv_xattr_add_opt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
+@@ -48782,8 +45920,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
+-$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
++echo "${ECHO_T}$smb_attr_cv_xattr_add_opt" >&6; }
+ 	if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -48808,11 +45946,11 @@
+ 
+ for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48865,42 +46003,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -48911,11 +46042,11 @@
+ 
+ for ac_func in extattr_get_fd extattr_get_file extattr_get_link
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -48968,42 +46099,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -49014,11 +46138,11 @@
+ 
+ for ac_func in extattr_list_fd extattr_list_file extattr_list_link
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -49071,42 +46195,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -49117,11 +46234,11 @@
+ 
+ for ac_func in extattr_set_fd extattr_set_file extattr_set_link
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -49174,42 +46291,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -49275,10 +46385,10 @@
+ 
+ if test "x$enable_pie" != xno
+ then
+-	{ $as_echo "$as_me:$LINENO: checking for -pie and -fPIE" >&5
+-$as_echo_n "checking for -pie and -fPIE... " >&6; }
++	{ echo "$as_me:$LINENO: checking for -pie and -fPIE" >&5
++echo $ECHO_N "checking for -pie and -fPIE... $ECHO_C" >&6; }
+ if test "${samba_cv_fpie+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat > conftest.c <<EOF
+@@ -49289,7 +46399,7 @@
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+ 		then
+ 			samba_cv_fpie=yes
+@@ -49299,8 +46409,8 @@
+ 		rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_fpie" >&5
+-$as_echo "$samba_cv_fpie" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_fpie" >&5
++echo "${ECHO_T}$samba_cv_fpie" >&6; }
+ 	if test x"${samba_cv_fpie}" = x"yes"
+ 	then
+ 		PIE_CFLAGS="-fPIE"
+@@ -49318,10 +46428,10 @@
+ 
+ if test "x$enable_relro" != xno
+ then
+-	{ $as_echo "$as_me:$LINENO: checking for -Wl,-z,relro" >&5
+-$as_echo_n "checking for -Wl,-z,relro... " >&6; }
++	{ echo "$as_me:$LINENO: checking for -Wl,-z,relro" >&5
++echo $ECHO_N "checking for -Wl,-z,relro... $ECHO_C" >&6; }
+ if test "${samba_cv_relro+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat > conftest.c <<EOF
+@@ -49332,7 +46442,7 @@
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }
+ 		then
+ 			samba_cv_relro=yes
+@@ -49342,8 +46452,8 @@
+ 		rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_relro" >&5
+-$as_echo "$samba_cv_relro" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_relro" >&5
++echo "${ECHO_T}$samba_cv_relro" >&6; }
+ 	if test x"${samba_cv_relro}" = x"yes"
+ 	then
+ 		RELRO_LDFLAGS="-Wl,-z,relro"
+@@ -49371,16 +46481,19 @@
+ # You need to specify how to create a shared library and
+   # how to compile C code to produce PIC object files
+ 
+-  { $as_echo "$as_me:$LINENO: checking ability to build shared libraries" >&5
+-$as_echo_n "checking ability to build shared libraries... " >&6; }
++  { echo "$as_me:$LINENO: checking ability to build shared libraries" >&5
++echo $ECHO_N "checking ability to build shared libraries... $ECHO_C" >&6; }
+ 
    # and these are for particular systems
    case "$host_os" in
 -		*linux*)
@@ -157,7 +42773,17251 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -67653,7 +67683,8 @@
+@@ -49640,10 +46753,10 @@
+ 			;;
+ 		*dgux*) # Extract the first word of "groff", so it can be a program name with args.
+ set dummy groff; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ROFF+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ROFF"; then
+   ac_cv_prog_ROFF="$ROFF" # Let the user override the test.
+@@ -49656,7 +46769,7 @@
+   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_ROFF="groff -etpsR -Tascii -man"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -49667,11 +46780,11 @@
+ fi
+ ROFF=$ac_cv_prog_ROFF
+ if test -n "$ROFF"; then
+-  { $as_echo "$as_me:$LINENO: result: $ROFF" >&5
+-$as_echo "$ROFF" >&6; }
++  { echo "$as_me:$LINENO: result: $ROFF" >&5
++echo "${ECHO_T}$ROFF" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -49777,54 +46890,54 @@
+ 	LDFLAGS="$LDFLAGS -L./bin"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $BLDSHARED" >&5
+-$as_echo "$BLDSHARED" >&6; }
++{ echo "$as_me:$LINENO: result: $BLDSHARED" >&5
++echo "${ECHO_T}$BLDSHARED" >&6; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking LDFLAGS" >&5
+-$as_echo_n "checking LDFLAGS... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $LDFLAGS" >&5
+-$as_echo "$LDFLAGS" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking DYNEXP" >&5
+-$as_echo_n "checking DYNEXP... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $DYNEXP" >&5
+-$as_echo "$DYNEXP" >&6; }
++{ echo "$as_me:$LINENO: checking LDFLAGS" >&5
++echo $ECHO_N "checking LDFLAGS... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $LDFLAGS" >&5
++echo "${ECHO_T}$LDFLAGS" >&6; }
++{ echo "$as_me:$LINENO: checking DYNEXP" >&5
++echo $ECHO_N "checking DYNEXP... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $DYNEXP" >&5
++echo "${ECHO_T}$DYNEXP" >&6; }
+ 
+ #######################################################
+ # test whether building a shared library actually works
+ if test $BLDSHARED = true; then
+ 
+-{ $as_echo "$as_me:$LINENO: checking SHLD" >&5
+-$as_echo_n "checking SHLD... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $SHLD" >&5
+-$as_echo "$SHLD" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking LDSHFLAGS" >&5
+-$as_echo_n "checking LDSHFLAGS... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $LDSHFLAGS" >&5
+-$as_echo "$LDSHFLAGS" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking SHLIBEXT" >&5
+-$as_echo_n "checking SHLIBEXT... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $SHLIBEXT" >&5
+-$as_echo "$SHLIBEXT" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking SONAMEFLAG" >&5
+-$as_echo_n "checking SONAMEFLAG... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $SONAMEFLAG" >&5
+-$as_echo "$SONAMEFLAG" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking PICFLAG" >&5
+-$as_echo_n "checking PICFLAG... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $PICFLAG" >&5
+-$as_echo "$PICFLAG" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking NSSSONAMEVERSIONSUFFIX" >&5
+-$as_echo_n "checking NSSSONAMEVERSIONSUFFIX... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $NSSSONAMEVERSIONSUFFIX" >&5
+-$as_echo "$NSSSONAMEVERSIONSUFFIX" >&6; }
++{ echo "$as_me:$LINENO: checking SHLD" >&5
++echo $ECHO_N "checking SHLD... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $SHLD" >&5
++echo "${ECHO_T}$SHLD" >&6; }
++{ echo "$as_me:$LINENO: checking LDSHFLAGS" >&5
++echo $ECHO_N "checking LDSHFLAGS... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $LDSHFLAGS" >&5
++echo "${ECHO_T}$LDSHFLAGS" >&6; }
++
++{ echo "$as_me:$LINENO: checking SHLIBEXT" >&5
++echo $ECHO_N "checking SHLIBEXT... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $SHLIBEXT" >&5
++echo "${ECHO_T}$SHLIBEXT" >&6; }
++{ echo "$as_me:$LINENO: checking SONAMEFLAG" >&5
++echo $ECHO_N "checking SONAMEFLAG... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $SONAMEFLAG" >&5
++echo "${ECHO_T}$SONAMEFLAG" >&6; }
++
++{ echo "$as_me:$LINENO: checking PICFLAG" >&5
++echo $ECHO_N "checking PICFLAG... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $PICFLAG" >&5
++echo "${ECHO_T}$PICFLAG" >&6; }
++
++{ echo "$as_me:$LINENO: checking NSSSONAMEVERSIONSUFFIX" >&5
++echo $ECHO_N "checking NSSSONAMEVERSIONSUFFIX... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $NSSSONAMEVERSIONSUFFIX" >&5
++echo "${ECHO_T}$NSSSONAMEVERSIONSUFFIX" >&6; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether building shared libraries actually works" >&5
+-$as_echo_n "checking whether building shared libraries actually works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether building shared libraries actually works" >&5
++echo $ECHO_N "checking whether building shared libraries actually works... $ECHO_C" >&6; }
+ if test "${ac_cv_shlib_works+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+    # try building a trivial shared library
+@@ -49839,8 +46952,8 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_shlib_works" >&5
+-$as_echo "$ac_cv_shlib_works" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_shlib_works" >&5
++echo "${ECHO_T}$ac_cv_shlib_works" >&6; }
+ if test $ac_cv_shlib_works = no; then
+    BLDSHARED=false
+ fi
+@@ -49855,10 +46968,10 @@
+ 	SHLIBEXT="shared_libraries_disabled"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking used PICFLAG" >&5
+-$as_echo_n "checking used PICFLAG... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $PICFLAG" >&5
+-$as_echo "$PICFLAG" >&6; }
++{ echo "$as_me:$LINENO: checking used PICFLAG" >&5
++echo $ECHO_N "checking used PICFLAG... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $PICFLAG" >&5
++echo "${ECHO_T}$PICFLAG" >&6; }
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -49899,10 +47012,10 @@
+ 
+ ################
+ 
+-{ $as_echo "$as_me:$LINENO: checking for long long" >&5
+-$as_echo_n "checking for long long... " >&6; }
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+ if test "${samba_cv_have_longlong+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -49923,85 +47036,47 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_have_longlong=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_have_longlong=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_longlong" >&5
+-$as_echo "$samba_cv_have_longlong" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_have_longlong" >&5
++echo "${ECHO_T}$samba_cv_have_longlong" >&6; }
+ if test x"$samba_cv_have_longlong" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONGLONG 1
+ _ACEOF
+ 
+-    { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
+-$as_echo_n "checking for intptr_t... " >&6; }
++    { echo "$as_me:$LINENO: checking for intptr_t" >&5
++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_intptr_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (intptr_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
+@@ -50009,11 +47084,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef intptr_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((intptr_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -50024,39 +47102,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_intptr_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_intptr_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_intptr_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+-$as_echo "$ac_cv_type_intptr_t" >&6; }
+-if test "x$ac_cv_type_intptr_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
++echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
++if test $ac_cv_type_intptr_t = yes; then
+   :
+ else
+ 
+@@ -50067,46 +47136,11 @@
+ fi
+ 
+ else
+-    { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
+-$as_echo_n "checking for intptr_t... " >&6; }
++    { echo "$as_me:$LINENO: checking for intptr_t" >&5
++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_intptr_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (intptr_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
+@@ -50114,11 +47148,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef intptr_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((intptr_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -50129,39 +47166,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_intptr_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_intptr_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
++	ac_cv_type_intptr_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+-$as_echo "$ac_cv_type_intptr_t" >&6; }
+-if test "x$ac_cv_type_intptr_t" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
++echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
++if test $ac_cv_type_intptr_t = yes; then
+   :
+ else
+ 
+@@ -50177,10 +47205,10 @@
+ # Check if the compiler supports the LL prefix on long long integers.
+ # AIX needs this.
+ 
+-{ $as_echo "$as_me:$LINENO: checking for LL suffix on long long integers" >&5
+-$as_echo_n "checking for LL suffix on long long integers... " >&6; }
++{ echo "$as_me:$LINENO: checking for LL suffix on long long integers" >&5
++echo $ECHO_N "checking for LL suffix on long long integers... $ECHO_C" >&6; }
+ if test "${samba_cv_compiler_supports_ll+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -50204,21 +47232,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_compiler_supports_ll=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_compiler_supports_ll=no
+@@ -50226,8 +47253,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_compiler_supports_ll" >&5
+-$as_echo "$samba_cv_compiler_supports_ll" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_compiler_supports_ll" >&5
++echo "${ECHO_T}$samba_cv_compiler_supports_ll" >&6; }
+ if test x"$samba_cv_compiler_supports_ll" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50237,10 +47264,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for 64 bit time_t" >&5
+-$as_echo_n "checking for 64 bit time_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for 64 bit time_t" >&5
++echo $ECHO_N "checking for 64 bit time_t... $ECHO_C" >&6; }
+ if test "${samba_cv_SIZEOF_TIME_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50261,39 +47288,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_SIZEOF_TIME_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_SIZEOF_TIME_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_TIME_T" >&5
+-$as_echo "$samba_cv_SIZEOF_TIME_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_TIME_T" >&5
++echo "${ECHO_T}$samba_cv_SIZEOF_TIME_T" >&6; }
+ if test x"$samba_cv_SIZEOF_TIME_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50302,10 +47326,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for 64 bit off_t" >&5
+-$as_echo_n "checking for 64 bit off_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for 64 bit off_t" >&5
++echo $ECHO_N "checking for 64 bit off_t... $ECHO_C" >&6; }
+ if test "${samba_cv_SIZEOF_OFF_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50327,39 +47351,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_SIZEOF_OFF_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_SIZEOF_OFF_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_OFF_T" >&5
+-$as_echo "$samba_cv_SIZEOF_OFF_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_OFF_T" >&5
++echo "${ECHO_T}$samba_cv_SIZEOF_OFF_T" >&6; }
+ if test x"$samba_cv_SIZEOF_OFF_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50368,10 +47389,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for off64_t" >&5
+-$as_echo_n "checking for off64_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for off64_t" >&5
++echo $ECHO_N "checking for off64_t... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_OFF64_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50397,39 +47418,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_OFF64_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_OFF64_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_OFF64_T" >&5
+-$as_echo "$samba_cv_HAVE_OFF64_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_OFF64_T" >&5
++echo "${ECHO_T}$samba_cv_HAVE_OFF64_T" >&6; }
+ if test x"$samba_cv_HAVE_OFF64_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50438,10 +47456,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for 64 bit ino_t" >&5
+-$as_echo_n "checking for 64 bit ino_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for 64 bit ino_t" >&5
++echo $ECHO_N "checking for 64 bit ino_t... $ECHO_C" >&6; }
+ if test "${samba_cv_SIZEOF_INO_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50467,39 +47485,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_SIZEOF_INO_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_SIZEOF_INO_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_INO_T" >&5
+-$as_echo "$samba_cv_SIZEOF_INO_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_INO_T" >&5
++echo "${ECHO_T}$samba_cv_SIZEOF_INO_T" >&6; }
+ if test x"$samba_cv_SIZEOF_INO_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50508,10 +47523,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ino64_t" >&5
+-$as_echo_n "checking for ino64_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for ino64_t" >&5
++echo $ECHO_N "checking for ino64_t... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_INO64_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50537,39 +47552,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_INO64_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_INO64_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_INO64_T" >&5
+-$as_echo "$samba_cv_HAVE_INO64_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INO64_T" >&5
++echo "${ECHO_T}$samba_cv_HAVE_INO64_T" >&6; }
+ if test x"$samba_cv_HAVE_INO64_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50578,10 +47590,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for 64 bit dev_t" >&5
+-$as_echo_n "checking for 64 bit dev_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for 64 bit dev_t" >&5
++echo $ECHO_N "checking for 64 bit dev_t... $ECHO_C" >&6; }
+ if test "${samba_cv_SIZEOF_DEV_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50607,39 +47619,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_SIZEOF_DEV_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_SIZEOF_DEV_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_DEV_T" >&5
+-$as_echo "$samba_cv_SIZEOF_DEV_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_DEV_T" >&5
++echo "${ECHO_T}$samba_cv_SIZEOF_DEV_T" >&6; }
+ if test x"$samba_cv_SIZEOF_DEV_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50648,10 +47657,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for dev64_t" >&5
+-$as_echo_n "checking for dev64_t... " >&6; }
++{ echo "$as_me:$LINENO: checking for dev64_t" >&5
++echo $ECHO_N "checking for dev64_t... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_DEV64_T+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50677,39 +47686,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_DEV64_T=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_DEV64_T=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEV64_T" >&5
+-$as_echo "$samba_cv_HAVE_DEV64_T" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEV64_T" >&5
++echo "${ECHO_T}$samba_cv_HAVE_DEV64_T" >&6; }
+ if test x"$samba_cv_HAVE_DEV64_T" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50718,10 +47724,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct dirent64" >&5
+-$as_echo_n "checking for struct dirent64... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct dirent64" >&5
++echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STRUCT_DIR64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -50750,21 +47756,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_STRUCT_DIR64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_STRUCT_DIR64=no
+@@ -50772,8 +47777,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_DIR64" >&5
+-$as_echo "$samba_cv_HAVE_STRUCT_DIR64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_DIR64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STRUCT_DIR64" >&6; }
+ if test x"$samba_cv_HAVE_STRUCT_DIR64" = x"yes" && test x"$ac_cv_func_readdir64" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50782,10 +47787,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct dirent64" >&5
+-$as_echo_n "checking for struct dirent64... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct dirent64" >&5
++echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STRUCT_DIRENT64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -50814,21 +47819,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_STRUCT_DIRENT64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_STRUCT_DIRENT64=no
+@@ -50836,8 +47840,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_DIRENT64" >&5
+-$as_echo "$samba_cv_HAVE_STRUCT_DIRENT64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_DIRENT64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STRUCT_DIRENT64" >&6; }
+ if test x"$samba_cv_HAVE_STRUCT_DIRENT64" = x"yes" && test x"$ac_cv_func_readdir64" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50846,10 +47850,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for major macro" >&5
+-$as_echo_n "checking for major macro... " >&6; }
++{ echo "$as_me:$LINENO: checking for major macro" >&5
++echo $ECHO_N "checking for major macro... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_DEVICE_MAJOR_FN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50874,39 +47878,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_DEVICE_MAJOR_FN=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_DEVICE_MAJOR_FN=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEVICE_MAJOR_FN" >&5
+-$as_echo "$samba_cv_HAVE_DEVICE_MAJOR_FN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEVICE_MAJOR_FN" >&5
++echo "${ECHO_T}$samba_cv_HAVE_DEVICE_MAJOR_FN" >&6; }
+ if test x"$samba_cv_HAVE_DEVICE_MAJOR_FN" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50915,10 +47916,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for minor macro" >&5
+-$as_echo_n "checking for minor macro... " >&6; }
++{ echo "$as_me:$LINENO: checking for minor macro" >&5
++echo $ECHO_N "checking for minor macro... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_DEVICE_MINOR_FN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -50943,39 +47944,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_DEVICE_MINOR_FN=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_DEVICE_MINOR_FN=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEVICE_MINOR_FN" >&5
+-$as_echo "$samba_cv_HAVE_DEVICE_MINOR_FN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_DEVICE_MINOR_FN" >&5
++echo "${ECHO_T}$samba_cv_HAVE_DEVICE_MINOR_FN" >&6; }
+ if test x"$samba_cv_HAVE_DEVICE_MINOR_FN" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -50984,10 +47982,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for makedev macro" >&5
+-$as_echo_n "checking for makedev macro... " >&6; }
++{ echo "$as_me:$LINENO: checking for makedev macro" >&5
++echo $ECHO_N "checking for makedev macro... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_MAKEDEV+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -51012,39 +48010,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_MAKEDEV=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_MAKEDEV=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_MAKEDEV" >&5
+-$as_echo "$samba_cv_HAVE_MAKEDEV" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_MAKEDEV" >&5
++echo "${ECHO_T}$samba_cv_HAVE_MAKEDEV" >&6; }
+ if test x"$samba_cv_HAVE_MAKEDEV" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -51053,10 +48048,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for unsigned char" >&5
+-$as_echo_n "checking for unsigned char... " >&6; }
++{ echo "$as_me:$LINENO: checking for unsigned char" >&5
++echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UNSIGNED_CHAR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -51077,39 +48072,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_UNSIGNED_CHAR=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_UNSIGNED_CHAR=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UNSIGNED_CHAR" >&5
+-$as_echo "$samba_cv_HAVE_UNSIGNED_CHAR" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UNSIGNED_CHAR" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UNSIGNED_CHAR" >&6; }
+ if test x"$samba_cv_HAVE_UNSIGNED_CHAR" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -51118,10 +48110,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether seekdir returns void" >&5
+-$as_echo_n "checking whether seekdir returns void... " >&6; }
++{ echo "$as_me:$LINENO: checking whether seekdir returns void" >&5
++echo $ECHO_N "checking whether seekdir returns void... $ECHO_C" >&6; }
+ if test "${samba_cv_SEEKDIR_RETURNS_VOID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -51147,21 +48139,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_SEEKDIR_RETURNS_VOID=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_SEEKDIR_RETURNS_VOID=no
+@@ -51169,8 +48160,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SEEKDIR_RETURNS_VOID" >&5
+-$as_echo "$samba_cv_SEEKDIR_RETURNS_VOID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SEEKDIR_RETURNS_VOID" >&5
++echo "${ECHO_T}$samba_cv_SEEKDIR_RETURNS_VOID" >&6; }
+ if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -51179,10 +48170,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
+-$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++{ echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
++echo $ECHO_N "checking for __FUNCTION__ macro... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_FUNCTION_MACRO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -51206,21 +48197,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_FUNCTION_MACRO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_FUNCTION_MACRO=no
+@@ -51228,8 +48218,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_FUNCTION_MACRO" >&5
+-$as_echo "$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_FUNCTION_MACRO" >&5
++echo "${ECHO_T}$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
+ if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -51238,10 +48228,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
+-$as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
++{ echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
++echo $ECHO_N "checking if gettimeofday takes tz argument... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -51267,35 +48257,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_GETTIMEOFDAY_TZ=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
+-$as_echo "$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
++echo "${ECHO_T}$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
+ if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -51315,11 +48301,11 @@
+ 
+ for ac_func in clock_gettime
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -51372,42 +48358,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # clock_gettime was found in libc or existing $LIBS
+@@ -51419,8 +48398,8 @@
+ _ACEOF
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_MONOTONIC" >&5
+-$as_echo_n "checking for CLOCK_MONOTONIC... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_MONOTONIC" >&5
++echo $ECHO_N "checking for CLOCK_MONOTONIC... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51455,24 +48434,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_MONOTONIC 1
+@@ -51480,22 +48456,21 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
+-$as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
++echo $ECHO_N "checking for CLOCK_PROCESS_CPUTIME_ID... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51530,24 +48505,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_PROCESS_CPUTIME_ID 1
+@@ -51555,22 +48527,21 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
+-$as_echo_n "checking for CLOCK_REALTIME... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
++echo $ECHO_N "checking for CLOCK_REALTIME... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51605,24 +48576,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_REALTIME 1
+@@ -51630,16 +48598,15 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+@@ -51659,10 +48626,10 @@
+ 	    ;;
+           *)
+ 	    # clock_gettime was not found, try adding librt
+-	    { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
++	    { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
++echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+@@ -51694,37 +48661,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_rt_clock_gettime=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6; }
++if test $ac_cv_lib_rt_clock_gettime = yes; then
+ 
+ 		LIBS="-lrt $LIBS"
+ 
+@@ -51735,8 +48698,8 @@
+ _ACEOF
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_MONOTONIC" >&5
+-$as_echo_n "checking for CLOCK_MONOTONIC... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_MONOTONIC" >&5
++echo $ECHO_N "checking for CLOCK_MONOTONIC... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51771,24 +48734,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_MONOTONIC 1
+@@ -51796,22 +48756,21 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
+-$as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
++echo $ECHO_N "checking for CLOCK_PROCESS_CPUTIME_ID... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51846,24 +48805,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_PROCESS_CPUTIME_ID 1
+@@ -51871,22 +48827,21 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
+-$as_echo_n "checking for CLOCK_REALTIME... " >&6; }
++    { echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
++echo $ECHO_N "checking for CLOCK_REALTIME... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51921,24 +48876,21 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CLOCK_REALTIME 1
+@@ -51946,16 +48898,15 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+@@ -51982,10 +48933,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken readdir name" >&5
+-$as_echo_n "checking for broken readdir name... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken readdir name" >&5
++echo $ECHO_N "checking for broken readdir name... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_BROKEN_READDIR_NAME+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -52009,39 +48960,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_BROKEN_READDIR_NAME=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_BROKEN_READDIR_NAME=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_READDIR_NAME" >&5
+-$as_echo "$samba_cv_HAVE_BROKEN_READDIR_NAME" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_READDIR_NAME" >&5
++echo "${ECHO_T}$samba_cv_HAVE_BROKEN_READDIR_NAME" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_READDIR_NAME" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52050,10 +48998,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for utimbuf" >&5
+-$as_echo_n "checking for utimbuf... " >&6; }
++{ echo "$as_me:$LINENO: checking for utimbuf" >&5
++echo $ECHO_N "checking for utimbuf... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52078,21 +49026,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UTIMBUF=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UTIMBUF=no
+@@ -52100,8 +49047,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UTIMBUF" >&5
+-$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UTIMBUF" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UTIMBUF" >&6; }
+ if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52121,11 +49068,11 @@
+ 
+ for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -52178,52 +49125,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_name in utmp" >&5
+-$as_echo_n "checking for ut_name in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_name in utmp" >&5
++echo $ECHO_N "checking for ut_name in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_NAME+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52248,21 +49188,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_NAME=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_NAME=no
+@@ -52270,8 +49209,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_NAME" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_NAME" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_NAME" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_NAME" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_NAME" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52280,10 +49219,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_user in utmp" >&5
+-$as_echo_n "checking for ut_user in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_user in utmp" >&5
++echo $ECHO_N "checking for ut_user in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_USER+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52308,21 +49247,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_USER=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_USER=no
+@@ -52330,8 +49268,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_USER" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_USER" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_USER" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_USER" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_USER" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52340,10 +49278,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_id in utmp" >&5
+-$as_echo_n "checking for ut_id in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_id in utmp" >&5
++echo $ECHO_N "checking for ut_id in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_ID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52368,21 +49306,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_ID=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_ID=no
+@@ -52390,8 +49327,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ID" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_ID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ID" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_ID" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_ID" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52400,10 +49337,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_host in utmp" >&5
+-$as_echo_n "checking for ut_host in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_host in utmp" >&5
++echo $ECHO_N "checking for ut_host in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_HOST+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52428,21 +49365,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_HOST=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_HOST=no
+@@ -52450,8 +49386,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_HOST" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_HOST" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_HOST" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_HOST" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_HOST" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52460,10 +49396,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_time in utmp" >&5
+-$as_echo_n "checking for ut_time in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_time in utmp" >&5
++echo $ECHO_N "checking for ut_time in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_TIME+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52488,21 +49424,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_TIME=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_TIME=no
+@@ -52510,8 +49445,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TIME" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_TIME" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TIME" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_TIME" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_TIME" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52520,10 +49455,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_tv in utmp" >&5
+-$as_echo_n "checking for ut_tv in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_tv in utmp" >&5
++echo $ECHO_N "checking for ut_tv in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_TV+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52548,21 +49483,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_TV=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_TV=no
+@@ -52570,8 +49504,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TV" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_TV" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TV" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_TV" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_TV" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52580,10 +49514,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_type in utmp" >&5
+-$as_echo_n "checking for ut_type in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_type in utmp" >&5
++echo $ECHO_N "checking for ut_type in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_TYPE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52608,21 +49542,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_TYPE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_TYPE=no
+@@ -52630,8 +49563,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TYPE" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_TYPE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_TYPE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_TYPE" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_TYPE" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52640,10 +49573,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_pid in utmp" >&5
+-$as_echo_n "checking for ut_pid in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_pid in utmp" >&5
++echo $ECHO_N "checking for ut_pid in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_PID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52668,21 +49601,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_PID=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_PID=no
+@@ -52690,8 +49622,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_PID" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_PID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_PID" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_PID" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_PID" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52700,10 +49632,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_exit in utmp" >&5
+-$as_echo_n "checking for ut_exit in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_exit in utmp" >&5
++echo $ECHO_N "checking for ut_exit in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_EXIT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52728,21 +49660,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_EXIT=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_EXIT=no
+@@ -52750,8 +49681,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_EXIT" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_EXIT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_EXIT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_EXIT" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_EXIT" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52760,10 +49691,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_addr_v6 in utmp" >&5
+-$as_echo_n "checking for ut_addr_v6 in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_addr_v6 in utmp" >&5
++echo $ECHO_N "checking for ut_addr_v6 in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_ADDR_V6+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52788,21 +49719,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_ADDR_V6=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_ADDR_V6=no
+@@ -52810,8 +49740,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ADDR_V6" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_ADDR_V6" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ADDR_V6" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_ADDR_V6" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_ADDR_V6" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52820,10 +49750,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_addr in utmp" >&5
+-$as_echo_n "checking for ut_addr in utmp... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_addr in utmp" >&5
++echo $ECHO_N "checking for ut_addr in utmp... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UT_UT_ADDR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52848,21 +49778,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UT_UT_ADDR=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UT_UT_ADDR=no
+@@ -52870,8 +49799,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ADDR" >&5
+-$as_echo "$samba_cv_HAVE_UT_UT_ADDR" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UT_UT_ADDR" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UT_UT_ADDR" >&6; }
+ if test x"$samba_cv_HAVE_UT_UT_ADDR" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52881,10 +49810,10 @@
+ fi
+ 
+ if test x$ac_cv_func_pututline = xyes ; then
+-  { $as_echo "$as_me:$LINENO: checking whether pututline returns pointer" >&5
+-$as_echo_n "checking whether pututline returns pointer... " >&6; }
++  { echo "$as_me:$LINENO: checking whether pututline returns pointer" >&5
++echo $ECHO_N "checking whether pututline returns pointer... $ECHO_C" >&6; }
+ if test "${samba_cv_PUTUTLINE_RETURNS_UTMP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -52909,21 +49838,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_PUTUTLINE_RETURNS_UTMP=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_PUTUTLINE_RETURNS_UTMP=no
+@@ -52931,8 +49859,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_PUTUTLINE_RETURNS_UTMP" >&5
+-$as_echo "$samba_cv_PUTUTLINE_RETURNS_UTMP" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_PUTUTLINE_RETURNS_UTMP" >&5
++echo "${ECHO_T}$samba_cv_PUTUTLINE_RETURNS_UTMP" >&6; }
+   if test x"$samba_cv_PUTUTLINE_RETURNS_UTMP" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -52942,10 +49870,10 @@
+   fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ut_syslen in utmpx" >&5
+-$as_echo_n "checking for ut_syslen in utmpx... " >&6; }
++{ echo "$as_me:$LINENO: checking for ut_syslen in utmpx" >&5
++echo $ECHO_N "checking for ut_syslen in utmpx... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UX_UT_SYSLEN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -52970,21 +49898,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UX_UT_SYSLEN=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UX_UT_SYSLEN=no
+@@ -52992,8 +49919,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UX_UT_SYSLEN" >&5
+-$as_echo "$samba_cv_HAVE_UX_UT_SYSLEN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UX_UT_SYSLEN" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UX_UT_SYSLEN" >&6; }
+ if test x"$samba_cv_HAVE_UX_UT_SYSLEN" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -53012,8 +49939,8 @@
+ if test "${with_libiconv+set}" = set; then
+   withval=$with_libiconv;
+   if test "$withval" = "no" ; then
+-    { { $as_echo "$as_me:$LINENO: error: argument to --with-libiconv must be a directory" >&5
+-$as_echo "$as_me: error: argument to --with-libiconv must be a directory" >&2;}
++    { { echo "$as_me:$LINENO: error: argument to --with-libiconv must be a directory" >&5
++echo "$as_me: error: argument to --with-libiconv must be a directory" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+      if test "$withval" != "yes" ; then
+@@ -53060,8 +49987,8 @@
+ 		export LDFLAGS LIBS CPPFLAGS
+ 		# Try to find iconv(3)
+ 
+-      { $as_echo "$as_me:$LINENO: checking for iconv in $i/$l" >&5
+-$as_echo_n "checking for iconv in $i/$l... " >&6; }
++      { echo "$as_me:$LINENO: checking for iconv in $i/$l" >&5
++echo $ECHO_N "checking for iconv in $i/$l... $ECHO_C" >&6; }
+     jm_cv_func_iconv="no"
+     jm_cv_lib_iconv=""
+     jm_cv_giconv=no
+@@ -53092,33 +50019,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   jm_cv_func_iconv=yes
+          jm_cv_include="giconv.h"
+          jm_cv_giconv="yes"
+          jm_cv_lib_iconv=""
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -53147,32 +50070,28 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   jm_cv_include="iconv.h"
+            jm_cv_func_iconv=yes
+            jm_cv_lib_iconv=""
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -53203,34 +50122,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   jm_cv_lib_iconv=yes
+               jm_cv_func_iconv=yes
+               jm_cv_include="giconv.h"
+               jm_cv_giconv=yes
+               jm_cv_lib_iconv="giconv"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -53263,32 +50178,28 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   jm_cv_include="iconv.h"
+             jm_cv_func_iconv=yes
+             jm_cv_lib_iconv="iconv"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+           LIBS="$jm_save_LIBS"
+@@ -53320,34 +50231,30 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   jm_cv_lib_iconv=yes
+               jm_cv_func_iconv=yes
+               jm_cv_include="biconv.h"
+               jm_cv_biconv=yes
+               jm_cv_lib_iconv="biconv"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -53364,8 +50271,8 @@
+ #define HAVE_GICONV 1
+ _ACEOF
+ 
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       ICONV_FOUND=yes
+     else
+       if test "$jm_cv_biconv" = yes; then
+@@ -53374,8 +50281,8 @@
+ #define HAVE_BICONV 1
+ _ACEOF
+ 
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         ICONV_FOUND=yes
+       else
+ 
+@@ -53383,14 +50290,14 @@
+ #define HAVE_ICONV 1
+ _ACEOF
+ 
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         ICONV_FOUND=yes
+       fi
+     fi
+   else
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   fi
+ 
+                 if test x"$ICONV_FOUND" = "xyes" ; then
+@@ -53427,8 +50334,8 @@
+ 	# check for default dos charset name
+ 	for j in CP850 IBM850 ; do
+ 
+-    { $as_echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
+-$as_echo_n "checking can we convert from $j to UCS2-LE?... " >&6; }
++    { echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
++echo $ECHO_N "checking can we convert from $j to UCS2-LE?... $ECHO_C" >&6; }
+   if test "$cross_compiling" = yes; then
+   ICONV_CHARSET=cross
+ else
+@@ -53455,38 +50362,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ICONV_CHARSET=$j
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ICONV_CHARSET=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
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
+-$as_echo "$ICONV_CHARSET" >&6; }
++  { echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
++echo "${ECHO_T}$ICONV_CHARSET" >&6; }
+ 
+ 	    default_dos_charset="$ICONV_CHARSET"
+ 	    if test x"$default_dos_charset" = x"$j"; then
+@@ -53497,8 +50401,8 @@
+ 	# check for default display charset name
+ 	for j in ASCII 646 ; do
+ 
+-    { $as_echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
+-$as_echo_n "checking can we convert from $j to UCS2-LE?... " >&6; }
++    { echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
++echo $ECHO_N "checking can we convert from $j to UCS2-LE?... $ECHO_C" >&6; }
+   if test "$cross_compiling" = yes; then
+   ICONV_CHARSET=cross
+ else
+@@ -53525,38 +50429,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ICONV_CHARSET=$j
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ICONV_CHARSET=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
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
+-$as_echo "$ICONV_CHARSET" >&6; }
++  { echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
++echo "${ECHO_T}$ICONV_CHARSET" >&6; }
+ 
+ 	    default_display_charset="$ICONV_CHARSET"
+ 	    if test x"$default_display_charset" = x"$j"; then
+@@ -53567,8 +50468,8 @@
+ 	# check for default unix charset name
+ 	for j in UTF-8 UTF8 ; do
+ 
+-    { $as_echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
+-$as_echo_n "checking can we convert from $j to UCS2-LE?... " >&6; }
++    { echo "$as_me:$LINENO: checking can we convert from $j to UCS2-LE?" >&5
++echo $ECHO_N "checking can we convert from $j to UCS2-LE?... $ECHO_C" >&6; }
+   if test "$cross_compiling" = yes; then
+   ICONV_CHARSET=cross
+ else
+@@ -53595,38 +50496,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ICONV_CHARSET=$j
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ICONV_CHARSET=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
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
+-$as_echo "$ICONV_CHARSET" >&6; }
++  { echo "$as_me:$LINENO: result: $ICONV_CHARSET" >&5
++echo "${ECHO_T}$ICONV_CHARSET" >&6; }
+ 
+ 	    default_unix_charset="$ICONV_CHARSET"
+ 	    if test x"$default_unix_charset" = x"$j"; then
+@@ -53664,10 +50562,10 @@
+ 	    default_display_charset="ASCII"
+ 	    default_unix_charset="UTF-8"
+ 	    samba_cv_HAVE_NATIVE_ICONV=yes
+-	    { $as_echo "$as_me:$LINENO: WARNING: assuming the libiconv in $iconv_current_LDFLAGS can convert" >&5
+-$as_echo "$as_me: WARNING: assuming the libiconv in $iconv_current_LDFLAGS can convert" >&2;}
+-	    { $as_echo "$as_me:$LINENO: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&5
+-$as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
++	    { echo "$as_me:$LINENO: WARNING: assuming the libiconv in $iconv_current_LDFLAGS can convert" >&5
++echo "$as_me: WARNING: assuming the libiconv in $iconv_current_LDFLAGS can convert" >&2;}
++	    { echo "$as_me:$LINENO: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&5
++echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
+ 	fi
+ 
+         if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes" ; then
+@@ -53726,9 +50624,9 @@
+ 
+ 
+ if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
+-    { $as_echo "$as_me:$LINENO: WARNING: Sufficient support for iconv function was not found.
++    { echo "$as_me:$LINENO: WARNING: Sufficient support for iconv function was not found.
+     Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&5
+-$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
++echo "$as_me: WARNING: Sufficient support for iconv function was not found.
+     Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&2;}
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -53748,10 +50646,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for Linux kernel oplocks" >&5
+-$as_echo_n "checking for Linux kernel oplocks... " >&6; }
++{ echo "$as_me:$LINENO: checking for Linux kernel oplocks" >&5
++echo $ECHO_N "checking for Linux kernel oplocks... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -53781,39 +50679,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" >&5
+-$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -53822,10 +50717,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for kernel change notify support" >&5
+-$as_echo_n "checking for kernel change notify support... " >&6; }
++{ echo "$as_me:$LINENO: checking for kernel change notify support" >&5
++echo $ECHO_N "checking for kernel change notify support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -53855,39 +50750,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
+-$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -53896,10 +50788,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inotify support" >&5
+-$as_echo_n "checking for inotify support... " >&6; }
++{ echo "$as_me:$LINENO: checking for inotify support" >&5
++echo $ECHO_N "checking for inotify support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_INOTIFY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -53907,21 +50799,20 @@
+ 
+ for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -53937,33 +50828,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -53977,52 +50867,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -54031,24 +50920,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -54058,11 +50944,11 @@
+ 
+ for ac_func in inotify_init
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -54115,52 +51001,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for __NR_inotify_init declaration" >&5
+-$as_echo_n "checking for __NR_inotify_init declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for __NR_inotify_init declaration" >&5
++echo $ECHO_N "checking for __NR_inotify_init declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have___NR_inotify_init_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -54184,21 +51063,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have___NR_inotify_init_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have___NR_inotify_init_decl=no
+@@ -54206,8 +51084,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have___NR_inotify_init_decl" >&5
+-$as_echo "$ac_cv_have___NR_inotify_init_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have___NR_inotify_init_decl" >&5
++echo "${ECHO_T}$ac_cv_have___NR_inotify_init_decl" >&6; }
+  if test x"$ac_cv_have___NR_inotify_init_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -54218,8 +51096,8 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_INOTIFY" >&5
+-$as_echo "$samba_cv_HAVE_INOTIFY" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INOTIFY" >&5
++echo "${ECHO_T}$samba_cv_HAVE_INOTIFY" >&6; }
+ 
+ if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then
+ 
+@@ -54243,21 +51121,20 @@
+ 
+ for ac_header in fam.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54273,33 +51150,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54313,52 +51189,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -54367,24 +51242,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+  samba_cv_HAVE_FAM_H=yes
+ else
+@@ -54396,10 +51268,10 @@
+     if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
+         # On IRIX, libfam requires libC, but other FAM implementations
+ 	# might not need it.
+-        { $as_echo "$as_me:$LINENO: checking for FAMOpen2 in -lfam" >&5
+-$as_echo_n "checking for FAMOpen2 in -lfam... " >&6; }
++        { echo "$as_me:$LINENO: checking for FAMOpen2 in -lfam" >&5
++echo $ECHO_N "checking for FAMOpen2 in -lfam... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_fam_FAMOpen2+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lfam  $LIBS"
+@@ -54431,37 +51303,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_fam_FAMOpen2=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_fam_FAMOpen2=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen2" >&5
+-$as_echo "$ac_cv_lib_fam_FAMOpen2" >&6; }
+-if test "x$ac_cv_lib_fam_FAMOpen2" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_fam_FAMOpen2" >&5
++echo "${ECHO_T}$ac_cv_lib_fam_FAMOpen2" >&6; }
++if test $ac_cv_lib_fam_FAMOpen2 = yes; then
+   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
+ else
+   samba_cv_HAVE_LIBFAM=no
+@@ -54479,10 +51347,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for FAMOpen2 in -lfam" >&5
+-$as_echo_n "checking for FAMOpen2 in -lfam... " >&6; }
++        { echo "$as_me:$LINENO: checking for FAMOpen2 in -lfam" >&5
++echo $ECHO_N "checking for FAMOpen2 in -lfam... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_fam_FAMOpen2+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -54512,38 +51380,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_fam_FAMOpen2=yes;
+ 		  ac_cv_lib_ext_fam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_fam_FAMOpen2=no;
+ 		  ac_cv_lib_ext_fam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_fam_FAMOpen2" >&5
+-$as_echo "$ac_cv_lib_ext_fam_FAMOpen2" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_fam_FAMOpen2" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_fam_FAMOpen2" >&6; }
+     if test $ac_cv_lib_ext_fam_FAMOpen2 = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_FAMOPEN2 1
+@@ -54588,14 +51452,13 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -54606,7 +51469,7 @@
+ _ACEOF
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -54616,8 +51479,8 @@
+     fi
+ 
+     if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
+-        { { $as_echo "$as_me:$LINENO: error: FAM support requested but FAM library not available " >&5
+-$as_echo "$as_me: error: FAM support requested but FAM library not available " >&2;}
++        { { echo "$as_me:$LINENO: error: FAM support requested but FAM library not available " >&5
++echo "$as_me: error: FAM support requested but FAM library not available " >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+ fi
+@@ -54631,10 +51494,10 @@
+     samba_dmapi_libs=""
+ 
+     if test x"$samba_dmapi_libs" = x"" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldm" >&5
+-$as_echo_n "checking for dm_get_eventlist in -ldm... " >&6; }
++	{ echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldm" >&5
++echo $ECHO_N "checking for dm_get_eventlist in -ldm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dm_dm_get_eventlist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldm  $LIBS"
+@@ -54666,47 +51529,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dm_dm_get_eventlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_dm_dm_get_eventlist=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dm_dm_get_eventlist" >&5
+-$as_echo "$ac_cv_lib_dm_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_dm_dm_get_eventlist" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dm_dm_get_eventlist" >&5
++echo "${ECHO_T}$ac_cv_lib_dm_dm_get_eventlist" >&6; }
++if test $ac_cv_lib_dm_dm_get_eventlist = yes; then
+    samba_dmapi_libs="-ldm"
+ fi
+ 
+     fi
+ 
+     if test x"$samba_dmapi_libs" = x"" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ljfsdm" >&5
+-$as_echo_n "checking for dm_get_eventlist in -ljfsdm... " >&6; }
++	{ echo "$as_me:$LINENO: checking for dm_get_eventlist in -ljfsdm" >&5
++echo $ECHO_N "checking for dm_get_eventlist in -ljfsdm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jfsdm_dm_get_eventlist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ljfsdm  $LIBS"
+@@ -54738,47 +51597,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_jfsdm_dm_get_eventlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_jfsdm_dm_get_eventlist=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jfsdm_dm_get_eventlist" >&5
+-$as_echo "$ac_cv_lib_jfsdm_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_jfsdm_dm_get_eventlist" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jfsdm_dm_get_eventlist" >&5
++echo "${ECHO_T}$ac_cv_lib_jfsdm_dm_get_eventlist" >&6; }
++if test $ac_cv_lib_jfsdm_dm_get_eventlist = yes; then
+   samba_dmapi_libs="-ljfsdm"
+ fi
+ 
+     fi
+ 
+     if test x"$samba_dmapi_libs" = x"" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
+-$as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
++	{ echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
++echo $ECHO_N "checking for dm_get_eventlist in -lxdsm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lxdsm  $LIBS"
+@@ -54810,47 +51665,43 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_xdsm_dm_get_eventlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_xdsm_dm_get_eventlist=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
+-$as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
++echo "${ECHO_T}$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
++if test $ac_cv_lib_xdsm_dm_get_eventlist = yes; then
+   samba_dmapi_libs="-lxdsm"
+ fi
+ 
+     fi
+ 
+     if test x"$samba_dmapi_libs" = x"" ; then
+-        { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldmapi" >&5
+-$as_echo_n "checking for dm_get_eventlist in -ldmapi... " >&6; }
++        { echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldmapi" >&5
++echo $ECHO_N "checking for dm_get_eventlist in -ldmapi... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmapi  $LIBS"
+@@ -54882,37 +51733,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dmapi_dm_get_eventlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_dmapi_dm_get_eventlist=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
+-$as_echo "$ac_cv_lib_dmapi_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
++echo "${ECHO_T}$ac_cv_lib_dmapi_dm_get_eventlist" >&6; }
++if test $ac_cv_lib_dmapi_dm_get_eventlist = yes; then
+   samba_dmapi_libs="-ldmapi"
+ fi
+ 
+@@ -54928,21 +51775,20 @@
+ 
+ for ac_header in sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54958,33 +51804,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -54998,52 +51843,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -55052,24 +51896,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -55126,26 +51967,23 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ 		    true # DMAPI link test succeeded
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+@@ -55154,7 +51992,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="$samba_dmapi_save_LIBS"
+@@ -55163,8 +52000,8 @@
+     if test x"$samba_dmapi_libs" = x"" ; then
+ 	# DMAPI detection failure actions begin
+ 
+-		{ $as_echo "$as_me:$LINENO: DMAPI support not present" >&5
+-$as_echo "$as_me: DMAPI support not present" >&6;}
++		{ echo "$as_me:$LINENO: DMAPI support not present" >&5
++echo "$as_me: DMAPI support not present" >&6;}
+ 
+ 	# DMAPI detection failure actions end
+     else
+@@ -55175,8 +52012,8 @@
+ #define USE_DMAPI 1
+ _ACEOF
+ 
+-		{ $as_echo "$as_me:$LINENO: Found DMAPI support in $samba_dmapi_libs" >&5
+-$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
++		{ echo "$as_me:$LINENO: Found DMAPI support in $samba_dmapi_libs" >&5
++echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
+ 
+ 	# DMAPI detection success actions end
+     fi
+@@ -55189,10 +52026,10 @@
+     default_shared_modules="$default_shared_modules vfs_tsmsm"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for kernel share modes" >&5
+-$as_echo_n "checking for kernel share modes... " >&6; }
++{ echo "$as_me:$LINENO: checking for kernel share modes" >&5
++echo $ECHO_N "checking for kernel share modes... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -55224,39 +52061,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_KERNEL_SHARE_MODES=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_KERNEL_SHARE_MODES=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
+-$as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55266,10 +52100,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for IRIX kernel oplock type definitions" >&5
+-$as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
++{ echo "$as_me:$LINENO: checking for IRIX kernel oplock type definitions" >&5
++echo $ECHO_N "checking for IRIX kernel oplock type definitions... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -55294,21 +52128,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
+@@ -55316,8 +52149,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
+-$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55330,17 +52163,17 @@
+ # Check for POSIX capability support
+ 
+ if test "${ac_cv_header_sys_capability_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for sys/capability.h" >&5
+-$as_echo_n "checking for sys/capability.h... " >&6; }
++  { echo "$as_me:$LINENO: checking for sys/capability.h" >&5
++echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_capability_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5
+-$as_echo "$ac_cv_header_sys_capability_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_capability_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking sys/capability.h usability" >&5
+-$as_echo_n "checking sys/capability.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking sys/capability.h usability" >&5
++echo $ECHO_N "checking sys/capability.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55356,33 +52189,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking sys/capability.h presence" >&5
+-$as_echo_n "checking sys/capability.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking sys/capability.h presence" >&5
++echo $ECHO_N "checking sys/capability.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55396,52 +52228,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/capability.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/capability.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/capability.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/capability.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/capability.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -55450,18 +52281,18 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for sys/capability.h" >&5
+-$as_echo_n "checking for sys/capability.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for sys/capability.h" >&5
++echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_capability_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_sys_capability_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5
+-$as_echo "$ac_cv_header_sys_capability_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_capability_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_sys_capability_h" = x""yes; then
++if test $ac_cv_header_sys_capability_h = yes; then
+   samba_cv_HAVE_SYS_CAPABILITY_H=yes;
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55479,11 +52310,11 @@
+ 
+ for ac_func in cap_get_proc
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -55536,42 +52367,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # cap_get_proc was found in libc or existing $LIBS
+@@ -55596,10 +52420,10 @@
+ 	    ;;
+           *)
+ 	    # cap_get_proc was not found, try adding libcap
+-	    { $as_echo "$as_me:$LINENO: checking for cap_get_proc in -lcap" >&5
+-$as_echo_n "checking for cap_get_proc in -lcap... " >&6; }
++	    { echo "$as_me:$LINENO: checking for cap_get_proc in -lcap" >&5
++echo $ECHO_N "checking for cap_get_proc in -lcap... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcap  $LIBS"
+@@ -55631,37 +52455,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_cap_cap_get_proc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_cap_cap_get_proc=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_get_proc" >&5
+-$as_echo "$ac_cv_lib_cap_cap_get_proc" >&6; }
+-if test "x$ac_cv_lib_cap_cap_get_proc" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_get_proc" >&5
++echo "${ECHO_T}$ac_cv_lib_cap_cap_get_proc" >&6; }
++if test $ac_cv_lib_cap_cap_get_proc = yes; then
+ 
+ 		LIBS="-lcap $LIBS"
+ 
+@@ -55690,10 +52510,10 @@
+ 
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for POSIX capabilities" >&5
+-$as_echo_n "checking for POSIX capabilities... " >&6; }
++    { echo "$as_me:$LINENO: checking for POSIX capabilities" >&5
++echo $ECHO_N "checking for POSIX capabilities... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_POSIX_CAPABILITIES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		if test "$cross_compiling" = yes; then
+@@ -55725,40 +52545,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_POSIX_CAPABILITIES=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_POSIX_CAPABILITIES=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_CAPABILITIES" >&5
+-$as_echo "$samba_cv_HAVE_POSIX_CAPABILITIES" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_CAPABILITIES" >&5
++echo "${ECHO_T}$samba_cv_HAVE_POSIX_CAPABILITIES" >&6; }
+ 
+ if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
+ 
+@@ -55777,10 +52594,10 @@
+ # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
+ #
+ 
+-{ $as_echo "$as_me:$LINENO: checking for int16 typedef included by rpc/rpc.h" >&5
+-$as_echo_n "checking for int16 typedef included by rpc/rpc.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for int16 typedef included by rpc/rpc.h" >&5
++echo $ECHO_N "checking for int16 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_INT16_FROM_RPC_RPC_H+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -55807,21 +52624,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no
+@@ -55829,8 +52645,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&5
+-$as_echo "$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&5
++echo "${ECHO_T}$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" >&6; }
+ if test x"$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55839,10 +52655,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uint16 typedef included by rpc/rpc.h" >&5
+-$as_echo_n "checking for uint16 typedef included by rpc/rpc.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for uint16 typedef included by rpc/rpc.h" >&5
++echo $ECHO_N "checking for uint16 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -55869,21 +52685,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no
+@@ -55891,8 +52706,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&5
+-$as_echo "$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" >&6; }
+ if test x"$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55901,10 +52716,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for int32 typedef included by rpc/rpc.h" >&5
+-$as_echo_n "checking for int32 typedef included by rpc/rpc.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for int32 typedef included by rpc/rpc.h" >&5
++echo $ECHO_N "checking for int32 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_INT32_FROM_RPC_RPC_H+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -55931,21 +52746,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
+@@ -55953,8 +52767,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&5
+-$as_echo "$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&5
++echo "${ECHO_T}$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" >&6; }
+ if test x"$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -55963,10 +52777,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for uint32 typedef included by rpc/rpc.h" >&5
+-$as_echo_n "checking for uint32 typedef included by rpc/rpc.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for uint32 typedef included by rpc/rpc.h" >&5
++echo $ECHO_N "checking for uint32 typedef included by rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -55993,21 +52807,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no
+@@ -56015,8 +52828,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&5
+-$as_echo "$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&5
++echo "${ECHO_T}$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" >&6; }
+ if test x"$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -56026,10 +52839,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
+-$as_echo_n "checking for conflicting AUTH_ERROR define in rpc/rpc.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
++echo $ECHO_N "checking for conflicting AUTH_ERROR define in rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -56060,21 +52873,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=yes
+@@ -56082,8 +52894,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&5
+-$as_echo "$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" >&6; }
+ if test x"$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -56092,11 +52904,11 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for test routines" >&5
+-$as_echo_n "checking for test routines... " >&6; }
++{ echo "$as_me:$LINENO: checking for test routines" >&5
++echo $ECHO_N "checking for test routines... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+-  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
+-$as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
++  { echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
++echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -56112,44 +52924,41 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { $as_echo "$as_me:$LINENO: error: cant find test code. Aborting config" >&5
+-$as_echo "$as_me: error: cant find test code. Aborting config" >&2;}
++{ { echo "$as_me:$LINENO: error: cant find test code. Aborting config" >&5
++echo "$as_me: error: cant find test code. Aborting config" >&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
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ftruncate extend" >&5
+-$as_echo_n "checking for ftruncate extend... " >&6; }
++{ echo "$as_me:$LINENO: checking for ftruncate extend" >&5
++echo $ECHO_N "checking for ftruncate extend... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_FTRUNCATE_EXTEND+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56169,39 +52978,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_FTRUNCATE_EXTEND=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_FTRUNCATE_EXTEND=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_FTRUNCATE_EXTEND" >&5
+-$as_echo "$samba_cv_HAVE_FTRUNCATE_EXTEND" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_FTRUNCATE_EXTEND" >&5
++echo "${ECHO_T}$samba_cv_HAVE_FTRUNCATE_EXTEND" >&6; }
+ if test x"$samba_cv_HAVE_FTRUNCATE_EXTEND" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -56210,10 +53016,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken getgroups" >&5
+-$as_echo_n "checking for broken getgroups... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken getgroups" >&5
++echo $ECHO_N "checking for broken getgroups... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_BROKEN_GETGROUPS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56233,39 +53039,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_BROKEN_GETGROUPS=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_BROKEN_GETGROUPS=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_GETGROUPS" >&5
+-$as_echo "$samba_cv_HAVE_BROKEN_GETGROUPS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_GETGROUPS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_BROKEN_GETGROUPS" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -56275,10 +53078,10 @@
+ fi
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_NGROUPS_MAX)" >&5
+-$as_echo_n "checking for sysconf(_SC_NGROUPS_MAX)... " >&6; }
++    { echo "$as_me:$LINENO: checking for sysconf(_SC_NGROUPS_MAX)" >&5
++echo $ECHO_N "checking for sysconf(_SC_NGROUPS_MAX)... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSCONF_SC_NGROUPS_MAX+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -56302,36 +53105,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    samba_cv_SYSCONF_SC_NGROUPS_MAX=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	 samba_cv_SYSCONF_SC_NGROUPS_MAX=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NGROUPS_MAX" >&5
+-$as_echo "$samba_cv_SYSCONF_SC_NGROUPS_MAX" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NGROUPS_MAX" >&5
++echo "${ECHO_T}$samba_cv_SYSCONF_SC_NGROUPS_MAX" >&6; }
+ 
+     if test x"$samba_cv_SYSCONF_SC_NGROUPS_MAX" = x"yes" ; then
+ 
+@@ -56342,10 +53141,10 @@
+     fi
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_NPROC_ONLN)" >&5
+-$as_echo_n "checking for sysconf(_SC_NPROC_ONLN)... " >&6; }
++    { echo "$as_me:$LINENO: checking for sysconf(_SC_NPROC_ONLN)" >&5
++echo $ECHO_N "checking for sysconf(_SC_NPROC_ONLN)... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSCONF_SC_NPROC_ONLN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -56369,36 +53168,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    samba_cv_SYSCONF_SC_NPROC_ONLN=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	 samba_cv_SYSCONF_SC_NPROC_ONLN=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NPROC_ONLN" >&5
+-$as_echo "$samba_cv_SYSCONF_SC_NPROC_ONLN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NPROC_ONLN" >&5
++echo "${ECHO_T}$samba_cv_SYSCONF_SC_NPROC_ONLN" >&6; }
+ 
+     if test x"$samba_cv_SYSCONF_SC_NPROC_ONLN" = x"yes" ; then
+ 
+@@ -56409,10 +53204,10 @@
+     fi
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
+-$as_echo_n "checking for sysconf(_SC_NPROCESSORS_ONLN)... " >&6; }
++    { echo "$as_me:$LINENO: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
++echo $ECHO_N "checking for sysconf(_SC_NPROCESSORS_ONLN)... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -56436,36 +53231,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	 samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&5
+-$as_echo "$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&5
++echo "${ECHO_T}$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&6; }
+ 
+     if test x"$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" = x"yes" ; then
+ 
+@@ -56476,10 +53267,10 @@
+     fi
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_PAGESIZE)" >&5
+-$as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
++    { echo "$as_me:$LINENO: checking for sysconf(_SC_PAGESIZE)" >&5
++echo $ECHO_N "checking for sysconf(_SC_PAGESIZE)... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSCONF_SC_PAGESIZE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -56503,36 +53294,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    samba_cv_SYSCONF_SC_PAGESIZE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	 samba_cv_SYSCONF_SC_PAGESIZE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_PAGESIZE" >&5
+-$as_echo "$samba_cv_SYSCONF_SC_PAGESIZE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_PAGESIZE" >&5
++echo "${ECHO_T}$samba_cv_SYSCONF_SC_PAGESIZE" >&6; }
+ 
+     if test x"$samba_cv_SYSCONF_SC_PAGESIZE" = x"yes" ; then
+ 
+@@ -56545,11 +53332,11 @@
+ 
+ for ac_func in getpagesize
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -56602,42 +53389,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -56649,10 +53429,10 @@
+ seteuid=no;
+ 
+ if test $seteuid = no; then
+-{ $as_echo "$as_me:$LINENO: checking for setreuid" >&5
+-$as_echo_n "checking for setreuid... " >&6; }
++{ echo "$as_me:$LINENO: checking for setreuid" >&5
++echo $ECHO_N "checking for setreuid... $ECHO_C" >&6; }
+ if test "${samba_cv_USE_SETREUID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56676,39 +53456,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_USE_SETREUID=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_USE_SETREUID=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_USE_SETREUID" >&5
+-$as_echo "$samba_cv_USE_SETREUID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_USE_SETREUID" >&5
++echo "${ECHO_T}$samba_cv_USE_SETREUID" >&6; }
+ if test x"$samba_cv_USE_SETREUID" = x"yes"; then
+     seteuid=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -56721,10 +53498,10 @@
+ # we check for setresuid second as it conflicts with AIO on Linux.
+ # see http://samba.org/~tridge/junkcode/aio_uid.c
+ if test $seteuid = no; then
+-{ $as_echo "$as_me:$LINENO: checking for setresuid" >&5
+-$as_echo_n "checking for setresuid... " >&6; }
++{ echo "$as_me:$LINENO: checking for setresuid" >&5
++echo $ECHO_N "checking for setresuid... $ECHO_C" >&6; }
+ if test "${samba_cv_USE_SETRESUID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56748,39 +53525,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_USE_SETRESUID=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_USE_SETRESUID=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_USE_SETRESUID" >&5
+-$as_echo "$samba_cv_USE_SETRESUID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_USE_SETRESUID" >&5
++echo "${ECHO_T}$samba_cv_USE_SETRESUID" >&6; }
+ if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
+     seteuid=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -56791,10 +53565,10 @@
+ fi
+ 
+ if test $seteuid = no; then
+-{ $as_echo "$as_me:$LINENO: checking for seteuid" >&5
+-$as_echo_n "checking for seteuid... " >&6; }
++{ echo "$as_me:$LINENO: checking for seteuid" >&5
++echo $ECHO_N "checking for seteuid... $ECHO_C" >&6; }
+ if test "${samba_cv_USE_SETEUID+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56818,39 +53592,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_USE_SETEUID=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_USE_SETEUID=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_USE_SETEUID" >&5
+-$as_echo "$samba_cv_USE_SETEUID" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_USE_SETEUID" >&5
++echo "${ECHO_T}$samba_cv_USE_SETEUID" >&6; }
+ if test x"$samba_cv_USE_SETEUID" = x"yes"; then
+     seteuid=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -56861,10 +53632,10 @@
+ fi
+ 
+ if test $seteuid = no; then
+-{ $as_echo "$as_me:$LINENO: checking for setuidx" >&5
+-$as_echo_n "checking for setuidx... " >&6; }
++{ echo "$as_me:$LINENO: checking for setuidx" >&5
++echo $ECHO_N "checking for setuidx... $ECHO_C" >&6; }
+ if test "${samba_cv_USE_SETUIDX+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -56888,39 +53659,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_USE_SETUIDX=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_USE_SETUIDX=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_USE_SETUIDX" >&5
+-$as_echo "$samba_cv_USE_SETUIDX" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_USE_SETUIDX" >&5
++echo "${ECHO_T}$samba_cv_USE_SETUIDX" >&6; }
+ if test x"$samba_cv_USE_SETUIDX" = x"yes"; then
+     seteuid=yes;
+ cat >>confdefs.h <<\_ACEOF
+@@ -56930,10 +53698,10 @@
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for the Darwin initgroups system call" >&5
+-$as_echo_n "checking for the Darwin initgroups system call... " >&6; }
++{ echo "$as_me:$LINENO: checking for the Darwin initgroups system call" >&5
++echo $ECHO_N "checking for the Darwin initgroups system call... $ECHO_C" >&6; }
+ if test "${samba_cv_DARWIN_INITGROUPS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -56959,36 +53727,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_DARWIN_INITGROUPS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_DARWIN_INITGROUPS=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_DARWIN_INITGROUPS" >&5
+-$as_echo "$samba_cv_DARWIN_INITGROUPS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_DARWIN_INITGROUPS" >&5
++echo "${ECHO_T}$samba_cv_DARWIN_INITGROUPS" >&6; }
+ 
+ if test x"$samba_cv_DARWIN_INITGROUPS" = x"yes" ; then
+ 
+@@ -56998,10 +53762,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for fcntl locking" >&5
+-$as_echo_n "checking for fcntl locking... " >&6; }
++{ echo "$as_me:$LINENO: checking for fcntl locking" >&5
++echo $ECHO_N "checking for fcntl locking... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_FCNTL_LOCK+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -57021,39 +53785,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_FCNTL_LOCK=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_FCNTL_LOCK=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_FCNTL_LOCK" >&5
+-$as_echo "$samba_cv_HAVE_FCNTL_LOCK" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_FCNTL_LOCK" >&5
++echo "${ECHO_T}$samba_cv_HAVE_FCNTL_LOCK" >&6; }
+ if test x"$samba_cv_HAVE_FCNTL_LOCK" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57062,10 +53823,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
+-$as_echo_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
++echo $ECHO_N "checking for broken (glibc2.1/x86) 64 bit fcntl locking... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -57085,39 +53846,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" >&5
+-$as_echo "$samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57128,10 +53886,10 @@
+ else
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking for 64 bit fcntl locking" >&5
+-$as_echo_n "checking for 64 bit fcntl locking... " >&6; }
++  { echo "$as_me:$LINENO: checking for 64 bit fcntl locking" >&5
++echo $ECHO_N "checking for 64 bit fcntl locking... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STRUCT_FLOCK64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+   if test "$cross_compiling" = yes; then
+@@ -57171,39 +53929,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_STRUCT_FLOCK64=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_STRUCT_FLOCK64=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_FLOCK64" >&5
+-$as_echo "$samba_cv_HAVE_STRUCT_FLOCK64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STRUCT_FLOCK64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STRUCT_FLOCK64" >&6; }
+ 
+   if test x"$samba_cv_HAVE_STRUCT_FLOCK64" = x"yes"; then
+ 
+@@ -57214,10 +53969,10 @@
+   fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
+-$as_echo_n "checking for st_blocks in struct stat... " >&6; }
++{ echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
++echo $ECHO_N "checking for st_blocks in struct stat... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -57243,21 +53998,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_STAT_ST_BLOCKS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_STAT_ST_BLOCKS=no
+@@ -57265,8 +54019,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
+-$as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
+ if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57275,10 +54029,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for st_blksize in struct stat" >&5
+-$as_echo_n "checking for st_blksize in struct stat... " >&6; }
++{ echo "$as_me:$LINENO: checking for st_blksize in struct stat" >&5
++echo $ECHO_N "checking for st_blksize in struct stat... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STAT_ST_BLKSIZE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -57304,21 +54058,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_STAT_ST_BLKSIZE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_STAT_ST_BLKSIZE=no
+@@ -57326,8 +54079,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLKSIZE" >&5
+-$as_echo "$samba_cv_HAVE_STAT_ST_BLKSIZE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLKSIZE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STAT_ST_BLKSIZE" >&6; }
+ if test x"$samba_cv_HAVE_STAT_ST_BLKSIZE" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57336,10 +54089,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for st_flags in struct stat" >&5
+-$as_echo_n "checking for st_flags in struct stat... " >&6; }
++{ echo "$as_me:$LINENO: checking for st_flags in struct stat" >&5
++echo $ECHO_N "checking for st_flags in struct stat... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_STAT_ST_FLAGS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -57365,21 +54118,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_STAT_ST_FLAGS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_STAT_ST_FLAGS=no
+@@ -57388,8 +54140,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_FLAGS" >&5
+-$as_echo "$samba_cv_HAVE_STAT_ST_FLAGS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_FLAGS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_STAT_ST_FLAGS" >&6; }
+ 
+ if test x"$samba_cv_HAVE_STAT_ST_FLAGS" = x"yes"; then
+ 
+@@ -57399,10 +54151,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for broken nisplus include files" >&5
+-$as_echo_n "checking for broken nisplus include files... " >&6; }
++{ echo "$as_me:$LINENO: checking for broken nisplus include files" >&5
++echo $ECHO_N "checking for broken nisplus include files... $ECHO_C" >&6; }
+ if test "${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -57431,21 +54183,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes
+@@ -57453,8 +54204,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&5
+-$as_echo "$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&5
++echo "${ECHO_T}$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" >&6; }
+ if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57463,10 +54214,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking if the realpath function allows a NULL argument" >&5
+-$as_echo_n "checking if the realpath function allows a NULL argument... " >&6; }
++{ echo "$as_me:$LINENO: checking if the realpath function allows a NULL argument" >&5
++echo $ECHO_N "checking if the realpath function allows a NULL argument... $ECHO_C" >&6; }
+ if test "${samba_cv_REALPATH_TAKES_NULL+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ if test "$cross_compiling" = yes; then
+@@ -57501,39 +54252,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_REALPATH_TAKES_NULL=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_REALPATH_TAKES_NULL=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_REALPATH_TAKES_NULL" >&5
+-$as_echo "$samba_cv_REALPATH_TAKES_NULL" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_REALPATH_TAKES_NULL" >&5
++echo "${ECHO_T}$samba_cv_REALPATH_TAKES_NULL" >&6; }
+ if test x"$samba_cv_REALPATH_TAKES_NULL" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -57545,25 +54293,25 @@
+ #################################################
+ # check for AFS clear-text auth support
+ samba_cv_WITH_AFS=no
+-{ $as_echo "$as_me:$LINENO: checking whether to use AFS clear-text auth" >&5
+-$as_echo_n "checking whether to use AFS clear-text auth... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use AFS clear-text auth" >&5
++echo $ECHO_N "checking whether to use AFS clear-text auth... $ECHO_C" >&6; }
+ 
+ # Check whether --with-afs was given.
+ if test "${with_afs+set}" = set; then
+   withval=$with_afs;  case "$withval" in
+   yes|auto)
+-    { $as_echo "$as_me:$LINENO: result: $withval" >&5
+-$as_echo "$withval" >&6; }
++    { echo "$as_me:$LINENO: result: $withval" >&5
++echo "${ECHO_T}$withval" >&6; }
+     samba_cv_WITH_AFS=$withval
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -57571,25 +54319,25 @@
+ ####################################################
+ # check for Linux-specific AFS fake-kaserver support
+ samba_cv_WITH_FAKE_KASERVER=no
+-{ $as_echo "$as_me:$LINENO: checking whether to use AFS fake-kaserver" >&5
+-$as_echo_n "checking whether to use AFS fake-kaserver... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use AFS fake-kaserver" >&5
++echo $ECHO_N "checking whether to use AFS fake-kaserver... $ECHO_C" >&6; }
+ 
+ # Check whether --with-fake-kaserver was given.
+ if test "${with_fake_kaserver+set}" = set; then
+   withval=$with_fake_kaserver;  case "$withval" in
+   yes|auto)
+-    { $as_echo "$as_me:$LINENO: result: $withval" >&5
+-$as_echo "$withval" >&6; }
++    { echo "$as_me:$LINENO: result: $withval" >&5
++echo "${ECHO_T}$withval" >&6; }
+     samba_cv_WITH_FAKE_KASERVER=$withval
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -57600,16 +54348,16 @@
+    test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
+ 
+     # see if this box has the afs-headers in /usr/include/afs
+-    { $as_echo "$as_me:$LINENO: checking for /usr/include/afs" >&5
+-$as_echo_n "checking for /usr/include/afs... " >&6; }
++    { echo "$as_me:$LINENO: checking for /usr/include/afs" >&5
++echo $ECHO_N "checking for /usr/include/afs... $ECHO_C" >&6; }
+     if test -d /usr/include/afs; then
+           CFLAGS="$CFLAGS -I/usr/include/afs"
+           CPPFLAGS="$CPPFLAGS -I/usr/include/afs"
+-          { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++          { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+ 
+     # check for afs.h
+@@ -57618,21 +54366,20 @@
+ 
+ for ac_header in afs.h afs/afs.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -57648,33 +54395,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -57688,52 +54434,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -57742,24 +54487,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -57769,11 +54511,11 @@
+     if test x"$ac_cv_header_afs_h" = x"no" && test x"$ac_cv_header_afs_afs_h" = x"no"; then
+     	if test x"$samba_cv_WITH_FAKE_KASERVER" = x"auto" ||
+ 	   test x"$samba_cv_WITH_AFS" = x"auto"; then
+-	    	{ $as_echo "$as_me:$LINENO: WARNING: AFS cannot be supported without afs.h" >&5
+-$as_echo "$as_me: WARNING: AFS cannot be supported without afs.h" >&2;}
++	    	{ echo "$as_me:$LINENO: WARNING: AFS cannot be supported without afs.h" >&5
++echo "$as_me: WARNING: AFS cannot be supported without afs.h" >&2;}
+ 	else
+-	    	{ { $as_echo "$as_me:$LINENO: error: AFS cannot be supported without afs.h" >&5
+-$as_echo "$as_me: error: AFS cannot be supported without afs.h" >&2;}
++	    	{ { echo "$as_me:$LINENO: error: AFS cannot be supported without afs.h" >&5
++echo "$as_me: error: AFS cannot be supported without afs.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+     else
+@@ -57795,25 +54537,25 @@
+ #################################################
+ # check whether to compile AFS/NT ACL mapping module
+ samba_cv_WITH_VFS_AFSACL=no
+-{ $as_echo "$as_me:$LINENO: checking whether to use AFS ACL mapping module" >&5
+-$as_echo_n "checking whether to use AFS ACL mapping module... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use AFS ACL mapping module" >&5
++echo $ECHO_N "checking whether to use AFS ACL mapping module... $ECHO_C" >&6; }
+ 
+ # Check whether --with-vfs-afsacl was given.
+ if test "${with_vfs_afsacl+set}" = set; then
+   withval=$with_vfs_afsacl;  case "$withval" in
+   yes|auto)
+-    { $as_echo "$as_me:$LINENO: result: $withval" >&5
+-$as_echo "$withval" >&6; }
++    { echo "$as_me:$LINENO: result: $withval" >&5
++echo "${ECHO_T}$withval" >&6; }
+     samba_cv_WITH_VFS_AFSACL=yes
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -57832,15 +54574,15 @@
+ 
+ #################################################
+ # check for the DFS clear-text auth system
+-{ $as_echo "$as_me:$LINENO: checking whether to use DFS clear-text auth" >&5
+-$as_echo_n "checking whether to use DFS clear-text auth... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use DFS clear-text auth" >&5
++echo $ECHO_N "checking whether to use DFS clear-text auth... $ECHO_C" >&6; }
+ 
+ # Check whether --with-dfs was given.
+ if test "${with_dfs+set}" = set; then
+   withval=$with_dfs;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_DFS 1
+@@ -57848,13 +54590,13 @@
+ 
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -57863,8 +54605,8 @@
+ # Compile with LDAP support?
+ 
+ with_ldap_support=auto
+-{ $as_echo "$as_me:$LINENO: checking for LDAP support" >&5
+-$as_echo_n "checking for LDAP support... " >&6; }
++{ echo "$as_me:$LINENO: checking for LDAP support" >&5
++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
+ 
+ 
+ # Check whether --with-ldap was given.
+@@ -57877,8 +54619,8 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_ldap_support" >&5
+-$as_echo "$with_ldap_support" >&6; }
++{ echo "$as_me:$LINENO: result: $with_ldap_support" >&5
++echo "${ECHO_T}$with_ldap_support" >&6; }
+ 
+ SMBLDAP=""
+ 
+@@ -57896,21 +54638,20 @@
+ 
+ for ac_header in ldap.h lber.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -57926,33 +54667,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -57966,52 +54706,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -58020,24 +54759,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -58047,12 +54783,12 @@
+ 
+   if test x"$ac_cv_header_ldap_h" != x"yes"; then
+ 	if test x"$with_ldap_support" = x"yes"; then
+-	 { { $as_echo "$as_me:$LINENO: error: ldap.h is needed for LDAP support" >&5
+-$as_echo "$as_me: error: ldap.h is needed for LDAP support" >&2;}
++	 { { echo "$as_me:$LINENO: error: ldap.h is needed for LDAP support" >&5
++echo "$as_me: error: ldap.h is needed for LDAP support" >&2;}
+    { (exit 1); exit 1; }; }
+ 	else
+-	 { $as_echo "$as_me:$LINENO: WARNING: ldap.h is needed for LDAP support" >&5
+-$as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
++	 { echo "$as_me:$LINENO: WARNING: ldap.h is needed for LDAP support" >&5
++echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
+ 	fi
+ 
+ 	with_ldap_support=no
+@@ -58063,54 +54799,18 @@
+   # unsigned int in include/includes.h
+   case $host_os in
+ 	*hpux*)
+-	 { $as_echo "$as_me:$LINENO: WARNING: ber_tag_t is needed for LDAP support" >&5
+-$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
+-	 { $as_echo "$as_me:$LINENO: WARNING: ber_tag_t must be configured in includes.h for hpux" >&5
+-$as_echo "$as_me: WARNING: ber_tag_t must be configured in includes.h for hpux" >&2;}
++	 { echo "$as_me:$LINENO: WARNING: ber_tag_t is needed for LDAP support" >&5
++echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
++	 { echo "$as_me:$LINENO: WARNING: ber_tag_t must be configured in includes.h for hpux" >&5
++echo "$as_me: WARNING: ber_tag_t must be configured in includes.h for hpux" >&2;}
+ 	with_ldap_support=yes
+   	;;
+ 	*)
+-  	{ $as_echo "$as_me:$LINENO: checking for ber_tag_t" >&5
+-$as_echo_n "checking for ber_tag_t... " >&6; }
++  	{ echo "$as_me:$LINENO: checking for ber_tag_t" >&5
++echo $ECHO_N "checking for ber_tag_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_ber_tag_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_type_ber_tag_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <lber.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (ber_tag_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
+@@ -58119,11 +54819,14 @@
+ /* end confdefs.h.  */
+ #include <lber.h>
+ 
++typedef ber_tag_t ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((ber_tag_t)))
+-	  return 0;
++if ((ac__type_new_ *) 0)
++  return 0;
++if (sizeof (ac__type_new_))
++  return 0;
+   ;
+   return 0;
+ }
+@@ -58134,47 +54837,38 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  :
++  ac_cv_type_ber_tag_t=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_ber_tag_t=yes
++	ac_cv_type_ber_tag_t=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ber_tag_t" >&5
+-$as_echo "$ac_cv_type_ber_tag_t" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ber_tag_t" >&5
++echo "${ECHO_T}$ac_cv_type_ber_tag_t" >&6; }
+ 
+   	if test x"$ac_cv_type_ber_tag_t" != x"yes"; then
+ 		if test x"$with_ldap_support" = x"yes"; then
+-	 	{ { $as_echo "$as_me:$LINENO: error: ber_tag_t is needed for LDAP support" >&5
+-$as_echo "$as_me: error: ber_tag_t is needed for LDAP support" >&2;}
++	 	{ { echo "$as_me:$LINENO: error: ber_tag_t is needed for LDAP support" >&5
++echo "$as_me: error: ber_tag_t is needed for LDAP support" >&2;}
+    { (exit 1); exit 1; }; }
+ 		else
+-	 	{ $as_echo "$as_me:$LINENO: WARNING: ber_tag_t is needed for LDAP support" >&5
+-$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
++	 	{ echo "$as_me:$LINENO: WARNING: ber_tag_t is needed for LDAP support" >&5
++echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
+ 		fi
+ 		with_ldap_support=no
+   	fi
+@@ -58197,10 +54891,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for ber_scanf in -llber" >&5
+-$as_echo_n "checking for ber_scanf in -llber... " >&6; }
++        { echo "$as_me:$LINENO: checking for ber_scanf in -llber" >&5
++echo $ECHO_N "checking for ber_scanf in -llber... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_lber_ber_scanf+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58230,38 +54924,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_lber_ber_scanf=yes;
+ 		  ac_cv_lib_ext_lber=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_lber_ber_scanf=no;
+ 		  ac_cv_lib_ext_lber=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_lber_ber_scanf" >&5
+-$as_echo "$ac_cv_lib_ext_lber_ber_scanf" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_lber_ber_scanf" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_lber_ber_scanf" >&6; }
+     if test $ac_cv_lib_ext_lber_ber_scanf = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BER_SCANF 1
+@@ -58296,10 +54986,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ber_sockbuf_add_io" >&5
+-$as_echo_n "checking for ber_sockbuf_add_io... " >&6; }
++        { echo "$as_me:$LINENO: checking for ber_sockbuf_add_io" >&5
++echo $ECHO_N "checking for ber_sockbuf_add_io... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ber_sockbuf_add_io+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58352,35 +55042,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ber_sockbuf_add_io=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ber_sockbuf_add_io=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ber_sockbuf_add_io" >&5
+-$as_echo "$ac_cv_func_ext_ber_sockbuf_add_io" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ber_sockbuf_add_io" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ber_sockbuf_add_io" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ber_sockbuf_add_io = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -58390,10 +55076,10 @@
+ fi
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking for LDAP_OPT_SOCKBUF" >&5
+-$as_echo_n "checking for LDAP_OPT_SOCKBUF... " >&6; }
++  { echo "$as_me:$LINENO: checking for LDAP_OPT_SOCKBUF" >&5
++echo $ECHO_N "checking for LDAP_OPT_SOCKBUF... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_LDAP_OPT_SOCKBUF+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		 cat >conftest.$ac_ext <<_ACEOF
+@@ -58417,21 +55103,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_LDAP_OPT_SOCKBUF=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_LDAP_OPT_SOCKBUF=no
+@@ -58439,8 +55124,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_LDAP_OPT_SOCKBUF" >&5
+-$as_echo "$samba_cv_HAVE_LDAP_OPT_SOCKBUF" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_LDAP_OPT_SOCKBUF" >&5
++echo "${ECHO_T}$samba_cv_HAVE_LDAP_OPT_SOCKBUF" >&6; }
+ 
+   if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes" -a \
+   	  x"$samba_cv_HAVE_LDAP_OPT_SOCKBUF" = x"yes"; then
+@@ -58454,10 +55139,10 @@
+   #######################################################
+   # if we have LBER_OPT_LOG_PRINT_FN, we can intercept
+   # ldap logging and print it out in the samba logs
+-  { $as_echo "$as_me:$LINENO: checking for LBER_OPT_LOG_PRINT_FN" >&5
+-$as_echo_n "checking for LBER_OPT_LOG_PRINT_FN... " >&6; }
++  { echo "$as_me:$LINENO: checking for LBER_OPT_LOG_PRINT_FN" >&5
++echo $ECHO_N "checking for LBER_OPT_LOG_PRINT_FN... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58480,21 +55165,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=no
+@@ -58502,8 +55186,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" >&5
+-$as_echo "$samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" >&5
++echo "${ECHO_T}$samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" >&6; }
+ 
+   if test x"$samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" = x"yes"; then
+ 
+@@ -58524,10 +55208,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
+-$as_echo_n "checking for ldap_init in -lldap... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
++echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_ldap_ldap_init+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58557,38 +55241,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_ldap_ldap_init=yes;
+ 		  ac_cv_lib_ext_ldap=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_ldap_ldap_init=no;
+ 		  ac_cv_lib_ext_ldap=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_ldap_ldap_init" >&5
+-$as_echo "$ac_cv_lib_ext_ldap_ldap_init" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_ldap_ldap_init" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_ldap_ldap_init" >&6; }
+     if test $ac_cv_lib_ext_ldap_ldap_init = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LDAP_INIT 1
+@@ -58623,10 +55303,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ldap_set_rebind_proc" >&5
+-$as_echo_n "checking for ldap_set_rebind_proc... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_set_rebind_proc" >&5
++echo $ECHO_N "checking for ldap_set_rebind_proc... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ldap_set_rebind_proc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58679,35 +55359,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ldap_set_rebind_proc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ldap_set_rebind_proc=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_set_rebind_proc" >&5
+-$as_echo "$ac_cv_func_ext_ldap_set_rebind_proc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_set_rebind_proc" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ldap_set_rebind_proc" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ldap_set_rebind_proc = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -58718,10 +55394,10 @@
+ 
+ 
+   LIBS="$LIBS $LDAP_LIBS"
+-  { $as_echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
+-$as_echo_n "checking whether ldap_set_rebind_proc takes 3 arguments... " >&6; }
++  { echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
++echo $ECHO_N "checking whether ldap_set_rebind_proc takes 3 arguments... $ECHO_C" >&6; }
+ if test "${smb_ldap_cv_ldap_set_rebind_proc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -58747,21 +55423,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   smb_ldap_cv_ldap_set_rebind_proc=3
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	smb_ldap_cv_ldap_set_rebind_proc=2
+@@ -58771,8 +55446,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_ldap_cv_ldap_set_rebind_proc" >&5
+-$as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_ldap_cv_ldap_set_rebind_proc" >&5
++echo "${ECHO_T}$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -58785,10 +55460,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5
+-$as_echo_n "checking for ldap_initialize... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
++echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ldap_initialize+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -58841,35 +55516,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ldap_initialize=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ldap_initialize=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_initialize" >&5
+-$as_echo "$ac_cv_func_ext_ldap_initialize" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_initialize" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ldap_initialize" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ldap_initialize = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -58891,18 +55562,18 @@
+     SMBLDAP="lib/smbldap.o"
+     SMBLDAPUTIL="lib/smbldap_util.o"
+     with_ldap_support=yes
+-    { $as_echo "$as_me:$LINENO: checking whether LDAP support is used" >&5
+-$as_echo_n "checking whether LDAP support is used... " >&6; }
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: checking whether LDAP support is used" >&5
++echo $ECHO_N "checking whether LDAP support is used... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   else
+     if test x"$with_ldap_support" = x"yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: libldap is needed for LDAP support" >&5
+-$as_echo "$as_me: error: libldap is needed for LDAP support" >&2;}
++	{ { echo "$as_me:$LINENO: error: libldap is needed for LDAP support" >&5
++echo "$as_me: error: libldap is needed for LDAP support" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+-	{ $as_echo "$as_me:$LINENO: WARNING: libldap is needed for LDAP support" >&5
+-$as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: libldap is needed for LDAP support" >&5
++echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
+     fi
+ 
+     LDAP_LIBS=""
+@@ -58916,8 +55587,8 @@
+ # active directory support
+ 
+ with_ads_support=auto
+-{ $as_echo "$as_me:$LINENO: checking for Active Directory and krb5 support" >&5
+-$as_echo_n "checking for Active Directory and krb5 support... " >&6; }
++{ echo "$as_me:$LINENO: checking for Active Directory and krb5 support" >&5
++echo $ECHO_N "checking for Active Directory and krb5 support... $ECHO_C" >&6; }
+ 
+ 
+ # Check whether --with-ads was given.
+@@ -58930,8 +55601,8 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_ads_support" >&5
+-$as_echo "$with_ads_support" >&6; }
++{ echo "$as_me:$LINENO: result: $with_ads_support" >&5
++echo "${ECHO_T}$with_ads_support" >&6; }
+ 
+ FOUND_KRB5=no
+ KRB5_LIBS=""
+@@ -58939,12 +55610,12 @@
+ if test x"$with_ldap_support" != x"yes"; then
+ 
+     if test x"$with_ads_support" = x"yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: Active Directory Support requires LDAP support" >&5
+-$as_echo "$as_me: error: Active Directory Support requires LDAP support" >&2;}
++	{ { echo "$as_me:$LINENO: error: Active Directory Support requires LDAP support" >&5
++echo "$as_me: error: Active Directory Support requires LDAP support" >&2;}
+    { (exit 1); exit 1; }; }
+     elif test x"$with_ads_support" = x"auto"; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires LDAP support)" >&5
+-$as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires LDAP support)" >&5
++echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
+ 	with_ads_support=no
+     fi
+ 
+@@ -58961,10 +55632,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ldap_init" >&5
+-$as_echo_n "checking for ldap_init... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_init" >&5
++echo $ECHO_N "checking for ldap_init... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ldap_init+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -59017,35 +55688,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ldap_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ldap_init=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_init" >&5
+-$as_echo "$ac_cv_func_ext_ldap_init" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_init" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ldap_init" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ldap_init = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -59057,12 +55724,12 @@
+ 
+     if test x"$ac_cv_func_ext_ldap_init" != x"yes"; then
+ 	if test x"$with_ads_support" = x"yes"; then
+-	    { { $as_echo "$as_me:$LINENO: error: Active Directory support on HPUX requires ldap_init" >&5
+-$as_echo "$as_me: error: Active Directory support on HPUX requires ldap_init" >&2;}
++	    { { echo "$as_me:$LINENO: error: Active Directory support on HPUX requires ldap_init" >&5
++echo "$as_me: error: Active Directory support on HPUX requires ldap_init" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test x"$with_ads_support" = x"auto"; then
+-	    { $as_echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&5
+-$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
++	    { echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&5
++echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
+ 	    with_ads_support=no
+ 	fi
+     fi
+@@ -59073,10 +55740,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5
+-$as_echo_n "checking for ldap_initialize... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
++echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ldap_initialize+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -59129,35 +55796,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ldap_initialize=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ldap_initialize=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_initialize" >&5
+-$as_echo "$ac_cv_func_ext_ldap_initialize" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_initialize" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ldap_initialize" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ldap_initialize = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -59169,12 +55832,12 @@
+ 
+     if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+ 	if test x"$with_ads_support" = x"yes"; then
+-	    { { $as_echo "$as_me:$LINENO: error: Active Directory support requires ldap_initialize" >&5
+-$as_echo "$as_me: error: Active Directory support requires ldap_initialize" >&2;}
++	    { { echo "$as_me:$LINENO: error: Active Directory support requires ldap_initialize" >&5
++echo "$as_me: error: Active Directory support requires ldap_initialize" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test x"$with_ads_support" = x"auto"; then
+-	    { $as_echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&5
+-$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
++	    { echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&5
++echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
+ 	    with_ads_support=no
+ 	fi
+     fi
+@@ -59187,10 +55850,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$LDAP_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for ldap_add_result_entry" >&5
+-$as_echo_n "checking for ldap_add_result_entry... " >&6; }
++        { echo "$as_me:$LINENO: checking for ldap_add_result_entry" >&5
++echo $ECHO_N "checking for ldap_add_result_entry... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_ldap_add_result_entry+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -59243,35 +55906,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_ldap_add_result_entry=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_ldap_add_result_entry=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_add_result_entry" >&5
+-$as_echo "$ac_cv_func_ext_ldap_add_result_entry" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_ldap_add_result_entry" >&5
++echo "${ECHO_T}$ac_cv_func_ext_ldap_add_result_entry" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_ldap_add_result_entry = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -59283,12 +55942,12 @@
+ 
+     if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
+ 	if test x"$with_ads_support" = x"yes"; then
+-	    { { $as_echo "$as_me:$LINENO: error: Active Directory support requires ldap_add_result_entry" >&5
+-$as_echo "$as_me: error: Active Directory support requires ldap_add_result_entry" >&2;}
++	    { { echo "$as_me:$LINENO: error: Active Directory support requires ldap_add_result_entry" >&5
++echo "$as_me: error: Active Directory support requires ldap_add_result_entry" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test x"$with_ads_support" = x"auto"; then
+-	    { $as_echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&5
+-$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
++	    { echo "$as_me:$LINENO: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&5
++echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
+ 	    with_ads_support=no
+ 	fi
+     fi
+@@ -59303,24 +55962,24 @@
+   if test x$FOUND_KRB5 = x"no"; then
+     #################################################
+     # check for location of Kerberos 5 install
+-    { $as_echo "$as_me:$LINENO: checking for kerberos 5 install path" >&5
+-$as_echo_n "checking for kerberos 5 install path... " >&6; }
++    { echo "$as_me:$LINENO: checking for kerberos 5 install path" >&5
++echo $ECHO_N "checking for kerberos 5 install path... $ECHO_C" >&6; }
+ 
+ # Check whether --with-krb5 was given.
+ if test "${with_krb5+set}" = set; then
+   withval=$with_krb5;  case "$withval" in
+       no)
+-        { $as_echo "$as_me:$LINENO: result: no krb5-path given" >&5
+-$as_echo "no krb5-path given" >&6; }
++        { echo "$as_me:$LINENO: result: no krb5-path given" >&5
++echo "${ECHO_T}no krb5-path given" >&6; }
+         ;;
+       yes)
+-        { $as_echo "$as_me:$LINENO: result: /usr" >&5
+-$as_echo "/usr" >&6; }
++        { echo "$as_me:$LINENO: result: /usr" >&5
++echo "${ECHO_T}/usr" >&6; }
+         FOUND_KRB5=yes
+         ;;
+       *)
+-        { $as_echo "$as_me:$LINENO: result: $withval" >&5
+-$as_echo "$withval" >&6; }
++        { echo "$as_me:$LINENO: result: $withval" >&5
++echo "${ECHO_T}$withval" >&6; }
+         KRB5_CFLAGS="-I$withval/include"
+         KRB5_CPPFLAGS="-I$withval/include"
+         KRB5_LDFLAGS="-L$withval/lib"
+@@ -59331,8 +55990,8 @@
+         ;;
+       esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no krb5-path given" >&5
+-$as_echo "no krb5-path given" >&6; }
++  { echo "$as_me:$LINENO: result: no krb5-path given" >&5
++echo "${ECHO_T}no krb5-path given" >&6; }
+ 
+ fi
+ 
+@@ -59342,10 +56001,10 @@
+   # check for krb5-config from recent MIT and Heimdal kerberos 5
+   # Extract the first word of "krb5-config", so it can be a program name with args.
+ set dummy krb5-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_KRB5CONFIG+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   case $KRB5CONFIG in
+   [\\/]* | ?:[\\/]*)
+@@ -59360,7 +56019,7 @@
+   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_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+@@ -59372,16 +56031,16 @@
+ fi
+ KRB5CONFIG=$ac_cv_path_KRB5CONFIG
+ if test -n "$KRB5CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5
+-$as_echo "$KRB5CONFIG" >&6; }
++  { echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5
++echo "${ECHO_T}$KRB5CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking for working krb5-config" >&5
+-$as_echo_n "checking for working krb5-config... " >&6; }
++  { echo "$as_me:$LINENO: checking for working krb5-config" >&5
++echo $ECHO_N "checking for working krb5-config... $ECHO_C" >&6; }
+   if test -x "$KRB5CONFIG"; then
+     ac_save_CFLAGS=$CFLAGS
+     CFLAGS="";export CFLAGS
+@@ -59394,71 +56053,71 @@
+     CFLAGS=$ac_save_CFLAGS;export CFLAGS
+     LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
+     FOUND_KRB5=yes
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   else
+-    { $as_echo "$as_me:$LINENO: result: no. Fallback to previous krb5 detection strategy" >&5
+-$as_echo "no. Fallback to previous krb5 detection strategy" >&6; }
++    { echo "$as_me:$LINENO: result: no. Fallback to previous krb5 detection strategy" >&5
++echo "${ECHO_T}no. Fallback to previous krb5 detection strategy" >&6; }
+   fi
+ 
+   if test x$FOUND_KRB5 = x"no"; then
+     #################################################
+     # see if this box has the SuSE location for the heimdal krb implementation
+-    { $as_echo "$as_me:$LINENO: checking for /usr/include/heimdal" >&5
+-$as_echo_n "checking for /usr/include/heimdal... " >&6; }
++    { echo "$as_me:$LINENO: checking for /usr/include/heimdal" >&5
++echo $ECHO_N "checking for /usr/include/heimdal... $ECHO_C" >&6; }
+     if test -d /usr/include/heimdal; then
+       if test -f /usr/lib/heimdal/lib/libkrb5.a; then
+           KRB5_CFLAGS="-I/usr/include/heimdal"
+           KRB5_CPPFLAGS="-I/usr/include/heimdal"
+           KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
+ 	  FOUND_KRB5=yes
+-          { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++          { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       else
+           KRB5_CFLAGS="-I/usr/include/heimdal"
+           KRB5_CPPFLAGS="-I/usr/include/heimdal"
+ 	  FOUND_KRB5=yes
+-          { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++          { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       fi
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+   fi
+ 
+   if test x$FOUND_KRB5 = x"no"; then
+     #################################################
+     # see if this box has the RedHat location for kerberos
+-    { $as_echo "$as_me:$LINENO: checking for /usr/kerberos" >&5
+-$as_echo_n "checking for /usr/kerberos... " >&6; }
++    { echo "$as_me:$LINENO: checking for /usr/kerberos" >&5
++echo $ECHO_N "checking for /usr/kerberos... $ECHO_C" >&6; }
+     if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
+       KRB5_LDFLAGS="-L/usr/kerberos/lib"
+       KRB5_CFLAGS="-I/usr/kerberos/include"
+       KRB5_CPPFLAGS="-I/usr/kerberos/include"
+       FOUND_KRB5=yes
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+   fi
+ 
+   if test x$FOUND_KRB5 = x"no"; then
+     #################################################
+     # see if this box has the OpenBSD location for heimdal krb5
+-    { $as_echo "$as_me:$LINENO: checking for /usr/include/kerberosV" >&5
+-$as_echo_n "checking for /usr/include/kerberosV... " >&6; }
++    { echo "$as_me:$LINENO: checking for /usr/include/kerberosV" >&5
++echo $ECHO_N "checking for /usr/include/kerberosV... $ECHO_C" >&6; }
+     if test -d /usr/include/kerberosV; then
+       KRB5_CPPFLAGS="-I/usr/include/kerberosV"
+       KRB5_LIBS="-lcrypto"
+       FOUND_KRB5=yes
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+   fi
+ 
+@@ -59478,21 +56137,20 @@
+ 
+ for ac_header in krb5.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59508,33 +56166,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59548,52 +56205,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -59602,24 +56258,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -59633,12 +56286,12 @@
+     # i.e with_ads_support = auto, otherwise die with an error.
+ 
+     if test x"$with_ads_support" = x"yes"; then
+-      { { $as_echo "$as_me:$LINENO: error: Active Directory cannot be supported without krb5.h" >&5
+-$as_echo "$as_me: error: Active Directory cannot be supported without krb5.h" >&2;}
++      { { echo "$as_me:$LINENO: error: Active Directory cannot be supported without krb5.h" >&5
++echo "$as_me: error: Active Directory cannot be supported without krb5.h" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+-      { $as_echo "$as_me:$LINENO: WARNING: Active Directory cannot be supported without krb5.h" >&5
+-$as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
++      { echo "$as_me:$LINENO: WARNING: Active Directory cannot be supported without krb5.h" >&5
++echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
+     fi
+ 
+     # Turn off AD support and restore CFLAGS and LIBS variables
+@@ -59652,21 +56305,20 @@
+ 
+ for ac_header in krb5/locate_plugin.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59682,33 +56334,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59722,52 +56373,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -59776,24 +56426,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -59821,21 +56468,20 @@
+ 
+ for ac_header in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59851,33 +56497,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -59891,52 +56536,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -59945,24 +56589,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -59981,10 +56622,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for _et_list in -lcom_err" >&5
+-$as_echo_n "checking for _et_list in -lcom_err... " >&6; }
++        { echo "$as_me:$LINENO: checking for _et_list in -lcom_err" >&5
++echo $ECHO_N "checking for _et_list in -lcom_err... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_com_err__et_list+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60014,38 +56655,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_com_err__et_list=yes;
+ 		  ac_cv_lib_ext_com_err=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_com_err__et_list=no;
+ 		  ac_cv_lib_ext_com_err=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_com_err__et_list" >&5
+-$as_echo "$ac_cv_lib_ext_com_err__et_list" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_com_err__et_list" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_com_err__et_list" >&6; }
+     if test $ac_cv_lib_ext_com_err__et_list = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE__ET_LIST 1
+@@ -60080,10 +56717,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for krb5_encrypt_data in -lk5crypto" >&5
+-$as_echo_n "checking for krb5_encrypt_data in -lk5crypto... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_encrypt_data in -lk5crypto" >&5
++echo $ECHO_N "checking for krb5_encrypt_data in -lk5crypto... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_k5crypto_krb5_encrypt_data+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60113,38 +56750,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_k5crypto_krb5_encrypt_data=yes;
+ 		  ac_cv_lib_ext_k5crypto=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_k5crypto_krb5_encrypt_data=no;
+ 		  ac_cv_lib_ext_k5crypto=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_k5crypto_krb5_encrypt_data" >&5
+-$as_echo "$ac_cv_lib_ext_k5crypto_krb5_encrypt_data" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_k5crypto_krb5_encrypt_data" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_k5crypto_krb5_encrypt_data" >&6; }
+     if test $ac_cv_lib_ext_k5crypto_krb5_encrypt_data = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_ENCRYPT_DATA 1
+@@ -60181,10 +56814,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
+-$as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
++        { echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
++echo $ECHO_N "checking for des_set_key in -lcrypto... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60214,38 +56847,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_crypto_des_set_key=yes;
+ 		  ac_cv_lib_ext_crypto=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_crypto_des_set_key=no;
+ 		  ac_cv_lib_ext_crypto=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5
+-$as_echo "$ac_cv_lib_ext_crypto_des_set_key" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_crypto_des_set_key" >&6; }
+     if test $ac_cv_lib_ext_crypto_des_set_key = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DES_SET_KEY 1
+@@ -60280,10 +56909,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for copy_Authenticator in -lasn1" >&5
+-$as_echo_n "checking for copy_Authenticator in -lasn1... " >&6; }
++        { echo "$as_me:$LINENO: checking for copy_Authenticator in -lasn1" >&5
++echo $ECHO_N "checking for copy_Authenticator in -lasn1... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_asn1_copy_Authenticator+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60313,38 +56942,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_asn1_copy_Authenticator=yes;
+ 		  ac_cv_lib_ext_asn1=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_asn1_copy_Authenticator=no;
+ 		  ac_cv_lib_ext_asn1=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_asn1_copy_Authenticator" >&5
+-$as_echo "$ac_cv_lib_ext_asn1_copy_Authenticator" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_asn1_copy_Authenticator" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_asn1_copy_Authenticator" >&6; }
+     if test $ac_cv_lib_ext_asn1_copy_Authenticator = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_COPY_AUTHENTICATOR 1
+@@ -60379,10 +57004,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for roken_getaddrinfo_hostspec in -lroken" >&5
+-$as_echo_n "checking for roken_getaddrinfo_hostspec in -lroken... " >&6; }
++        { echo "$as_me:$LINENO: checking for roken_getaddrinfo_hostspec in -lroken" >&5
++echo $ECHO_N "checking for roken_getaddrinfo_hostspec in -lroken... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60412,38 +57037,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec=yes;
+ 		  ac_cv_lib_ext_roken=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec=no;
+ 		  ac_cv_lib_ext_roken=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec" >&5
+-$as_echo "$ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec" >&6; }
+     if test $ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_ROKEN_GETADDRINFO_HOSTSPEC 1
+@@ -60480,10 +57101,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for gss_display_status in -lgssapi" >&5
+-$as_echo_n "checking for gss_display_status in -lgssapi... " >&6; }
++        { echo "$as_me:$LINENO: checking for gss_display_status in -lgssapi" >&5
++echo $ECHO_N "checking for gss_display_status in -lgssapi... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_gssapi_gss_display_status+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60513,38 +57134,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_gssapi_gss_display_status=yes;
+ 		  ac_cv_lib_ext_gssapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_gssapi_gss_display_status=no;
+ 		  ac_cv_lib_ext_gssapi=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_gssapi_gss_display_status" >&5
+-$as_echo "$ac_cv_lib_ext_gssapi_gss_display_status" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_gssapi_gss_display_status" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_gssapi_gss_display_status" >&6; }
+     if test $ac_cv_lib_ext_gssapi_gss_display_status = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GSS_DISPLAY_STATUS 1
+@@ -60583,10 +57200,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for krb5_mk_req_extended in -lkrb5" >&5
+-$as_echo_n "checking for krb5_mk_req_extended in -lkrb5... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_mk_req_extended in -lkrb5" >&5
++echo $ECHO_N "checking for krb5_mk_req_extended in -lkrb5... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_krb5_krb5_mk_req_extended+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60616,38 +57233,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_krb5_krb5_mk_req_extended=yes;
+ 		  ac_cv_lib_ext_krb5=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_krb5_krb5_mk_req_extended=no;
+ 		  ac_cv_lib_ext_krb5=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_krb5_krb5_mk_req_extended" >&5
+-$as_echo "$ac_cv_lib_ext_krb5_krb5_mk_req_extended" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_krb5_krb5_mk_req_extended" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_krb5_krb5_mk_req_extended" >&6; }
+     if test $ac_cv_lib_ext_krb5_krb5_mk_req_extended = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_MK_REQ_EXTENDED 1
+@@ -60682,10 +57295,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for krb5_kt_compare in -lkrb5" >&5
+-$as_echo_n "checking for krb5_kt_compare in -lkrb5... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_kt_compare in -lkrb5" >&5
++echo $ECHO_N "checking for krb5_kt_compare in -lkrb5... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_krb5_krb5_kt_compare+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60715,38 +57328,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_krb5_krb5_kt_compare=yes;
+ 		  ac_cv_lib_ext_krb5=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_krb5_krb5_kt_compare=no;
+ 		  ac_cv_lib_ext_krb5=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_krb5_krb5_kt_compare" >&5
+-$as_echo "$ac_cv_lib_ext_krb5_krb5_kt_compare" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_krb5_krb5_kt_compare" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_krb5_krb5_kt_compare" >&6; }
+     if test $ac_cv_lib_ext_krb5_krb5_kt_compare = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_KT_COMPARE 1
+@@ -60785,10 +57394,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for gss_display_status in -lgssapi_krb5" >&5
+-$as_echo_n "checking for gss_display_status in -lgssapi_krb5... " >&6; }
++        { echo "$as_me:$LINENO: checking for gss_display_status in -lgssapi_krb5" >&5
++echo $ECHO_N "checking for gss_display_status in -lgssapi_krb5... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_gssapi_krb5_gss_display_status+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60818,38 +57427,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_gssapi_krb5_gss_display_status=yes;
+ 		  ac_cv_lib_ext_gssapi_krb5=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_gssapi_krb5_gss_display_status=no;
+ 		  ac_cv_lib_ext_gssapi_krb5=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_gssapi_krb5_gss_display_status" >&5
+-$as_echo "$ac_cv_lib_ext_gssapi_krb5_gss_display_status" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_gssapi_krb5_gss_display_status" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_gssapi_krb5_gss_display_status" >&6; }
+     if test $ac_cv_lib_ext_gssapi_krb5_gss_display_status = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GSS_DISPLAY_STATUS 1
+@@ -60882,10 +57487,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_set_real_time" >&5
+-$as_echo_n "checking for krb5_set_real_time... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_set_real_time" >&5
++echo $ECHO_N "checking for krb5_set_real_time... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_set_real_time+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -60938,35 +57543,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_set_real_time=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_set_real_time=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_real_time" >&5
+-$as_echo "$ac_cv_func_ext_krb5_set_real_time" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_real_time" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_set_real_time" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_set_real_time = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -60980,10 +57581,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_set_default_in_tkt_etypes" >&5
+-$as_echo_n "checking for krb5_set_default_in_tkt_etypes... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_set_default_in_tkt_etypes" >&5
++echo $ECHO_N "checking for krb5_set_default_in_tkt_etypes... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_set_default_in_tkt_etypes+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61036,35 +57637,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_set_default_in_tkt_etypes=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_set_default_in_tkt_etypes=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_in_tkt_etypes" >&5
+-$as_echo "$ac_cv_func_ext_krb5_set_default_in_tkt_etypes" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_in_tkt_etypes" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_set_default_in_tkt_etypes" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_set_default_in_tkt_etypes = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61078,10 +57675,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_set_default_tgs_enctypes" >&5
+-$as_echo_n "checking for krb5_set_default_tgs_enctypes... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_set_default_tgs_enctypes" >&5
++echo $ECHO_N "checking for krb5_set_default_tgs_enctypes... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_set_default_tgs_enctypes+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61134,35 +57731,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_set_default_tgs_enctypes=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_set_default_tgs_enctypes=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_tgs_enctypes" >&5
+-$as_echo "$ac_cv_func_ext_krb5_set_default_tgs_enctypes" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_tgs_enctypes" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_set_default_tgs_enctypes" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_set_default_tgs_enctypes = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61176,10 +57769,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_set_default_tgs_ktypes" >&5
+-$as_echo_n "checking for krb5_set_default_tgs_ktypes... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_set_default_tgs_ktypes" >&5
++echo $ECHO_N "checking for krb5_set_default_tgs_ktypes... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_set_default_tgs_ktypes+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61232,35 +57825,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_set_default_tgs_ktypes=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_set_default_tgs_ktypes=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_tgs_ktypes" >&5
+-$as_echo "$ac_cv_func_ext_krb5_set_default_tgs_ktypes" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_set_default_tgs_ktypes" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_set_default_tgs_ktypes" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_set_default_tgs_ktypes = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61274,10 +57863,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_principal2salt" >&5
+-$as_echo_n "checking for krb5_principal2salt... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_principal2salt" >&5
++echo $ECHO_N "checking for krb5_principal2salt... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_principal2salt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61330,35 +57919,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_principal2salt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_principal2salt=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal2salt" >&5
+-$as_echo "$ac_cv_func_ext_krb5_principal2salt" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal2salt" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_principal2salt" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_principal2salt = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61372,10 +57957,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_use_enctype" >&5
+-$as_echo_n "checking for krb5_use_enctype... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_use_enctype" >&5
++echo $ECHO_N "checking for krb5_use_enctype... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_use_enctype+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61428,35 +58013,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_use_enctype=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_use_enctype=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_use_enctype" >&5
+-$as_echo "$ac_cv_func_ext_krb5_use_enctype" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_use_enctype" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_use_enctype" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_use_enctype = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61470,10 +58051,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_string_to_key" >&5
+-$as_echo_n "checking for krb5_string_to_key... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_string_to_key" >&5
++echo $ECHO_N "checking for krb5_string_to_key... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_string_to_key+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61526,35 +58107,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_string_to_key=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_string_to_key=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_string_to_key" >&5
+-$as_echo "$ac_cv_func_ext_krb5_string_to_key" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_string_to_key" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_string_to_key" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_string_to_key = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61568,10 +58145,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_pw_salt" >&5
+-$as_echo_n "checking for krb5_get_pw_salt... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_pw_salt" >&5
++echo $ECHO_N "checking for krb5_get_pw_salt... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_pw_salt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61624,35 +58201,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_pw_salt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_pw_salt=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_pw_salt" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_pw_salt" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_pw_salt" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_pw_salt" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_pw_salt = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61666,10 +58239,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_string_to_key_salt" >&5
+-$as_echo_n "checking for krb5_string_to_key_salt... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_string_to_key_salt" >&5
++echo $ECHO_N "checking for krb5_string_to_key_salt... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_string_to_key_salt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61722,35 +58295,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_string_to_key_salt=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_string_to_key_salt=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_string_to_key_salt" >&5
+-$as_echo "$ac_cv_func_ext_krb5_string_to_key_salt" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_string_to_key_salt" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_string_to_key_salt" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_string_to_key_salt = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61764,10 +58333,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_auth_con_setkey" >&5
+-$as_echo_n "checking for krb5_auth_con_setkey... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_auth_con_setkey" >&5
++echo $ECHO_N "checking for krb5_auth_con_setkey... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_auth_con_setkey+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61820,35 +58389,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_auth_con_setkey=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_auth_con_setkey=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_setkey" >&5
+-$as_echo "$ac_cv_func_ext_krb5_auth_con_setkey" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_setkey" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_auth_con_setkey" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_auth_con_setkey = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61862,10 +58427,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_auth_con_setuseruserkey" >&5
+-$as_echo_n "checking for krb5_auth_con_setuseruserkey... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_auth_con_setuseruserkey" >&5
++echo $ECHO_N "checking for krb5_auth_con_setuseruserkey... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_auth_con_setuseruserkey+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -61918,35 +58483,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_auth_con_setuseruserkey=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_auth_con_setuseruserkey=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_setuseruserkey" >&5
+-$as_echo "$ac_cv_func_ext_krb5_auth_con_setuseruserkey" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_setuseruserkey" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_auth_con_setuseruserkey" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_auth_con_setuseruserkey = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -61960,10 +58521,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_locate_kdc" >&5
+-$as_echo_n "checking for krb5_locate_kdc... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_locate_kdc" >&5
++echo $ECHO_N "checking for krb5_locate_kdc... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_locate_kdc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62016,35 +58577,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_locate_kdc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_locate_kdc=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_locate_kdc" >&5
+-$as_echo "$ac_cv_func_ext_krb5_locate_kdc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_locate_kdc" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_locate_kdc" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_locate_kdc = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62058,10 +58615,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_permitted_enctypes" >&5
+-$as_echo_n "checking for krb5_get_permitted_enctypes... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_permitted_enctypes" >&5
++echo $ECHO_N "checking for krb5_get_permitted_enctypes... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_permitted_enctypes+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62114,35 +58671,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_permitted_enctypes=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_permitted_enctypes=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_permitted_enctypes" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_permitted_enctypes" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_permitted_enctypes" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_permitted_enctypes" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_permitted_enctypes = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62156,10 +58709,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_default_in_tkt_etypes" >&5
+-$as_echo_n "checking for krb5_get_default_in_tkt_etypes... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_default_in_tkt_etypes" >&5
++echo $ECHO_N "checking for krb5_get_default_in_tkt_etypes... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_default_in_tkt_etypes+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62212,35 +58765,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_default_in_tkt_etypes=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_default_in_tkt_etypes=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_default_in_tkt_etypes" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_default_in_tkt_etypes" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_default_in_tkt_etypes = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62254,10 +58803,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_data_contents" >&5
+-$as_echo_n "checking for krb5_free_data_contents... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_free_data_contents" >&5
++echo $ECHO_N "checking for krb5_free_data_contents... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_free_data_contents+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62310,35 +58859,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_free_data_contents=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_free_data_contents=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_data_contents" >&5
+-$as_echo "$ac_cv_func_ext_krb5_free_data_contents" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_data_contents" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_free_data_contents" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_free_data_contents = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62352,10 +58897,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_principal_get_comp_string" >&5
+-$as_echo_n "checking for krb5_principal_get_comp_string... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_principal_get_comp_string" >&5
++echo $ECHO_N "checking for krb5_principal_get_comp_string... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_principal_get_comp_string+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62408,35 +58953,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_principal_get_comp_string=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_principal_get_comp_string=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal_get_comp_string" >&5
+-$as_echo "$ac_cv_func_ext_krb5_principal_get_comp_string" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal_get_comp_string" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_principal_get_comp_string" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_principal_get_comp_string = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62450,10 +58991,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_unparsed_name" >&5
+-$as_echo_n "checking for krb5_free_unparsed_name... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_free_unparsed_name" >&5
++echo $ECHO_N "checking for krb5_free_unparsed_name... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_free_unparsed_name+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62506,35 +59047,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_free_unparsed_name=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_free_unparsed_name=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_unparsed_name" >&5
+-$as_echo "$ac_cv_func_ext_krb5_free_unparsed_name" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_unparsed_name" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_free_unparsed_name" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_free_unparsed_name = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62548,10 +59085,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_keytab_entry_contents" >&5
+-$as_echo_n "checking for krb5_free_keytab_entry_contents... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_free_keytab_entry_contents" >&5
++echo $ECHO_N "checking for krb5_free_keytab_entry_contents... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_free_keytab_entry_contents+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62604,35 +59141,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_free_keytab_entry_contents=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_free_keytab_entry_contents=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_keytab_entry_contents" >&5
+-$as_echo "$ac_cv_func_ext_krb5_free_keytab_entry_contents" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_keytab_entry_contents" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_free_keytab_entry_contents" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_free_keytab_entry_contents = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62646,10 +59179,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_kt_free_entry" >&5
+-$as_echo_n "checking for krb5_kt_free_entry... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_kt_free_entry" >&5
++echo $ECHO_N "checking for krb5_kt_free_entry... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_kt_free_entry+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62702,35 +59235,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_kt_free_entry=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_kt_free_entry=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_kt_free_entry" >&5
+-$as_echo "$ac_cv_func_ext_krb5_kt_free_entry" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_kt_free_entry" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_kt_free_entry" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_kt_free_entry = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62744,10 +59273,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_krbhst_init" >&5
+-$as_echo_n "checking for krb5_krbhst_init... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_krbhst_init" >&5
++echo $ECHO_N "checking for krb5_krbhst_init... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_krbhst_init+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62800,35 +59329,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_krbhst_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_krbhst_init=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_krbhst_init" >&5
+-$as_echo "$ac_cv_func_ext_krb5_krbhst_init" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_krbhst_init" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_krbhst_init" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_krbhst_init = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62842,10 +59367,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_krbhst_get_addrinfo" >&5
+-$as_echo_n "checking for krb5_krbhst_get_addrinfo... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_krbhst_get_addrinfo" >&5
++echo $ECHO_N "checking for krb5_krbhst_get_addrinfo... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_krbhst_get_addrinfo+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62898,35 +59423,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_krbhst_get_addrinfo=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_krbhst_get_addrinfo=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_krbhst_get_addrinfo" >&5
+-$as_echo "$ac_cv_func_ext_krb5_krbhst_get_addrinfo" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_krbhst_get_addrinfo" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_krbhst_get_addrinfo" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_krbhst_get_addrinfo = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -62940,10 +59461,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_c_enctype_compare" >&5
+-$as_echo_n "checking for krb5_c_enctype_compare... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_c_enctype_compare" >&5
++echo $ECHO_N "checking for krb5_c_enctype_compare... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_c_enctype_compare+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -62996,35 +59517,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_c_enctype_compare=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_c_enctype_compare=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_c_enctype_compare" >&5
+-$as_echo "$ac_cv_func_ext_krb5_c_enctype_compare" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_c_enctype_compare" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_c_enctype_compare" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_c_enctype_compare = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63038,10 +59555,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_enctypes_compatible_keys" >&5
+-$as_echo_n "checking for krb5_enctypes_compatible_keys... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_enctypes_compatible_keys" >&5
++echo $ECHO_N "checking for krb5_enctypes_compatible_keys... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_enctypes_compatible_keys+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63094,35 +59611,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_enctypes_compatible_keys=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_enctypes_compatible_keys=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_enctypes_compatible_keys" >&5
+-$as_echo "$ac_cv_func_ext_krb5_enctypes_compatible_keys" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_enctypes_compatible_keys" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_enctypes_compatible_keys" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_enctypes_compatible_keys = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63136,10 +59649,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_crypto_init" >&5
+-$as_echo_n "checking for krb5_crypto_init... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_crypto_init" >&5
++echo $ECHO_N "checking for krb5_crypto_init... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_crypto_init+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63192,35 +59705,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_crypto_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_crypto_init=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_crypto_init" >&5
+-$as_echo "$ac_cv_func_ext_krb5_crypto_init" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_crypto_init" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_crypto_init" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_crypto_init = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63234,10 +59743,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_crypto_destroy" >&5
+-$as_echo_n "checking for krb5_crypto_destroy... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_crypto_destroy" >&5
++echo $ECHO_N "checking for krb5_crypto_destroy... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_crypto_destroy+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63290,35 +59799,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_crypto_destroy=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_crypto_destroy=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_crypto_destroy" >&5
+-$as_echo "$ac_cv_func_ext_krb5_crypto_destroy" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_crypto_destroy" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_crypto_destroy" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_crypto_destroy = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63332,10 +59837,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_decode_ap_req" >&5
+-$as_echo_n "checking for krb5_decode_ap_req... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_decode_ap_req" >&5
++echo $ECHO_N "checking for krb5_decode_ap_req... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_decode_ap_req+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63388,35 +59893,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_decode_ap_req=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_decode_ap_req=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_decode_ap_req" >&5
+-$as_echo "$ac_cv_func_ext_krb5_decode_ap_req" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_decode_ap_req" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_decode_ap_req" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_decode_ap_req = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63430,10 +59931,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for free_AP_REQ" >&5
+-$as_echo_n "checking for free_AP_REQ... " >&6; }
++        { echo "$as_me:$LINENO: checking for free_AP_REQ" >&5
++echo $ECHO_N "checking for free_AP_REQ... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_free_AP_REQ+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63486,35 +59987,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_free_AP_REQ=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_free_AP_REQ=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_free_AP_REQ" >&5
+-$as_echo "$ac_cv_func_ext_free_AP_REQ" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_free_AP_REQ" >&5
++echo "${ECHO_T}$ac_cv_func_ext_free_AP_REQ" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_free_AP_REQ = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63528,10 +60025,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_verify_checksum" >&5
+-$as_echo_n "checking for krb5_verify_checksum... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_verify_checksum" >&5
++echo $ECHO_N "checking for krb5_verify_checksum... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_verify_checksum+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63584,35 +60081,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_verify_checksum=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_verify_checksum=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_verify_checksum" >&5
+-$as_echo "$ac_cv_func_ext_krb5_verify_checksum" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_verify_checksum" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_verify_checksum" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_verify_checksum = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63626,10 +60119,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_c_verify_checksum" >&5
+-$as_echo_n "checking for krb5_c_verify_checksum... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_c_verify_checksum" >&5
++echo $ECHO_N "checking for krb5_c_verify_checksum... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_c_verify_checksum+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63682,35 +60175,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_c_verify_checksum=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_c_verify_checksum=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_c_verify_checksum" >&5
+-$as_echo "$ac_cv_func_ext_krb5_c_verify_checksum" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_c_verify_checksum" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_c_verify_checksum" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_c_verify_checksum = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63724,10 +60213,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_principal_compare_any_realm" >&5
+-$as_echo_n "checking for krb5_principal_compare_any_realm... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_principal_compare_any_realm" >&5
++echo $ECHO_N "checking for krb5_principal_compare_any_realm... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_principal_compare_any_realm+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63780,35 +60269,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_principal_compare_any_realm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_principal_compare_any_realm=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal_compare_any_realm" >&5
+-$as_echo "$ac_cv_func_ext_krb5_principal_compare_any_realm" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_principal_compare_any_realm" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_principal_compare_any_realm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_principal_compare_any_realm = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63822,10 +60307,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_parse_name_norealm" >&5
+-$as_echo_n "checking for krb5_parse_name_norealm... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_parse_name_norealm" >&5
++echo $ECHO_N "checking for krb5_parse_name_norealm... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_parse_name_norealm+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63878,35 +60363,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_parse_name_norealm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_parse_name_norealm=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_parse_name_norealm" >&5
+-$as_echo "$ac_cv_func_ext_krb5_parse_name_norealm" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_parse_name_norealm" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_parse_name_norealm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_parse_name_norealm = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -63920,10 +60401,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_princ_size" >&5
+-$as_echo_n "checking for krb5_princ_size... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_princ_size" >&5
++echo $ECHO_N "checking for krb5_princ_size... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_princ_size+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -63976,35 +60457,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_princ_size=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_princ_size=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_princ_size" >&5
+-$as_echo "$ac_cv_func_ext_krb5_princ_size" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_princ_size" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_princ_size" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_princ_size = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64018,10 +60495,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_set_pac_request" >&5
+-$as_echo_n "checking for krb5_get_init_creds_opt_set_pac_request... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_set_pac_request" >&5
++echo $ECHO_N "checking for krb5_get_init_creds_opt_set_pac_request... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64074,35 +60551,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64116,10 +60589,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_renewed_creds" >&5
+-$as_echo_n "checking for krb5_get_renewed_creds... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_renewed_creds" >&5
++echo $ECHO_N "checking for krb5_get_renewed_creds... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_renewed_creds+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64172,35 +60645,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_renewed_creds=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_renewed_creds=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_renewed_creds" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_renewed_creds" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_renewed_creds" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_renewed_creds" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_renewed_creds = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64214,10 +60683,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_kdc_cred" >&5
+-$as_echo_n "checking for krb5_get_kdc_cred... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_kdc_cred" >&5
++echo $ECHO_N "checking for krb5_get_kdc_cred... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_kdc_cred+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64270,35 +60739,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_kdc_cred=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_kdc_cred=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_kdc_cred" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_kdc_cred" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_kdc_cred" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_kdc_cred" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_kdc_cred = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64312,10 +60777,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_error_contents" >&5
+-$as_echo_n "checking for krb5_free_error_contents... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_free_error_contents" >&5
++echo $ECHO_N "checking for krb5_free_error_contents... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_free_error_contents+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64368,35 +60833,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_free_error_contents=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_free_error_contents=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_error_contents" >&5
+-$as_echo "$ac_cv_func_ext_krb5_free_error_contents" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_error_contents" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_free_error_contents" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_free_error_contents = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64410,10 +60871,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for initialize_krb5_error_table" >&5
+-$as_echo_n "checking for initialize_krb5_error_table... " >&6; }
++        { echo "$as_me:$LINENO: checking for initialize_krb5_error_table" >&5
++echo $ECHO_N "checking for initialize_krb5_error_table... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_initialize_krb5_error_table+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64466,35 +60927,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_initialize_krb5_error_table=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_initialize_krb5_error_table=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_initialize_krb5_error_table" >&5
+-$as_echo "$ac_cv_func_ext_initialize_krb5_error_table" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_initialize_krb5_error_table" >&5
++echo "${ECHO_T}$ac_cv_func_ext_initialize_krb5_error_table" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_initialize_krb5_error_table = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64508,10 +60965,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_alloc" >&5
+-$as_echo_n "checking for krb5_get_init_creds_opt_alloc... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_alloc" >&5
++echo $ECHO_N "checking for krb5_get_init_creds_opt_alloc... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_init_creds_opt_alloc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64564,35 +61021,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_init_creds_opt_alloc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_init_creds_opt_alloc=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_alloc" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_init_creds_opt_alloc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_alloc" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_init_creds_opt_alloc" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_init_creds_opt_alloc = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64606,10 +61059,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_free" >&5
+-$as_echo_n "checking for krb5_get_init_creds_opt_free... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_free" >&5
++echo $ECHO_N "checking for krb5_get_init_creds_opt_free... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_init_creds_opt_free+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64662,35 +61115,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_init_creds_opt_free=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_init_creds_opt_free=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_free" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_init_creds_opt_free" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_free" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_init_creds_opt_free" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_init_creds_opt_free = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64704,10 +61153,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_get_error" >&5
+-$as_echo_n "checking for krb5_get_init_creds_opt_get_error... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_get_error" >&5
++echo $ECHO_N "checking for krb5_get_init_creds_opt_get_error... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_get_init_creds_opt_get_error+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64760,35 +61209,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_get_init_creds_opt_get_error=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_get_init_creds_opt_get_error=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_get_error" >&5
+-$as_echo "$ac_cv_func_ext_krb5_get_init_creds_opt_get_error" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_init_creds_opt_get_error" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_get_init_creds_opt_get_error" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_get_init_creds_opt_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64802,10 +61247,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_enctype_to_string" >&5
+-$as_echo_n "checking for krb5_enctype_to_string... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_enctype_to_string" >&5
++echo $ECHO_N "checking for krb5_enctype_to_string... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_enctype_to_string+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64858,35 +61303,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_enctype_to_string=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_enctype_to_string=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_enctype_to_string" >&5
+-$as_echo "$ac_cv_func_ext_krb5_enctype_to_string" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_enctype_to_string" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_enctype_to_string" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_enctype_to_string = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64900,10 +61341,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_fwd_tgt_creds" >&5
+-$as_echo_n "checking for krb5_fwd_tgt_creds... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_fwd_tgt_creds" >&5
++echo $ECHO_N "checking for krb5_fwd_tgt_creds... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_fwd_tgt_creds+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -64956,35 +61397,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_fwd_tgt_creds=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_fwd_tgt_creds=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_fwd_tgt_creds" >&5
+-$as_echo "$ac_cv_func_ext_krb5_fwd_tgt_creds" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_fwd_tgt_creds" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_fwd_tgt_creds" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_fwd_tgt_creds = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -64998,10 +61435,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_auth_con_set_req_cksumtype" >&5
+-$as_echo_n "checking for krb5_auth_con_set_req_cksumtype... " >&6; }
++        { echo "$as_me:$LINENO: checking for krb5_auth_con_set_req_cksumtype" >&5
++echo $ECHO_N "checking for krb5_auth_con_set_req_cksumtype... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_krb5_auth_con_set_req_cksumtype+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -65054,35 +61491,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_krb5_auth_con_set_req_cksumtype=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_krb5_auth_con_set_req_cksumtype=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_set_req_cksumtype" >&5
+-$as_echo "$ac_cv_func_ext_krb5_auth_con_set_req_cksumtype" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_auth_con_set_req_cksumtype" >&5
++echo "${ECHO_T}$ac_cv_func_ext_krb5_auth_con_set_req_cksumtype" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_krb5_auth_con_set_req_cksumtype = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -65094,10 +61527,10 @@
+ 
+   LIBS="$KRB5_LIBS $LIBS"
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether krb5_ticket contains kvno and enctype" >&5
+-$as_echo_n "checking whether krb5_ticket contains kvno and enctype... " >&6; }
++  { echo "$as_me:$LINENO: checking whether krb5_ticket contains kvno and enctype" >&5
++echo $ECHO_N "checking whether krb5_ticket contains kvno and enctype... $ECHO_C" >&6; }
+ if test "${smb_krb5_cv_ticket_has_keyinfo+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	    cat >conftest.$ac_ext <<_ACEOF
+@@ -65130,21 +61563,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+    smb_krb5_cv_ticket_has_keyinfo=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	 smb_krb5_cv_ticket_has_keyinfo=no
+@@ -65153,8 +61585,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_krb5_cv_ticket_has_keyinfo" >&5
+-$as_echo "$smb_krb5_cv_ticket_has_keyinfo" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_krb5_cv_ticket_has_keyinfo" >&5
++echo "${ECHO_T}$smb_krb5_cv_ticket_has_keyinfo" >&6; }
+ 
+   if test x"$smb_krb5_cv_ticket_has_keyinfo" = x"yes" ; then
+ 
+@@ -65164,10 +61596,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether krb5_get_init_creds_opt_free takes a context argument" >&5
+-$as_echo_n "checking whether krb5_get_init_creds_opt_free takes a context argument... " >&6; }
++  { echo "$as_me:$LINENO: checking whether krb5_get_init_creds_opt_free takes a context argument" >&5
++echo $ECHO_N "checking whether krb5_get_init_creds_opt_free takes a context argument... $ECHO_C" >&6; }
+ if test "${smb_krb5_cv_creds_opt_free_context+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -65196,21 +61628,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   smb_krb5_cv_creds_opt_free_context=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	smb_krb5_cv_creds_opt_free_context=no
+@@ -65220,8 +61651,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_krb5_cv_creds_opt_free_context" >&5
+-$as_echo "$smb_krb5_cv_creds_opt_free_context" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_krb5_cv_creds_opt_free_context" >&5
++echo "${ECHO_T}$smb_krb5_cv_creds_opt_free_context" >&6; }
+ 
+   if test x"$smb_krb5_cv_creds_opt_free_context" = x"yes" ; then
+ 
+@@ -65231,10 +61662,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether krb5_verify_checksum takes 7 arguments" >&5
+-$as_echo_n "checking whether krb5_verify_checksum takes 7 arguments... " >&6; }
++  { echo "$as_me:$LINENO: checking whether krb5_verify_checksum takes 7 arguments" >&5
++echo $ECHO_N "checking whether krb5_verify_checksum takes 7 arguments... $ECHO_C" >&6; }
+ if test "${smb_krb5_cv_verify_checksum+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65259,21 +61690,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   smb_krb5_cv_verify_checksum=7
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	smb_krb5_cv_verify_checksum=6
+@@ -65282,18 +61712,18 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_krb5_cv_verify_checksum" >&5
+-$as_echo "$smb_krb5_cv_verify_checksum" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_krb5_cv_verify_checksum" >&5
++echo "${ECHO_T}$smb_krb5_cv_verify_checksum" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KRB5_VERIFY_CHECKSUM_ARGS $smb_krb5_cv_verify_checksum
+ _ACEOF
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking for checksum in krb5_checksum" >&5
+-$as_echo_n "checking for checksum in krb5_checksum... " >&6; }
++  { echo "$as_me:$LINENO: checking for checksum in krb5_checksum" >&5
++echo $ECHO_N "checking for checksum in krb5_checksum... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65317,21 +61747,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM=no
+@@ -65339,8 +61768,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" >&5
+-$as_echo "$samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" >&5
++echo "${ECHO_T}$samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" >&6; }
+ 
+   if test x"$samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" = x"yes"; then
+ 
+@@ -65350,10 +61779,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for etype in EncryptedData" >&5
+-$as_echo_n "checking for etype in EncryptedData... " >&6; }
++  { echo "$as_me:$LINENO: checking for etype in EncryptedData" >&5
++echo $ECHO_N "checking for etype in EncryptedData... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65377,21 +61806,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA=no
+@@ -65399,8 +61827,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" >&5
+-$as_echo "$samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" >&5
++echo "${ECHO_T}$samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" >&6; }
+ 
+   if test x"$samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" = x"yes"; then
+ 
+@@ -65410,10 +61838,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for ticket pointer in krb5_ap_req" >&5
+-$as_echo_n "checking for ticket pointer in krb5_ap_req... " >&6; }
++  { echo "$as_me:$LINENO: checking for ticket pointer in krb5_ap_req" >&5
++echo $ECHO_N "checking for ticket pointer in krb5_ap_req... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65437,21 +61865,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ=no
+@@ -65459,8 +61886,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" >&5
+-$as_echo "$samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" >&5
++echo "${ECHO_T}$samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" >&6; }
+ 
+   if test x"$samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" = x"yes"; then
+ 
+@@ -65470,10 +61897,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for e_data pointer in krb5_error" >&5
+-$as_echo_n "checking for e_data pointer in krb5_error... " >&6; }
++  { echo "$as_me:$LINENO: checking for e_data pointer in krb5_error" >&5
++echo $ECHO_N "checking for e_data pointer in krb5_error... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65497,21 +61924,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR=no
+@@ -65519,8 +61945,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" >&5
+-$as_echo "$samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" >&5
++echo "${ECHO_T}$samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" >&6; }
+ 
+   if test x"$samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" = x"yes"; then
+ 
+@@ -65530,10 +61956,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_crypto type" >&5
+-$as_echo_n "checking for krb5_crypto type... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_crypto type" >&5
++echo $ECHO_N "checking for krb5_crypto type... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_CRYPTO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65557,21 +61983,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_CRYPTO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_CRYPTO=no
+@@ -65579,8 +62004,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_CRYPTO" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_CRYPTO" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_CRYPTO" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_CRYPTO" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_CRYPTO" = x"yes"; then
+ 
+@@ -65590,10 +62015,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_encrypt_block type" >&5
+-$as_echo_n "checking for krb5_encrypt_block type... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_encrypt_block type" >&5
++echo $ECHO_N "checking for krb5_encrypt_block type... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_ENCRYPT_BLOCK+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65617,21 +62042,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no
+@@ -65639,8 +62063,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then
+ 
+@@ -65650,10 +62074,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for addrtype in krb5_address" >&5
+-$as_echo_n "checking for addrtype in krb5_address... " >&6; }
++  { echo "$as_me:$LINENO: checking for addrtype in krb5_address" >&5
++echo $ECHO_N "checking for addrtype in krb5_address... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65677,21 +62101,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=no
+@@ -65699,8 +62122,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" >&5
+-$as_echo "$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" >&6; }
+ 
+   if test x"$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" = x"yes"; then
+ 
+@@ -65710,10 +62133,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for addr_type in krb5_address" >&5
+-$as_echo_n "checking for addr_type in krb5_address... " >&6; }
++  { echo "$as_me:$LINENO: checking for addr_type in krb5_address" >&5
++echo $ECHO_N "checking for addr_type in krb5_address... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65737,21 +62160,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=no
+@@ -65759,8 +62181,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" >&5
+-$as_echo "$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" >&6; }
+ 
+   if test x"$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" = x"yes"; then
+ 
+@@ -65770,10 +62192,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for enc_part2 in krb5_ticket" >&5
+-$as_echo_n "checking for enc_part2 in krb5_ticket... " >&6; }
++  { echo "$as_me:$LINENO: checking for enc_part2 in krb5_ticket" >&5
++echo $ECHO_N "checking for enc_part2 in krb5_ticket... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_TKT_ENC_PART2+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -65796,21 +62218,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_TKT_ENC_PART2=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_TKT_ENC_PART2=no
+@@ -65818,8 +62239,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_TKT_ENC_PART2" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_TKT_ENC_PART2" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_TKT_ENC_PART2" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_TKT_ENC_PART2" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_TKT_ENC_PART2" = x"yes"; then
+ 
+@@ -65829,10 +62250,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for keyblock in krb5_creds" >&5
+-$as_echo_n "checking for keyblock in krb5_creds... " >&6; }
++  { echo "$as_me:$LINENO: checking for keyblock in krb5_creds" >&5
++echo $ECHO_N "checking for keyblock in krb5_creds... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65856,21 +62277,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no
+@@ -65878,8 +62298,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then
+ 
+@@ -65889,10 +62309,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for session in krb5_creds" >&5
+-$as_echo_n "checking for session in krb5_creds... " >&6; }
++  { echo "$as_me:$LINENO: checking for session in krb5_creds" >&5
++echo $ECHO_N "checking for session in krb5_creds... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_SESSION_IN_CREDS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65916,21 +62336,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_SESSION_IN_CREDS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no
+@@ -65938,8 +62357,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_SESSION_IN_CREDS" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_SESSION_IN_CREDS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then
+ 
+@@ -65949,10 +62368,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for keyvalue in krb5_keyblock" >&5
+-$as_echo_n "checking for keyvalue in krb5_keyblock... " >&6; }
++  { echo "$as_me:$LINENO: checking for keyvalue in krb5_keyblock" >&5
++echo $ECHO_N "checking for keyvalue in krb5_keyblock... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -65976,21 +62395,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no
+@@ -65998,8 +62416,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then
+ 
+@@ -66009,10 +62427,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for ENCTYPE_ARCFOUR_HMAC_MD5" >&5
+-$as_echo_n "checking for ENCTYPE_ARCFOUR_HMAC_MD5... " >&6; }
++  { echo "$as_me:$LINENO: checking for ENCTYPE_ARCFOUR_HMAC_MD5" >&5
++echo $ECHO_N "checking for ENCTYPE_ARCFOUR_HMAC_MD5... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66036,21 +62454,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no
+@@ -66058,12 +62475,12 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" >&5
+-$as_echo "$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" >&6; }
+-  { $as_echo "$as_me:$LINENO: checking for KEYTYPE_ARCFOUR_56" >&5
+-$as_echo_n "checking for KEYTYPE_ARCFOUR_56... " >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" >&5
++echo "${ECHO_T}$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" >&6; }
++  { echo "$as_me:$LINENO: checking for KEYTYPE_ARCFOUR_56" >&5
++echo $ECHO_N "checking for KEYTYPE_ARCFOUR_56... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KEYTYPE_ARCFOUR_56+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66087,21 +62504,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KEYTYPE_ARCFOUR_56=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KEYTYPE_ARCFOUR_56=no
+@@ -66109,8 +62525,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KEYTYPE_ARCFOUR_56" >&5
+-$as_echo "$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KEYTYPE_ARCFOUR_56" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" >&6; }
+ # Heimdals with KEYTYPE_ARCFOUR but not KEYTYPE_ARCFOUR_56 are broken
+ # w.r.t. arcfour and windows, so we must not enable it here
+   if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes" -a\
+@@ -66122,10 +62538,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for AP_OPTS_USE_SUBKEY" >&5
+-$as_echo_n "checking for AP_OPTS_USE_SUBKEY... " >&6; }
++  { echo "$as_me:$LINENO: checking for AP_OPTS_USE_SUBKEY" >&5
++echo $ECHO_N "checking for AP_OPTS_USE_SUBKEY... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_AP_OPTS_USE_SUBKEY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66149,21 +62565,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_AP_OPTS_USE_SUBKEY=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_AP_OPTS_USE_SUBKEY=no
+@@ -66171,8 +62586,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_AP_OPTS_USE_SUBKEY" >&5
+-$as_echo "$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_AP_OPTS_USE_SUBKEY" >&5
++echo "${ECHO_T}$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" >&6; }
+ 
+   if test x"$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" = x"yes"; then
+ 
+@@ -66182,10 +62597,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for KV5M_KEYTAB" >&5
+-$as_echo_n "checking for KV5M_KEYTAB... " >&6; }
++  { echo "$as_me:$LINENO: checking for KV5M_KEYTAB" >&5
++echo $ECHO_N "checking for KV5M_KEYTAB... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KV5M_KEYTAB+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66209,21 +62624,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KV5M_KEYTAB=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KV5M_KEYTAB=no
+@@ -66231,8 +62645,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KV5M_KEYTAB" >&5
+-$as_echo "$samba_cv_HAVE_KV5M_KEYTAB" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KV5M_KEYTAB" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KV5M_KEYTAB" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KV5M_KEYTAB" = x"yes"; then
+ 
+@@ -66242,10 +62656,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for KRB5_KU_OTHER_CKSUM" >&5
+-$as_echo_n "checking for KRB5_KU_OTHER_CKSUM... " >&6; }
++  { echo "$as_me:$LINENO: checking for KRB5_KU_OTHER_CKSUM" >&5
++echo $ECHO_N "checking for KRB5_KU_OTHER_CKSUM... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KU_OTHER_CKSUM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66269,21 +62683,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=no
+@@ -66291,8 +62704,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" = x"yes"; then
+ 
+@@ -66302,10 +62715,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for KRB5_KEYUSAGE_APP_DATA_CKSUM" >&5
+-$as_echo_n "checking for KRB5_KEYUSAGE_APP_DATA_CKSUM... " >&6; }
++  { echo "$as_me:$LINENO: checking for KRB5_KEYUSAGE_APP_DATA_CKSUM" >&5
++echo $ECHO_N "checking for KRB5_KEYUSAGE_APP_DATA_CKSUM... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66329,21 +62742,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM=no
+@@ -66351,8 +62763,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" = x"yes"; then
+ 
+@@ -66362,10 +62774,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for the krb5_princ_component macro" >&5
+-$as_echo_n "checking for the krb5_princ_component macro... " >&6; }
++  { echo "$as_me:$LINENO: checking for the krb5_princ_component macro" >&5
++echo $ECHO_N "checking for the krb5_princ_component macro... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_PRINC_COMPONENT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66389,35 +62801,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_KRB5_PRINC_COMPONENT=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_PRINC_COMPONENT=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINC_COMPONENT" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_PRINC_COMPONENT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINC_COMPONENT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_PRINC_COMPONENT" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_PRINC_COMPONENT" = x"yes"; then
+ 
+@@ -66427,10 +62835,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for key in krb5_keytab_entry" >&5
+-$as_echo_n "checking for key in krb5_keytab_entry... " >&6; }
++  { echo "$as_me:$LINENO: checking for key in krb5_keytab_entry" >&5
++echo $ECHO_N "checking for key in krb5_keytab_entry... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66454,21 +62862,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no
+@@ -66476,8 +62883,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" = x"yes"; then
+ 
+@@ -66487,10 +62894,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for keyblock in krb5_keytab_entry" >&5
+-$as_echo_n "checking for keyblock in krb5_keytab_entry... " >&6; }
++  { echo "$as_me:$LINENO: checking for keyblock in krb5_keytab_entry" >&5
++echo $ECHO_N "checking for keyblock in krb5_keytab_entry... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66514,21 +62921,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=no
+@@ -66536,8 +62942,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" = x"yes"; then
+ 
+@@ -66547,10 +62953,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for magic in krb5_address" >&5
+-$as_echo_n "checking for magic in krb5_address... " >&6; }
++  { echo "$as_me:$LINENO: checking for magic in krb5_address" >&5
++echo $ECHO_N "checking for magic in krb5_address... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66574,21 +62980,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS=no
+@@ -66596,8 +63001,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" >&5
+-$as_echo "$samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" >&6; }
+ 
+   if test x"$samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" = x"yes"; then
+ 
+@@ -66607,20 +63012,18 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for WRFILE: keytab support" >&5
+-$as_echo_n "checking for WRFILE: keytab support... " >&6; }
++  { echo "$as_me:$LINENO: checking for WRFILE: keytab support" >&5
++echo $ECHO_N "checking for WRFILE: keytab support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_WRFILE_KEYTAB+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -66645,39 +63048,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_WRFILE_KEYTAB=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_WRFILE_KEYTAB=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
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_WRFILE_KEYTAB" >&5
+-$as_echo "$samba_cv_HAVE_WRFILE_KEYTAB" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_WRFILE_KEYTAB" >&5
++echo "${ECHO_T}$samba_cv_HAVE_WRFILE_KEYTAB" >&6; }
+ 
+   if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then
+ 
+@@ -66687,10 +63087,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
+-$as_echo_n "checking for krb5_princ_realm returns krb5_realm or krb5_data... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
++echo $ECHO_N "checking for krb5_princ_realm returns krb5_realm or krb5_data... $ECHO_C" >&6; }
+ if test "${samba_cv_KRB5_PRINC_REALM_RETURNS_REALM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66717,21 +63117,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=no
+@@ -66739,8 +63138,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" >&5
+-$as_echo "$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" >&5
++echo "${ECHO_T}$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" >&6; }
+ 
+   if test x"$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" = x"yes"; then
+ 
+@@ -66750,10 +63149,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_addresses type" >&5
+-$as_echo_n "checking for krb5_addresses type... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_addresses type" >&5
++echo $ECHO_N "checking for krb5_addresses type... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_ADDRESSES+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66777,21 +63176,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_KRB5_ADDRESSES=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_ADDRESSES=no
+@@ -66799,8 +63197,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_ADDRESSES" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_ADDRESSES" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_ADDRESSES" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_ADDRESSES" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_ADDRESSES" = x"yes"; then
+ 
+@@ -66810,10 +63208,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal" >&5
+-$as_echo_n "checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal... " >&6; }
++  { echo "$as_me:$LINENO: checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal" >&5
++echo $ECHO_N "checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -66838,21 +63236,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE=no
+@@ -66860,8 +63257,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" >&5
+-$as_echo "$samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" >&6; }
+ 
+   if test x"$samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" = x"yes"; then
+ 
+@@ -66872,10 +63269,10 @@
+   fi
+ 
+   if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
+-    { $as_echo "$as_me:$LINENO: checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)" >&5
+-$as_echo_n "checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)... " >&6; }
++    { echo "$as_me:$LINENO: checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)" >&5
++echo $ECHO_N "checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)... $ECHO_C" >&6; }
+ if test "${smb_krb5_cv_enctype_to_string_takes_krb5_context_arg+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -66889,13 +63286,11 @@
+ 	LDFLAGS="$LDFLAGS";
+ 	export LDFLAGS;
+ 	if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -66921,32 +63316,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=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
+ 
+@@ -66962,8 +63354,8 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" >&5
+-$as_echo "$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" >&5
++echo "${ECHO_T}$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" >&6; }
+ 
+     if test x"$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" = x"yes"; then
+ 
+@@ -66973,10 +63365,10 @@
+ 
+     fi
+ 
+-    { $as_echo "$as_me:$LINENO: checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)" >&5
+-$as_echo_n "checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)... " >&6; }
++    { echo "$as_me:$LINENO: checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)" >&5
++echo $ECHO_N "checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)... $ECHO_C" >&6; }
+ if test "${smb_krb5_cv_enctype_to_string_takes_size_t_arg+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -66990,13 +63382,11 @@
+ 	LDFLAGS="$LDFLAGS";
+ 	export LDFLAGS;
+ 	if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
++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.  */
+@@ -67019,32 +63409,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ smb_krb5_cv_enctype_to_string_takes_size_t_arg=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
+ 
+@@ -67060,8 +63447,8 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_krb5_cv_enctype_to_string_takes_size_t_arg" >&5
+-$as_echo "$smb_krb5_cv_enctype_to_string_takes_size_t_arg" >&6; }
++{ echo "$as_me:$LINENO: result: $smb_krb5_cv_enctype_to_string_takes_size_t_arg" >&5
++echo "${ECHO_T}$smb_krb5_cv_enctype_to_string_takes_size_t_arg" >&6; }
+ 
+     if test x"$smb_krb5_cv_enctype_to_string_takes_size_t_arg" = x"yes"; then
+ 
+@@ -67072,10 +63459,10 @@
+     fi
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_principal_get_realm" >&5
+-$as_echo_n "checking for krb5_principal_get_realm... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_principal_get_realm" >&5
++echo $ECHO_N "checking for krb5_principal_get_realm... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -67099,35 +63486,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" = x"yes"; then
+ 
+@@ -67137,10 +63520,10 @@
+ 
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for krb5_princ_realm" >&5
+-$as_echo_n "checking for krb5_princ_realm... " >&6; }
++  { echo "$as_me:$LINENO: checking for krb5_princ_realm" >&5
++echo $ECHO_N "checking for krb5_princ_realm... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_KRB5_PRINC_REALM+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -67164,35 +63547,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_KRB5_PRINC_REALM=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_KRB5_PRINC_REALM=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINC_REALM" >&5
+-$as_echo "$samba_cv_HAVE_KRB5_PRINC_REALM" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_PRINC_REALM" >&5
++echo "${ECHO_T}$samba_cv_HAVE_KRB5_PRINC_REALM" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_PRINC_REALM" = x"yes"; then
+ 
+@@ -67210,40 +63589,40 @@
+   #
+   #
+   if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
+-    { $as_echo "$as_me:$LINENO: WARNING: krb5_mk_req_extended not found in -lkrb5" >&5
+-$as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
++    { echo "$as_me:$LINENO: WARNING: krb5_mk_req_extended not found in -lkrb5" >&5
++echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
+     use_ads=no
+   fi
+ 
+   if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \
+           x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes"
+   then
+-    { $as_echo "$as_me:$LINENO: WARNING: no CREATE_KEY_FUNCTIONS detected" >&5
+-$as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
++    { echo "$as_me:$LINENO: WARNING: no CREATE_KEY_FUNCTIONS detected" >&5
++echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
+     use_ads=no
+   fi
+ 
+   if test x"$ac_cv_func_ext_krb5_get_permitted_enctypes" != x"yes" -a \
+           x"$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" != x"yes"
+   then
+-    { $as_echo "$as_me:$LINENO: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&5
+-$as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
++    { echo "$as_me:$LINENO: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&5
++echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
+     use_ads=no
+   fi
+ 
+   if test x"$ac_cv_func_ext_krb5_kt_free_entry" != x"yes" -a \
+           x"$ac_cv_func_ext_krb5_free_keytab_entry_contents" != x"yes"
+   then
+-    { $as_echo "$as_me:$LINENO: WARNING: no KT_FREE_FUNCTION detected" >&5
+-$as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
++    { echo "$as_me:$LINENO: WARNING: no KT_FREE_FUNCTION detected" >&5
++echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
+     use_ads=no
+   fi
+ 
+   if test x"$ac_cv_func_ext_krb5_c_verify_checksum" != x"yes" -a \
+           x"$ac_cv_func_ext_krb5_verify_checksum" != x"yes"
+   then
+-    { $as_echo "$as_me:$LINENO: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&5
+-$as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
++    { echo "$as_me:$LINENO: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&5
++echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
+     use_ads=no
+   fi
+ 
+@@ -67254,15 +63633,15 @@
+ 
+       if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
+       then
+-	{ $as_echo "$as_me:$LINENO: WARNING: no KRB5_AP_REQ_FREE_FUNCTION detected" >&5
+-$as_echo "$as_me: WARNING: no KRB5_AP_REQ_FREE_FUNCTION detected" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: no KRB5_AP_REQ_FREE_FUNCTION detected" >&5
++echo "$as_me: WARNING: no KRB5_AP_REQ_FREE_FUNCTION detected" >&2;}
+ 	use_ads=no
+       fi
+ 
+       if test x"$ac_cv_func_ext_krb5_decode_ap_req" != x"yes"
+       then
+-	{ $as_echo "$as_me:$LINENO: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&5
+-$as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&5
++echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
+ 	use_ads=no
+       fi
+ 
+@@ -67288,12 +63667,12 @@
+     fi
+   else
+     if test x"$with_ads_support" = x"yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: krb5 libs don't have all features required for Active Directory support" >&5
+-$as_echo "$as_me: error: krb5 libs don't have all features required for Active Directory support" >&2;}
++	{ { echo "$as_me:$LINENO: error: krb5 libs don't have all features required for Active Directory support" >&5
++echo "$as_me: error: krb5 libs don't have all features required for Active Directory support" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+-	{ $as_echo "$as_me:$LINENO: WARNING: krb5 libs don't have all features required for Active Directory support" >&5
+-$as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: krb5 libs don't have all features required for Active Directory support" >&5
++echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
+     fi
+ 
+ grep -v '#define HAVE_KRB5_H ' confdefs.h |grep -v '#define HAVE_KRB5_H$'>confdefs.h.tmp
+@@ -67318,10 +63697,10 @@
+     KRB5_LIBS=""
+     with_ads_support=no
+   fi
+-  { $as_echo "$as_me:$LINENO: checking whether Active Directory and krb5 support is used" >&5
+-$as_echo_n "checking whether Active Directory and krb5 support is used... " >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $use_ads" >&5
+-$as_echo "$use_ads" >&6; }
++  { echo "$as_me:$LINENO: checking whether Active Directory and krb5 support is used" >&5
++echo $ECHO_N "checking whether Active Directory and krb5 support is used... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: $use_ads" >&5
++echo "${ECHO_T}$use_ads" >&6; }
+ 
+ LIBS="$ac_save_LIBS"
+ fi
+@@ -67335,10 +63714,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for nscd_flush_cache in -lnscd" >&5
+-$as_echo_n "checking for nscd_flush_cache in -lnscd... " >&6; }
++        { echo "$as_me:$LINENO: checking for nscd_flush_cache in -lnscd" >&5
++echo $ECHO_N "checking for nscd_flush_cache in -lnscd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_nscd_nscd_flush_cache+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -67368,38 +63747,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_nscd_nscd_flush_cache=yes;
+ 		  ac_cv_lib_ext_nscd=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_nscd_nscd_flush_cache=no;
+ 		  ac_cv_lib_ext_nscd=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nscd_nscd_flush_cache" >&5
+-$as_echo "$ac_cv_lib_ext_nscd_nscd_flush_cache" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_nscd_nscd_flush_cache" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_nscd_nscd_flush_cache" >&6; }
+     if test $ac_cv_lib_ext_nscd_nscd_flush_cache = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NSCD_FLUSH_CACHE 1
+@@ -67432,8 +63807,8 @@
+ # Compile with DNS Updates support?
+ 
+ with_dnsupdate_support=no
+-{ $as_echo "$as_me:$LINENO: checking whether to enable DNS Updates support" >&5
+-$as_echo_n "checking whether to enable DNS Updates support... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to enable DNS Updates support" >&5
++echo $ECHO_N "checking whether to enable DNS Updates support... $ECHO_C" >&6; }
+ 
+ 
+ # Check whether --with-dnsupdate was given.
+@@ -67446,8 +63821,8 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_dnsupdate_support" >&5
+-$as_echo "$with_dnsupdate_support" >&6; }
++{ echo "$as_me:$LINENO: result: $with_dnsupdate_support" >&5
++echo "${ECHO_T}$with_dnsupdate_support" >&6; }
+ 
+ if test x"$with_dnsupdate_support" != x"no"; then
+ 
+@@ -67463,21 +63838,20 @@
+ 
+ for ac_header in uuid/uuid.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -67493,33 +63867,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -67533,52 +63906,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -67587,24 +63959,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -67614,12 +63983,12 @@
+ 
+   if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
+ 	if test x"$with_dnsupdate_support" = x"yes"; then
+-	 { { $as_echo "$as_me:$LINENO: error: uuid.h is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: error: uuid.h is needed to enable DNS Updates support" >&2;}
++	 { { echo "$as_me:$LINENO: error: uuid.h is needed to enable DNS Updates support" >&5
++echo "$as_me: error: uuid.h is needed to enable DNS Updates support" >&2;}
+    { (exit 1); exit 1; }; }
+ 	else
+-	 { $as_echo "$as_me:$LINENO: WARNING: uuid.h is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
++	 { echo "$as_me:$LINENO: WARNING: uuid.h is needed to enable DNS Updates support" >&5
++echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
+ 	fi
+ 	with_dnsupdate_support=no
+   fi
+@@ -67637,11 +64006,11 @@
+ 
+ for ac_func in uuid_generate
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -67694,42 +64063,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+         # uuid_generate was found in libc or existing $LIBS
+@@ -67761,12 +64123,12 @@
+ 
+ 
+ 	    if test x"$with_dnsupdate_support" = x"yes"; then
+-		{ { $as_echo "$as_me:$LINENO: error: libuuid is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: error: libuuid is needed to enable DNS Updates support" >&2;}
++		{ { echo "$as_me:$LINENO: error: libuuid is needed to enable DNS Updates support" >&5
++echo "$as_me: error: libuuid is needed to enable DNS Updates support" >&2;}
+    { (exit 1); exit 1; }; }
+ 	    else
+-		{ $as_echo "$as_me:$LINENO: WARNING: libuuid is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
++		{ echo "$as_me:$LINENO: WARNING: libuuid is needed to enable DNS Updates support" >&5
++echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
+ 	    fi
+ 	    with_dnsupdate_support=no
+ 
+@@ -67774,10 +64136,10 @@
+ 	    ;;
+           *)
+ 	    # uuid_generate was not found, try adding libuuid
+-	    { $as_echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
+-$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
++	    { echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
++echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-luuid  $LIBS"
+@@ -67809,37 +64171,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_uuid_uuid_generate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_uuid_uuid_generate=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
+-$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
++echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
++if test $ac_cv_lib_uuid_uuid_generate = yes; then
+ 
+ 		LIBS="-luuid $LIBS"
+ 
+@@ -67867,12 +64225,12 @@
+ 
+ 
+ 	    if test x"$with_dnsupdate_support" = x"yes"; then
+-		{ { $as_echo "$as_me:$LINENO: error: libuuid is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: error: libuuid is needed to enable DNS Updates support" >&2;}
++		{ { echo "$as_me:$LINENO: error: libuuid is needed to enable DNS Updates support" >&5
++echo "$as_me: error: libuuid is needed to enable DNS Updates support" >&2;}
+    { (exit 1); exit 1; }; }
+ 	    else
+-		{ $as_echo "$as_me:$LINENO: WARNING: libuuid is needed to enable DNS Updates support" >&5
+-$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
++		{ echo "$as_me:$LINENO: WARNING: libuuid is needed to enable DNS Updates support" >&5
++echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
+ 	    fi
+ 	    with_dnsupdate_support=no
+ 
+@@ -67891,15 +64249,15 @@
+ 
+ #################################################
+ # check for automount support
+-{ $as_echo "$as_me:$LINENO: checking whether to use automount" >&5
+-$as_echo_n "checking whether to use automount... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use automount" >&5
++echo $ECHO_N "checking whether to use automount... $ECHO_C" >&6; }
+ 
+ # Check whether --with-automount was given.
+ if test "${with_automount+set}" = set; then
+   withval=$with_automount;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_AUTOMOUNT 1
+@@ -67907,13 +64265,13 @@
+ 
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -67923,21 +64281,21 @@
+ CIFSMOUNT_PROGS=""
+ INSTALL_CIFSMOUNT=""
+ UNINSTALL_CIFSMOUNT=""
+-{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs and umount.cifs" >&5
+-$as_echo_n "checking whether to build mount.cifs and umount.cifs... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build mount.cifs and umount.cifs" >&5
++echo $ECHO_N "checking whether to build mount.cifs and umount.cifs... $ECHO_C" >&6; }
+ 
+ # Check whether --with-cifsmount was given.
+ if test "${with_cifsmount+set}" = set; then
+   withval=$with_cifsmount;  case "$withval" in
+   no)
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	;;
+   *)
+ 	case "$host_os" in
+ 	*linux*)
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_CIFSMOUNT 1
+@@ -67948,8 +64306,8 @@
+ 		UNINSTALL_CIFSMOUNT="uninstallcifsmount"
+ 		;;
+ 	*)
+-		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
+-$as_echo "$as_me: error: not on a linux system!" >&2;}
++		{ { echo "$as_me:$LINENO: error: not on a linux system!" >&5
++echo "$as_me: error: not on a linux system!" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+@@ -67958,8 +64316,8 @@
+ else
+    case "$host_os" in
+   *linux*)
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_CIFSMOUNT 1
+@@ -67970,8 +64328,8 @@
+ 	UNINSTALL_CIFSMOUNT="uninstallcifsmount"
+ 	;;
+   *)
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	;;
+   esac
+ 
+@@ -67983,21 +64341,20 @@
+ 
+ for ac_header in keyutils.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68013,33 +64370,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68053,52 +64409,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -68107,24 +64462,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+  HAVE_KEYUTILS_H=1
+ else
+@@ -68136,30 +64488,30 @@
+ CIFSUPCALL_PROGS=""
+ INSTALL_CIFSUPCALL=""
+ UNINSTALL_CIFSUPCALL=""
+-{ $as_echo "$as_me:$LINENO: checking whether to build cifs.upcall" >&5
+-$as_echo_n "checking whether to build cifs.upcall... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build cifs.upcall" >&5
++echo $ECHO_N "checking whether to build cifs.upcall... $ECHO_C" >&6; }
+ 
+ # Check whether --with-cifsupcall was given.
+ if test "${with_cifsupcall+set}" = set; then
+   withval=$with_cifsupcall;  case "$withval" in
+   no)
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	;;
+   *)
+ 	case "$host_os" in
+ 	*linux*)
+ 		if test x"$use_ads" != x"yes"; then
+-			{ { $as_echo "$as_me:$LINENO: error: ADS support should be enabled for building cifs.upcall" >&5
+-$as_echo "$as_me: error: ADS support should be enabled for building cifs.upcall" >&2;}
++			{ { echo "$as_me:$LINENO: error: ADS support should be enabled for building cifs.upcall" >&5
++echo "$as_me: error: ADS support should be enabled for building cifs.upcall" >&2;}
+    { (exit 1); exit 1; }; }
+ 		elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+-			{ { $as_echo "$as_me:$LINENO: error: keyutils package is required for cifs.upcall" >&5
+-$as_echo "$as_me: error: keyutils package is required for cifs.upcall" >&2;}
++			{ { echo "$as_me:$LINENO: error: keyutils package is required for cifs.upcall" >&5
++echo "$as_me: error: keyutils package is required for cifs.upcall" >&2;}
+    { (exit 1); exit 1; }; }
+ 		else
+-			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++			{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_CIFSUPCALL 1
+@@ -68171,8 +64523,8 @@
+ 		fi
+ 		;;
+ 	*)
+-		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
+-$as_echo "$as_me: error: not on a linux system!" >&2;}
++		{ { echo "$as_me:$LINENO: error: not on a linux system!" >&5
++echo "$as_me: error: not on a linux system!" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+@@ -68182,14 +64534,14 @@
+    case "$host_os" in
+   *linux*)
+ 	if test x"$use_ads" != x"yes"; then
+-		{ $as_echo "$as_me:$LINENO: WARNING: ADS support should be enabled for building cifs.upcall" >&5
+-$as_echo "$as_me: WARNING: ADS support should be enabled for building cifs.upcall" >&2;}
++		{ echo "$as_me:$LINENO: WARNING: ADS support should be enabled for building cifs.upcall" >&5
++echo "$as_me: WARNING: ADS support should be enabled for building cifs.upcall" >&2;}
+ 	elif test x"$HAVE_KEYUTILS_H" != "x1"; then
+-		{ $as_echo "$as_me:$LINENO: WARNING: keyutils package is required for cifs.upcall" >&5
+-$as_echo "$as_me: WARNING: keyutils package is required for cifs.upcall" >&2;}
++		{ echo "$as_me:$LINENO: WARNING: keyutils package is required for cifs.upcall" >&5
++echo "$as_me: WARNING: keyutils package is required for cifs.upcall" >&2;}
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_CIFSUPCALL 1
+@@ -68201,8 +64553,8 @@
+ 	fi
+ 	;;
+   *)
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	;;
+   esac
+ 
+@@ -68218,8 +64570,8 @@
+ 
+ with_pam_for_crypt=no
+ try_pam=no
+-{ $as_echo "$as_me:$LINENO: checking whether to try PAM support" >&5
+-$as_echo_n "checking whether to try PAM support... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to try PAM support" >&5
++echo $ECHO_N "checking whether to try PAM support... $ECHO_C" >&6; }
+ 
+ # Check whether --with-pam was given.
+ if test "${with_pam+set}" = set; then
+@@ -68231,8 +64583,8 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $try_pam" >&5
+-$as_echo "$try_pam" >&6; }
++{ echo "$as_me:$LINENO: result: $try_pam" >&5
++echo "${ECHO_T}$try_pam" >&6; }
+ 
+ use_pam=no
+ create_pam_modules=no
+@@ -68246,21 +64598,20 @@
+ 
+ for ac_header in security/pam_appl.h pam/pam_appl.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68276,33 +64627,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68316,52 +64666,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -68370,24 +64719,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -68397,8 +64743,8 @@
+ 	if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \
+ 		x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then
+ 		if test x"${try_pam}" = x"yes";then
+-			{ { $as_echo "$as_me:$LINENO: error: --with-pam=yes but pam_appl.h not found" >&5
+-$as_echo "$as_me: error: --with-pam=yes but pam_appl.h not found" >&2;}
++			{ { echo "$as_me:$LINENO: error: --with-pam=yes but pam_appl.h not found" >&5
++echo "$as_me: error: --with-pam=yes but pam_appl.h not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		use_pam=no
+@@ -68414,10 +64760,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for pam_get_data in -lpam" >&5
+-$as_echo_n "checking for pam_get_data in -lpam... " >&6; }
++        { echo "$as_me:$LINENO: checking for pam_get_data in -lpam" >&5
++echo $ECHO_N "checking for pam_get_data in -lpam... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_pam_pam_get_data+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -68447,38 +64793,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_pam_pam_get_data=yes;
+ 		  ac_cv_lib_ext_pam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_pam_pam_get_data=no;
+ 		  ac_cv_lib_ext_pam=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_pam_pam_get_data" >&5
+-$as_echo "$ac_cv_lib_ext_pam_pam_get_data" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_pam_pam_get_data" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_pam_pam_get_data" >&6; }
+     if test $ac_cv_lib_ext_pam_pam_get_data = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PAM_GET_DATA 1
+@@ -68506,8 +64848,8 @@
+ 
+ 	if test x"$ac_cv_lib_ext_pam_pam_get_data" != x"yes"; then
+ 		if test x"${try_pam}" = x"yes";then
+-			{ { $as_echo "$as_me:$LINENO: error: --with-pam=yes but libpam not found" >&5
+-$as_echo "$as_me: error: --with-pam=yes but libpam not found" >&2;}
++			{ { echo "$as_me:$LINENO: error: --with-pam=yes but libpam not found" >&5
++echo "$as_me: error: --with-pam=yes but libpam not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		use_pam=no
+@@ -68518,11 +64860,11 @@
+ 
+ for ac_header in security/pam_modules.h pam/pam_modules.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -68547,21 +64889,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Header=no"
+@@ -68569,15 +64910,12 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -68587,8 +64925,8 @@
+ 	if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \
+ 		x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
+ 		if test x"${try_pam}" = x"yes";then
+-			{ { $as_echo "$as_me:$LINENO: error: --with-pam=yes but pam_modules.h not found" >&5
+-$as_echo "$as_me: error: --with-pam=yes but pam_modules.h not found" >&2;}
++			{ { echo "$as_me:$LINENO: error: --with-pam=yes but pam_modules.h not found" >&5
++echo "$as_me: error: --with-pam=yes but pam_modules.h not found" >&2;}
+    { (exit 1); exit 1; }; }
+        fi
+ 		create_pam_modules=no
+@@ -68620,21 +64958,20 @@
+ 
+ for ac_header in security/pam_ext.h security/_pam_macros.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68650,33 +64987,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68690,52 +65026,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -68744,24 +65079,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -68772,21 +65104,20 @@
+ 
+ for ac_header in pam/pam_ext.h pam/_pam_macros.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68802,33 +65133,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -68842,52 +65172,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -68896,24 +65225,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -68925,10 +65251,10 @@
+ 
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$PAM_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for pam_vsyslog" >&5
+-$as_echo_n "checking for pam_vsyslog... " >&6; }
++        { echo "$as_me:$LINENO: checking for pam_vsyslog" >&5
++echo $ECHO_N "checking for pam_vsyslog... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ext_pam_vsyslog+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -68981,35 +65307,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_ext_pam_vsyslog=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_ext_pam_vsyslog=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_pam_vsyslog" >&5
+-$as_echo "$ac_cv_func_ext_pam_vsyslog" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ext_pam_vsyslog" >&5
++echo "${ECHO_T}$ac_cv_func_ext_pam_vsyslog" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+     if test $ac_cv_func_ext_pam_vsyslog = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -69019,19 +65341,19 @@
+ fi
+ 
+ 		else
+-			{ $as_echo "$as_me:$LINENO: WARNING: PAM support detected but PAM MODULES support is missing" >&5
+-$as_echo "$as_me: WARNING: PAM support detected but PAM MODULES support is missing" >&2;}
++			{ echo "$as_me:$LINENO: WARNING: PAM support detected but PAM MODULES support is missing" >&5
++echo "$as_me: WARNING: PAM support detected but PAM MODULES support is missing" >&2;}
+ 		fi
+ 	fi
+-	{ $as_echo "$as_me:$LINENO: checking whether to use PAM support" >&5
+-$as_echo_n "checking whether to use PAM support... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: $use_pam" >&5
+-$as_echo "$use_pam" >&6; }
+-
+-	{ $as_echo "$as_me:$LINENO: checking whether to have PAM MODULES support" >&5
+-$as_echo_n "checking whether to have PAM MODULES support... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: $create_pam_modules" >&5
+-$as_echo "$create_pam_modules" >&6; }
++	{ echo "$as_me:$LINENO: checking whether to use PAM support" >&5
++echo $ECHO_N "checking whether to use PAM support... $ECHO_C" >&6; }
++	{ echo "$as_me:$LINENO: result: $use_pam" >&5
++echo "${ECHO_T}$use_pam" >&6; }
++
++	{ echo "$as_me:$LINENO: checking whether to have PAM MODULES support" >&5
++echo $ECHO_N "checking whether to have PAM MODULES support... $ECHO_C" >&6; }
++	{ echo "$as_me:$LINENO: result: $create_pam_modules" >&5
++echo "${ECHO_T}$create_pam_modules" >&6; }
+ fi # try_pam != no
+ 
+ #################################################
+@@ -69039,25 +65361,25 @@
+ PAM_MODULES=""
+ INSTALL_PAM_MODULES=""
+ UNINSTALL_PAM_MODULES=""
+-{ $as_echo "$as_me:$LINENO: checking whether to use pam_smbpass" >&5
+-$as_echo_n "checking whether to use pam_smbpass... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use pam_smbpass" >&5
++echo $ECHO_N "checking whether to use pam_smbpass... $ECHO_C" >&6; }
+ 
+ # Check whether --with-pam_smbpass was given.
+ if test "${with_pam_smbpass+set}" = set; then
+   withval=$with_pam_smbpass;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+        # Conditions under which pam_smbpass should not be built.
+ 
+        if test x"$BLDSHARED" != x"true"; then
+-          { { $as_echo "$as_me:$LINENO: error: No support for shared modules" >&5
+-$as_echo "$as_me: error: No support for shared modules" >&2;}
++          { { echo "$as_me:$LINENO: error: No support for shared modules" >&5
++echo "$as_me: error: No support for shared modules" >&2;}
+    { (exit 1); exit 1; }; }
+        elif test x"$create_pam_modules" != x"yes"; then
+-	  { { $as_echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
+-$as_echo "$as_me: error: No support for PAM MODULES" >&2;}
++	  { { echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
++echo "$as_me: error: No support for PAM MODULES" >&2;}
+    { (exit 1); exit 1; }; }
+        else
+           PAM_MODULES="pam_smbpass"
+@@ -69066,13 +65388,13 @@
+        fi
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -69080,10 +65402,10 @@
+ 
+ ###############################################
+ # test for where we get crypt() from
+-{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+-$as_echo_n "checking for library containing crypt... " >&6; }
++{ echo "$as_me:$LINENO: checking for library containing crypt" >&5
++echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
+ if test "${ac_cv_search_crypt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -69121,30 +65443,26 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_crypt=$ac_res
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_crypt+set}" = set; then
+@@ -69159,8 +65477,8 @@
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+-$as_echo "$ac_cv_search_crypt" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
++echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+ ac_res=$ac_cv_search_crypt
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+@@ -69180,10 +65498,10 @@
+ ## $with_pam_for_crypt variable as above   --jerry
+ ##
+ if test $with_pam_for_crypt = no; then
+-{ $as_echo "$as_me:$LINENO: checking for a crypt that needs truncated salt" >&5
+-$as_echo_n "checking for a crypt that needs truncated salt... " >&6; }
++{ echo "$as_me:$LINENO: checking for a crypt that needs truncated salt" >&5
++echo $ECHO_N "checking for a crypt that needs truncated salt... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_TRUNCATED_SALT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ crypt_LIBS="$LIBS"
+@@ -69205,40 +65523,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_TRUNCATED_SALT=no
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_TRUNCATED_SALT=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
+ 
+ 
+ LIBS="$crypt_LIBS"
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_TRUNCATED_SALT" >&5
+-$as_echo "$samba_cv_HAVE_TRUNCATED_SALT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_TRUNCATED_SALT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_TRUNCATED_SALT" >&6; }
+ if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -69250,15 +65565,15 @@
+ 
+ #################################################
+ # check for a NISPLUS_HOME support
+-{ $as_echo "$as_me:$LINENO: checking whether to use NISPLUS_HOME" >&5
+-$as_echo_n "checking whether to use NISPLUS_HOME... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use NISPLUS_HOME" >&5
++echo $ECHO_N "checking whether to use NISPLUS_HOME... $ECHO_C" >&6; }
+ 
+ # Check whether --with-nisplus-home was given.
+ if test "${with_nisplus_home+set}" = set; then
+   withval=$with_nisplus_home;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_NISPLUS_HOME 1
+@@ -69266,28 +65581,28 @@
+ 
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+ 
+ #################################################
+ # check for syslog logging
+-{ $as_echo "$as_me:$LINENO: checking whether to use syslog logging" >&5
+-$as_echo_n "checking whether to use syslog logging... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use syslog logging" >&5
++echo $ECHO_N "checking whether to use syslog logging... $ECHO_C" >&6; }
+ 
+ # Check whether --with-syslog was given.
+ if test "${with_syslog+set}" = set; then
+   withval=$with_syslog;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_SYSLOG 1
+@@ -69295,28 +65610,28 @@
+ 
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+ 
+ #################################################
+ # check for custom syslog facility
+-{ $as_echo "$as_me:$LINENO: checking whether to use a custom syslog facility" >&5
+-$as_echo_n "checking whether to use a custom syslog facility... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use a custom syslog facility" >&5
++echo $ECHO_N "checking whether to use a custom syslog facility... $ECHO_C" >&6; }
+ 
+ # Check whether --with-syslog-facility was given.
+ if test "${with_syslog_facility+set}" = set; then
+   withval=$with_syslog_facility;
+   if test "$withval" = "no" ; then
+-    { { $as_echo "$as_me:$LINENO: error: argument to --with-syslog-facility must be a string" >&5
+-$as_echo "$as_me: error: argument to --with-syslog-facility must be a string" >&2;}
++    { { echo "$as_me:$LINENO: error: argument to --with-syslog-facility must be a string" >&5
++echo "$as_me: error: argument to --with-syslog-facility must be a string" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+      if test "$withval" != "yes" ; then
+@@ -69342,15 +65657,15 @@
+ samba_cv_TRY_SYS_QUOTAS=auto
+ samba_cv_SYSQUOTA_FOUND=no
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to try disk-quotas support" >&5
+-$as_echo_n "checking whether to try disk-quotas support... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to try disk-quotas support" >&5
++echo $ECHO_N "checking whether to try disk-quotas support... $ECHO_C" >&6; }
+ 
+ # Check whether --with-quotas was given.
+ if test "${with_quotas+set}" = set; then
+   withval=$with_quotas;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     samba_cv_WITH_QUOTAS=yes
+     samba_cv_TRY_QUOTAS=yes
+     samba_cv_RUN_QUOTA_TESTS=yes
+@@ -69358,8 +65673,8 @@
+     samba_cv_TRY_SYS_QUOTAS=auto
+     ;;
+   auto)
+-    { $as_echo "$as_me:$LINENO: result: auto" >&5
+-$as_echo "auto" >&6; }
++    { echo "$as_me:$LINENO: result: auto" >&5
++echo "${ECHO_T}auto" >&6; }
+     samba_cv_WITH_QUOTAS=auto
+     samba_cv_TRY_QUOTAS=auto
+     samba_cv_RUN_QUOTA_TESTS=auto
+@@ -69367,75 +65682,75 @@
+     samba_cv_TRY_SYS_QUOTAS=auto
+     ;;
+   no)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     samba_cv_WITH_QUOTAS=no
+     samba_cv_TRY_QUOTAS=no
+     samba_cv_RUN_QUOTA_TESTS=no
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
+-$as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
++    { echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
++echo "${ECHO_T}${samba_cv_TRY_QUOTAS}" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
+-$as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
++  { echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
++echo "${ECHO_T}${samba_cv_TRY_QUOTAS}" >&6; }
+ 
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to try the new lib/sysquotas.c interface" >&5
+-$as_echo_n "checking whether to try the new lib/sysquotas.c interface... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to try the new lib/sysquotas.c interface" >&5
++echo $ECHO_N "checking whether to try the new lib/sysquotas.c interface... $ECHO_C" >&6; }
+ 
+ # Check whether --with-sys-quotas was given.
+ if test "${with_sys_quotas+set}" = set; then
+   withval=$with_sys_quotas;  case "$withval" in
+   yes)
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     samba_cv_WITH_SYS_QUOTAS=yes
+     samba_cv_TRY_SYS_QUOTAS=yes
+     samba_cv_RUN_QUOTA_TESTS=yes
+     ;;
+   auto)
+-    { $as_echo "$as_me:$LINENO: result: auto" >&5
+-$as_echo "auto" >&6; }
++    { echo "$as_me:$LINENO: result: auto" >&5
++echo "${ECHO_T}auto" >&6; }
+     samba_cv_WITH_SYS_QUOTAS=auto
+     samba_cv_TRY_SYS_QUOTAS=auto
+     samba_cv_RUN_QUOTA_TESTS=auto
+     ;;
+   no)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     samba_cv_WITH_SYS_QUOTAS=no
+     samba_cv_TRY_SYS_QUOTAS=no
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
++    { echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
++echo "${ECHO_T}${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
++  { echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
++echo "${ECHO_T}${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+ 
+ fi
+ 
+ 
+ if test x"$samba_cv_TRY_SYS_QUOTAS" = x"auto"; then
+-{ $as_echo "$as_me:$LINENO: checking whether to try the lib/sysquotas.c interface on ${host_os}" >&5
+-$as_echo_n "checking whether to try the lib/sysquotas.c interface on ${host_os}... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to try the lib/sysquotas.c interface on ${host_os}" >&5
++echo $ECHO_N "checking whether to try the lib/sysquotas.c interface on ${host_os}... $ECHO_C" >&6; }
+   case "$host_os" in
+ 	*linux*)
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             samba_cv_TRY_SYS_QUOTAS=yes
+             samba_cv_RUN_QUOTA_TESTS=yes
+ 	    ;;
+ 	*)
+-	    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+             samba_cv_TRY_SYS_QUOTAS=no
+ 	    ;;
+   esac
+@@ -69455,10 +65770,10 @@
+ _ACEOF
+ 
+ 	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
+-	    { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
+-$as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
++echo $ECHO_N "checking whether to use the lib/sysquotas_linux.c builtin support... $ECHO_C" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -69466,10 +65781,10 @@
+ _ACEOF
+ 
+ 	    samba_cv_found_xfs_header=yes
+-	    { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
+-$as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
++echo $ECHO_N "checking whether to use the lib/sysquotas_xfs.c builtin support... $ECHO_C" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 	    ;;
+ 	*solaris*)
+ 	    # need to set this define when using static linking (BUG 1473)
+@@ -69481,17 +65796,17 @@
+ 
+ # some broken header files need this
+ if test "${ac_cv_header_asm_types_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for asm/types.h" >&5
+-$as_echo_n "checking for asm/types.h... " >&6; }
++  { echo "$as_me:$LINENO: checking for asm/types.h" >&5
++echo $ECHO_N "checking for asm/types.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_asm_types_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_asm_types_h" >&5
+-$as_echo "$ac_cv_header_asm_types_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_asm_types_h" >&5
++echo "${ECHO_T}$ac_cv_header_asm_types_h" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking asm/types.h usability" >&5
+-$as_echo_n "checking asm/types.h usability... " >&6; }
++{ echo "$as_me:$LINENO: checking asm/types.h usability" >&5
++echo $ECHO_N "checking asm/types.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69507,33 +65822,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking asm/types.h presence" >&5
+-$as_echo_n "checking asm/types.h presence... " >&6; }
++{ echo "$as_me:$LINENO: checking asm/types.h presence" >&5
++echo $ECHO_N "checking asm/types.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69547,52 +65861,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: asm/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: asm/types.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: asm/types.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: asm/types.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: asm/types.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: asm/types.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: asm/types.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: asm/types.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: asm/types.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: asm/types.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: asm/types.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: asm/types.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: asm/types.h: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -69601,18 +65914,18 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for asm/types.h" >&5
+-$as_echo_n "checking for asm/types.h... " >&6; }
++{ echo "$as_me:$LINENO: checking for asm/types.h" >&5
++echo $ECHO_N "checking for asm/types.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_asm_types_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_asm_types_h=$ac_header_preproc
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_asm_types_h" >&5
+-$as_echo "$ac_cv_header_asm_types_h" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_header_asm_types_h" >&5
++echo "${ECHO_T}$ac_cv_header_asm_types_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_asm_types_h" = x""yes; then
++if test $ac_cv_header_asm_types_h = yes; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -69632,21 +65945,20 @@
+ 
+ for ac_header in sys/fs/vx_quota.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69662,33 +65974,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69702,52 +66013,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -69756,24 +66066,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -69785,21 +66092,20 @@
+ 
+ for ac_header in linux/dqblk_xfs.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69815,33 +66121,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69855,52 +66160,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -69909,24 +66213,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -69938,21 +66239,20 @@
+ 
+ for ac_header in sys/quota.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -69968,33 +66268,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -70008,52 +66307,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -70062,24 +66360,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -70089,10 +66384,10 @@
+ 
+ if test x"$samba_cv_found_xfs_header" != x"yes"; then
+ # if we have xfs quota support <sys/quota.h> (IRIX) we should use it
+-{ $as_echo "$as_me:$LINENO: checking for XFS QUOTA in <sys/quota.h>" >&5
+-$as_echo_n "checking for XFS QUOTA in <sys/quota.h>... " >&6; }
++{ echo "$as_me:$LINENO: checking for XFS QUOTA in <sys/quota.h>" >&5
++echo $ECHO_N "checking for XFS QUOTA in <sys/quota.h>... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SYS_QUOTA_XFS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -70125,21 +66420,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_SYS_QUOTA_XFS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SYS_QUOTA_XFS=no
+@@ -70147,18 +66441,18 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SYS_QUOTA_XFS" >&5
+-$as_echo "$samba_cv_HAVE_SYS_QUOTA_XFS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SYS_QUOTA_XFS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SYS_QUOTA_XFS" >&6; }
+ if test "$samba_cv_HAVE_SYS_QUOTA_XFS"x = "yes"x; then
+ 	samba_cv_found_xfs_header=yes
+ fi
+ fi
+ 
+ # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
+-{ $as_echo "$as_me:$LINENO: checking if struct dqblk has .dqb_fsoftlimit" >&5
+-$as_echo_n "checking if struct dqblk has .dqb_fsoftlimit... " >&6; }
++{ echo "$as_me:$LINENO: checking if struct dqblk has .dqb_fsoftlimit" >&5
++echo $ECHO_N "checking if struct dqblk has .dqb_fsoftlimit... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_DQB_FSOFTLIMIT+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -70189,21 +66483,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_DQB_FSOFTLIMIT=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_DQB_FSOFTLIMIT=no
+@@ -70211,8 +66504,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_DQB_FSOFTLIMIT" >&5
+-$as_echo "$samba_cv_HAVE_DQB_FSOFTLIMIT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_DQB_FSOFTLIMIT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_DQB_FSOFTLIMIT" >&6; }
+ if test "$samba_cv_HAVE_DQB_FSOFTLIMIT"x = "yes"x; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -70225,10 +66518,10 @@
+ # look for a working quota system
+ 
+ if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)" >&5
+-$as_echo_n "checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)... " >&6; }
++{ echo "$as_me:$LINENO: checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)" >&5
++echo $ECHO_N "checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_QUOTACTL_4A+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -70262,32 +66555,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_QUOTACTL_4A=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_QUOTACTL_4A=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
+ 
+@@ -70303,8 +66593,8 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_4A" >&5
+-$as_echo "$samba_cv_HAVE_QUOTACTL_4A" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_4A" >&5
++echo "${ECHO_T}$samba_cv_HAVE_QUOTACTL_4A" >&6; }
+ if test x"$samba_cv_HAVE_QUOTACTL_4A" = x"yes"; then
+     samba_cv_SYSQUOTA_FOUND=yes;
+ 
+@@ -70317,10 +66607,10 @@
+ fi
+ 
+ if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for int quotactl(const char *path, int cmd, int id, char *addr)" >&5
+-$as_echo_n "checking for int quotactl(const char *path, int cmd, int id, char *addr)... " >&6; }
++{ echo "$as_me:$LINENO: checking for int quotactl(const char *path, int cmd, int id, char *addr)" >&5
++echo $ECHO_N "checking for int quotactl(const char *path, int cmd, int id, char *addr)... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_QUOTACTL_4B+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -70354,32 +66644,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_QUOTACTL_4B=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_QUOTACTL_4B=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
+ 
+@@ -70395,8 +66682,8 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_4B" >&5
+-$as_echo "$samba_cv_HAVE_QUOTACTL_4B" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_4B" >&5
++echo "${ECHO_T}$samba_cv_HAVE_QUOTACTL_4B" >&6; }
+ if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then
+     echo "int quotactl(const char *path, int cmd, int id, char *addr) is not reworked for the new sys_quota api"
+     samba_cv_SYSQUOTA_FOUND=yes;
+@@ -70410,10 +66697,10 @@
+ fi
+ 
+ if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking for CRAY int quotactl (char *spec, int request, char *arg)" >&5
+-$as_echo_n "checking for CRAY int quotactl (char *spec, int request, char *arg)... " >&6; }
++{ echo "$as_me:$LINENO: checking for CRAY int quotactl (char *spec, int request, char *arg)" >&5
++echo $ECHO_N "checking for CRAY int quotactl (char *spec, int request, char *arg)... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_QUOTACTL_3+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+@@ -70447,32 +66734,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   samba_cv_HAVE_QUOTACTL_3=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ samba_cv_HAVE_QUOTACTL_3=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
+ 
+@@ -70488,8 +66772,8 @@
+ 	export LDFLAGS;
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_3" >&5
+-$as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_3" >&5
++echo "${ECHO_T}$samba_cv_HAVE_QUOTACTL_3" >&6; }
+ if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
+     echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
+     samba_cv_SYSQUOTA_FOUND=yes;
+@@ -70507,21 +66791,20 @@
+ 
+ for ac_header in mntent.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -70537,33 +66820,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -70577,52 +66859,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -70631,24 +66912,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -70662,11 +66940,11 @@
+ 
+ for ac_func in setmntent getmntent endmntent
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -70719,42 +66997,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -70766,21 +67037,20 @@
+ 
+ for ac_header in devnm.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -70796,33 +67066,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -70836,52 +67105,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -70890,24 +67158,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -70919,11 +67184,11 @@
+ 
+ for ac_func in devnm
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -70976,42 +67241,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -71034,10 +67292,10 @@
+ fi
+ 
+ if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
+-{ $as_echo "$as_me:$LINENO: checking whether the sys_quota interface works" >&5
+-$as_echo_n "checking whether the sys_quota interface works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the sys_quota interface works" >&5
++echo $ECHO_N "checking whether the sys_quota interface works... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSQUOTA_WORKS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -71070,21 +67328,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_SYSQUOTA_WORKS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_SYSQUOTA_WORKS=no
+@@ -71094,11 +67351,11 @@
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSQUOTA_WORKS" >&5
+-$as_echo "$samba_cv_SYSQUOTA_WORKS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSQUOTA_WORKS" >&5
++echo "${ECHO_T}$samba_cv_SYSQUOTA_WORKS" >&6; }
+ if test x"$samba_cv_SYSQUOTA_WORKS" = x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking whether to use the new lib/sysquotas.c interface" >&5
+-$as_echo_n "checking whether to use the new lib/sysquotas.c interface... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use the new lib/sysquotas.c interface" >&5
++echo $ECHO_N "checking whether to use the new lib/sysquotas.c interface... $ECHO_C" >&6; }
+     if test x"$samba_cv_TRY_SYS_QUOTAS" != x"no"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -71111,20 +67368,20 @@
+ _ACEOF
+ 
+ 	samba_cv_WE_USE_SYS_QUOTAS=yes
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     else
+-        { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+ fi
+ fi
+ 
+ if test x"$samba_cv_SYSQUOTA_FOUND" != x"no" -a x"$samba_cv_found_xfs_header" = x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking whether the sys_quota interface works with XFS" >&5
+-$as_echo_n "checking whether the sys_quota interface works with XFS... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the sys_quota interface works with XFS" >&5
++echo $ECHO_N "checking whether the sys_quota interface works with XFS... $ECHO_C" >&6; }
+ if test "${samba_cv_SYSQUOTA_WORKS_XFS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -71157,21 +67414,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_SYSQUOTA_WORKS_XFS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_SYSQUOTA_WORKS_XFS=no
+@@ -71181,8 +67437,8 @@
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSQUOTA_WORKS_XFS" >&5
+-$as_echo "$samba_cv_SYSQUOTA_WORKS_XFS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_SYSQUOTA_WORKS_XFS" >&5
++echo "${ECHO_T}$samba_cv_SYSQUOTA_WORKS_XFS" >&6; }
+ if test x"$samba_cv_SYSQUOTA_WORKS_XFS" = x"yes"; then
+     if test x"$samba_cv_WE_USE_SYS_QUOTAS" = x"yes"; then
+ 
+@@ -71194,10 +67450,10 @@
+ fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether the old quota support works" >&5
+-$as_echo_n "checking whether the old quota support works... " >&6; }
++{ echo "$as_me:$LINENO: checking whether the old quota support works" >&5
++echo $ECHO_N "checking whether the old quota support works... $ECHO_C" >&6; }
+ if test "${samba_cv_QUOTA_WORKS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -71228,21 +67484,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_QUOTA_WORKS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_QUOTA_WORKS=no
+@@ -71252,11 +67507,11 @@
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_QUOTA_WORKS" >&5
+-$as_echo "$samba_cv_QUOTA_WORKS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_QUOTA_WORKS" >&5
++echo "${ECHO_T}$samba_cv_QUOTA_WORKS" >&6; }
+ if test x"$samba_cv_QUOTA_WORKS" = x"yes"; then
+-{ $as_echo "$as_me:$LINENO: checking whether to use the old quota support" >&5
+-$as_echo_n "checking whether to use the old quota support... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use the old quota support" >&5
++echo $ECHO_N "checking whether to use the old quota support... $ECHO_C" >&6; }
+     if test x"$samba_cv_WE_USE_SYS_QUOTAS" != x"yes"; then
+       if test x"$samba_cv_TRY_QUOTAS" != x"no"; then
+ 
+@@ -71264,15 +67519,15 @@
+ #define WITH_QUOTAS 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       else
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       fi
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     fi
+ fi
+ 
+@@ -71283,8 +67538,8 @@
+ #################################################
+ # check for experimental utmp accounting
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to support utmp accounting" >&5
+-$as_echo_n "checking whether to support utmp accounting... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to support utmp accounting" >&5
++echo $ECHO_N "checking whether to support utmp accounting... $ECHO_C" >&6; }
+ WITH_UTMP=yes
+ 
+ # Check whether --with-utmp was given.
+@@ -71311,16 +67566,16 @@
+ # Display test results
+ 
+ if test x"$WITH_UTMP" = x"yes"; then
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_UTMP 1
+ _ACEOF
+ 
+ else
+-        { $as_echo "$as_me:$LINENO: result: no$utmp_no_reason" >&5
+-$as_echo "no$utmp_no_reason" >&6; }
++        { echo "$as_me:$LINENO: result: no$utmp_no_reason" >&5
++echo "${ECHO_T}no$utmp_no_reason" >&6; }
+ fi
+ 
+ INSTALLLIBCMD_SH=:
+@@ -71345,8 +67600,8 @@
+ USESHARED=false
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
+-$as_echo_n "checking whether to use shared libraries internally... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
++echo $ECHO_N "checking whether to use shared libraries internally... $ECHO_C" >&6; }
+ # Check whether --enable-shared-libs was given.
+ if test "${enable_shared_libs+set}" = set; then
+   enableval=$enable_shared_libs; enable_shared_libs=$enableval
+@@ -71359,12 +67614,12 @@
+ 	USESHARED=$BLDSHARED
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $USESHARED" >&5
+-$as_echo "$USESHARED" >&6; }
++{ echo "$as_me:$LINENO: result: $USESHARED" >&5
++echo "${ECHO_T}$USESHARED" >&6; }
+ 
+ if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
+-$as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
++	{ echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
++echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
+ fi
+ 
+ #################################################
+@@ -71428,7 +67683,8 @@
  LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
  LIBTALLOC_SHARED=
  LIBTALLOC_STATIC=
@@ -167,21 +60027,38 @@
  INSTALL_LIBTALLOC=
  UNINSTALL_LIBTALLOC=
  
-@@ -67668,6 +67699,7 @@
+@@ -71443,8 +67699,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
+-$as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
- echo $ECHO_N "checking whether to build the libtalloc shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
++echo $ECHO_N "checking whether to build the libtalloc shared library... $ECHO_C" >&6; }
  
-@@ -67702,15 +67734,17 @@
+ 
+ # Check whether --with-libtalloc was given.
+@@ -71452,8 +67709,8 @@
+   withval=$with_libtalloc;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		build_lib=no
+ 		;;
+ 	*)
+@@ -71477,22 +67734,24 @@
  	UNINSTALL_LIBTALLOC=uninstalllibtalloc
  	if eval $BLDSHARED = true; then
  		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -191,11 +60068,22 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67737,7 +67771,8 @@
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBTALLOC_STATIC=\$\(LIBTALLOC_OBJ0\)
+@@ -71512,7 +67771,8 @@
  LIBTDB_STATIC_TARGET=bin/libtdb.a
  LIBTDB_SHARED=
  LIBTDB_STATIC=
@@ -205,21 +60093,38 @@
  INSTALL_LIBTDB=
  UNINSTALL_LIBTDB=
  
-@@ -67752,6 +67787,7 @@
+@@ -71527,8 +67787,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
+-$as_echo_n "checking whether to build the libtdb shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
- echo $ECHO_N "checking whether to build the libtdb shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
++echo $ECHO_N "checking whether to build the libtdb shared library... $ECHO_C" >&6; }
  
-@@ -67786,15 +67822,17 @@
+ 
+ # Check whether --with-libtdb was given.
+@@ -71536,8 +67797,8 @@
+   withval=$with_libtdb;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		build_lib=no
+ 		;;
+ 	*)
+@@ -71561,22 +67822,24 @@
  	UNINSTALL_LIBTDB=uninstalllibtdb
  	if eval $BLDSHARED = true; then
  		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -229,11 +60134,22 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67821,7 +67859,8 @@
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBTDB_STATIC=\$\(LIBTDB_OBJ0\)
+@@ -71596,7 +67859,8 @@
  LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
  LIBNETAPI_SHARED=
  LIBNETAPI_STATIC=
@@ -243,21 +60159,38 @@
  INSTALL_LIBNETAPI=
  UNINSTALL_LIBNETAPI=
  
-@@ -67836,6 +67875,7 @@
+@@ -71611,8 +67875,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
+-$as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
- echo $ECHO_N "checking whether to build the libnetapi shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
++echo $ECHO_N "checking whether to build the libnetapi shared library... $ECHO_C" >&6; }
  
-@@ -67870,15 +67910,17 @@
+ 
+ # Check whether --with-libnetapi was given.
+@@ -71620,8 +67885,8 @@
+   withval=$with_libnetapi;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		build_lib=no
+ 		;;
+ 	*)
+@@ -71645,22 +67910,24 @@
  	UNINSTALL_LIBNETAPI=uninstalllibnetapi
  	if eval $BLDSHARED = true; then
  		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -267,11 +60200,22 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67905,7 +67947,8 @@
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBNETAPI_STATIC=\$\(LIBNETAPI_OBJ0\)
+@@ -71680,7 +67947,8 @@
  LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
  LIBSMBCLIENT_SHARED=
  LIBSMBCLIENT_STATIC=
@@ -281,21 +60225,38 @@
  INSTALL_LIBSMBCLIENT=
  UNINSTALL_LIBSMBCLIENT=
  
-@@ -67920,6 +67963,7 @@
+@@ -71695,8 +67963,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
+-$as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
- echo $ECHO_N "checking whether to build the libsmbclient shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
++echo $ECHO_N "checking whether to build the libsmbclient shared library... $ECHO_C" >&6; }
  
-@@ -67954,15 +67998,17 @@
+ 
+ # Check whether --with-libsmbclient was given.
+@@ -71704,8 +67973,8 @@
+   withval=$with_libsmbclient;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		build_lib=no
+ 		;;
+ 	*)
+@@ -71729,22 +67998,24 @@
  	UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
  	if eval $BLDSHARED = true; then
  		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -305,11 +60266,22 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -67989,7 +68035,8 @@
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBSMBCLIENT_STATIC=\$\(LIBSMBCLIENT_OBJ0\)
+@@ -71764,7 +68035,8 @@
  LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
  LIBSMBSHAREMODES_SHARED=
  LIBSMBSHAREMODES_STATIC=
@@ -319,21 +60291,38 @@
  INSTALL_LIBSMBSHAREMODES=
  UNINSTALL_LIBSMBSHAREMODES=
  
-@@ -68004,6 +68051,7 @@
+@@ -71779,8 +68051,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
+-$as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
- echo $ECHO_N "checking whether to build the libsmbsharemodes shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
++echo $ECHO_N "checking whether to build the libsmbsharemodes shared library... $ECHO_C" >&6; }
  
-@@ -68038,15 +68086,17 @@
+ 
+ # Check whether --with-libsmbsharemodes was given.
+@@ -71788,8 +68061,8 @@
+   withval=$with_libsmbsharemodes;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 		build_lib=no
+ 		;;
+ 	*)
+@@ -71813,22 +68086,24 @@
  	UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
  	if eval $BLDSHARED = true; then
  		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -343,11 +60332,22 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -68073,7 +68123,8 @@
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBSMBSHAREMODES_STATIC=\$\(LIBSMBSHAREMODES_OBJ0\)
+@@ -71848,7 +68123,8 @@
  LIBADDNS_STATIC_TARGET=bin/libaddns.a
  LIBADDNS_SHARED=
  LIBADDNS_STATIC=
@@ -357,21 +60357,49 @@
  INSTALL_LIBADDNS=
  UNINSTALL_LIBADDNS=
  
-@@ -68088,6 +68139,7 @@
+@@ -71863,8 +68139,9 @@
  
  
  
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
+-$as_echo_n "checking whether to build the libaddns shared library... " >&6; }
 +
- { echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
- echo $ECHO_N "checking whether to build the libaddns shared library... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
++echo $ECHO_N "checking whether to build the libaddns shared library... $ECHO_C" >&6; }
  
-@@ -68124,15 +68176,17 @@
+ 
+ # Check whether --with-libaddns was given.
+@@ -71875,8 +68152,8 @@
+ 		build_lib=yes
+ 		;;
+ 	*)
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 		build_lib=no
+ 		;;
+ esac
+@@ -71884,8 +68161,8 @@
+ else
+ 
+ # if unspecified, default is not to build
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ build_lib=no
+ 
+ 
+@@ -71899,22 +68176,24 @@
  	UNINSTALL_LIBADDNS=uninstalllibaddns
  	if eval $BLDSHARED = true; then
  		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 +		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
  			enable_static=yes
 -		else
@@ -381,20 +60409,2936 @@
  		fi
  	else
  		enable_static=yes
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
+-$as_echo "no shared library support -- will supply static library" >&6; }
 +		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
- 		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
++		{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
  	fi
-@@ -70205,7 +70259,7 @@
- echo "${ECHO_T}yes" >&6; };
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
+-$as_echo "shared library not selected" >&6; }
++	{ echo "$as_me:$LINENO: result: shared library not selected" >&5
++echo "${ECHO_T}shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+ 	LIBADDNS_STATIC=\$\(LIBADDNS_OBJ0\)
+@@ -71930,17 +68209,17 @@
  
+ #################################################
+ # these tests are taken from the GNU fileutils package
+-{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
+-$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
++{ echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
++echo "$as_me: checking how to get filesystem space usage..." >&6;}
+ space=no
+ 
+ # Test for statvfs64.
+ if test $space = no; then
+   # SVR4
+-  { $as_echo "$as_me:$LINENO: checking statvfs64 function (SVR4)" >&5
+-$as_echo_n "checking statvfs64 function (SVR4)... " >&6; }
++  { echo "$as_me:$LINENO: checking statvfs64 function (SVR4)" >&5
++echo $ECHO_N "checking statvfs64 function (SVR4)... $ECHO_C" >&6; }
+ if test "${fu_cv_sys_stat_statvfs64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_statvfs64=cross
+@@ -71969,39 +68248,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_statvfs64=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_statvfs64=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
+-{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs64" >&5
+-$as_echo "$fu_cv_sys_stat_statvfs64" >&6; }
++{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs64" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statvfs64" >&6; }
+   if test $fu_cv_sys_stat_statvfs64 = yes; then
+     space=yes
+ 
+@@ -72020,10 +68296,10 @@
+ # is what it gets when this test fails.
+ if test $space = no; then
+   # SVR4
+-  { $as_echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
+-$as_echo_n "checking statvfs function (SVR4)... " >&6; }
++  { echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
++echo $ECHO_N "checking statvfs function (SVR4)... $ECHO_C" >&6; }
+ if test "${fu_cv_sys_stat_statvfs+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -72047,35 +68323,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   fu_cv_sys_stat_statvfs=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	fu_cv_sys_stat_statvfs=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
+-$as_echo "$fu_cv_sys_stat_statvfs" >&6; }
++{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6; }
+   if test $fu_cv_sys_stat_statvfs = yes; then
+     space=yes
+ 
+@@ -72089,10 +68361,10 @@
+ # smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
+ # This is not the case on ancient Linux systems.
+ 
+-{ $as_echo "$as_me:$LINENO: checking that statvfs.f_fsid is an integer" >&5
+-$as_echo_n "checking that statvfs.f_fsid is an integer... " >&6; }
++{ echo "$as_me:$LINENO: checking that statvfs.f_fsid is an integer" >&5
++echo $ECHO_N "checking that statvfs.f_fsid is an integer... $ECHO_C" >&6; }
+ if test "${samba_cv_fsid_int+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -72117,21 +68389,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_fsid_int=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_fsid_int=no
+@@ -72139,8 +68410,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_fsid_int" >&5
+-$as_echo "$samba_cv_fsid_int" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_fsid_int" >&5
++echo "${ECHO_T}$samba_cv_fsid_int" >&6; }
+ if test x"$samba_cv_fsid_int" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -72151,10 +68422,10 @@
+ 
+ # fsusage.c assumes that statvfs has an f_frsize entry. Some weird
+ # systems use f_bsize.
+-{ $as_echo "$as_me:$LINENO: checking that statvfs.f_frsize works" >&5
+-$as_echo_n "checking that statvfs.f_frsize works... " >&6; }
++{ echo "$as_me:$LINENO: checking that statvfs.f_frsize works" >&5
++echo $ECHO_N "checking that statvfs.f_frsize works... $ECHO_C" >&6; }
+ if test "${samba_cv_frsize+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -72179,21 +68450,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_frsize=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_frsize=no
+@@ -72201,8 +68471,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_frsize" >&5
+-$as_echo "$samba_cv_frsize" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_frsize" >&5
++echo "${ECHO_T}$samba_cv_frsize" >&6; }
+ if test x"$samba_cv_frsize" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -72213,10 +68483,10 @@
+ 
+ if test $space = no; then
+   # DEC Alpha running OSF/1
+-  { $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
+-$as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
++  { echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
++echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6; }
+   if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_statfs3_osf1=no
+@@ -72244,40 +68514,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_statfs3_osf1=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_statfs3_osf1=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
+ 
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
+-$as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; }
++  { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6; }
+   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
+     space=yes
+ 
+@@ -72290,10 +68557,10 @@
+ 
+ if test $space = no; then
+ # AIX
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+-$as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
++  { echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
++echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6; }
+   if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_statfs2_bsize=no
+@@ -72327,40 +68594,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_statfs2_bsize=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_statfs2_bsize=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
+ 
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
+-$as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; }
++  { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6; }
+   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
+     space=yes
+ 
+@@ -72373,10 +68637,10 @@
+ 
+ if test $space = no; then
+ # SVR3
+-  { $as_echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+-$as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
++  { echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
++echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6; }
+   if test "${fu_cv_sys_stat_statfs4+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_statfs4=no
+@@ -72401,40 +68665,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_statfs4=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_statfs4=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
+ 
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
+-$as_echo "$fu_cv_sys_stat_statfs4" >&6; }
++  { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6; }
+   if test $fu_cv_sys_stat_statfs4 = yes; then
+     space=yes
+ 
+@@ -72447,10 +68708,10 @@
+ 
+ if test $space = no; then
+ # 4.4BSD and NetBSD
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+-$as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
++  { echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
++echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6; }
+   if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_statfs2_fsize=no
+@@ -72481,40 +68742,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_statfs2_fsize=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_statfs2_fsize=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
+ 
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
+-$as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; }
++  { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6; }
+   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
+     space=yes
+ 
+@@ -72527,10 +68785,10 @@
+ 
+ if test $space = no; then
+   # Ultrix
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+-$as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
++  { echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
++echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6; }
+   if test "${fu_cv_sys_stat_fs_data+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+   fu_cv_sys_stat_fs_data=no
+@@ -72565,40 +68823,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   fu_cv_sys_stat_fs_data=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ fu_cv_sys_stat_fs_data=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
+ 
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
+-$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
++  { echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
++echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6; }
+   if test $fu_cv_sys_stat_fs_data = yes; then
+     space=yes
+ 
+@@ -72617,8 +68872,8 @@
+ # If we don't have all of these then disable large
+ # file support.
+ #
+-{ $as_echo "$as_me:$LINENO: checking if large file support can be enabled" >&5
+-$as_echo_n "checking if large file support can be enabled... " >&6; }
++{ echo "$as_me:$LINENO: checking if large file support can be enabled" >&5
++echo $ECHO_N "checking if large file support can be enabled... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -72646,21 +68901,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=no
+@@ -72674,14 +68928,14 @@
+ _ACEOF
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&5
+-$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&5
++echo "${ECHO_T}$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
+ 
+ #################################################
+ # check for cluster extensions
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to include cluster support" >&5
+-$as_echo_n "checking whether to include cluster support... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to include cluster support" >&5
++echo $ECHO_N "checking whether to include cluster support... $ECHO_C" >&6; }
+ 
+ # Check whether --with-cluster-support was given.
+ if test "${with_cluster_support+set}" = set; then
+@@ -72694,19 +68948,19 @@
+ #define CLUSTER_SUPPORT 1
+ _ACEOF
+ 
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+ #################################################
+ # check for ACL support
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to support ACLs" >&5
+-$as_echo_n "checking whether to support ACLs... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to support ACLs" >&5
++echo $ECHO_N "checking whether to support ACLs... $ECHO_C" >&6; }
+ 
+ # Check whether --with-acl-support was given.
+ if test "${with_acl_support+set}" = set; then
+@@ -72722,24 +68976,24 @@
+ 	with_acl_support="auto"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_acl_support" >&5
+-$as_echo "$with_acl_support" >&6; }
++{ echo "$as_me:$LINENO: result: $with_acl_support" >&5
++echo "${ECHO_T}$with_acl_support" >&6; }
+ 
+ if test x"$with_acl_support" = x"no"; then
+-	{ $as_echo "$as_me:$LINENO: result: Disabling ACL support" >&5
+-$as_echo "Disabling ACL support" >&6; }
++	{ echo "$as_me:$LINENO: result: Disabling ACL support" >&5
++echo "${ECHO_T}Disabling ACL support" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NO_ACLS 1
+ _ACEOF
+ 
+ else
+-	{ $as_echo "$as_me:$LINENO: checking whether ACL support is available:" >&5
+-$as_echo "$as_me: checking whether ACL support is available:" >&6;}
++	{ echo "$as_me:$LINENO: checking whether ACL support is available:" >&5
++echo "$as_me: checking whether ACL support is available:" >&6;}
  	case "$host_os" in
+ 	*sysv5*)
+-		{ $as_echo "$as_me:$LINENO: Using UnixWare ACLs" >&5
+-$as_echo "$as_me: Using UnixWare ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using UnixWare ACLs" >&5
++echo "$as_me: Using UnixWare ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_UNIXWARE_ACLS 1
+@@ -72748,8 +69002,8 @@
+ 		default_static_modules="$default_static_modules vfs_solarisacl"
+ 		;;
+ 	*solaris*)
+-		{ $as_echo "$as_me:$LINENO: Using solaris ACLs" >&5
+-$as_echo "$as_me: Using solaris ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using solaris ACLs" >&5
++echo "$as_me: Using solaris ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SOLARIS_ACLS 1
+@@ -72759,8 +69013,8 @@
+ 		default_static_modules="$default_static_modules vfs_solarisacl"
+ 		;;
+ 	*hpux*)
+-		{ $as_echo "$as_me:$LINENO: Using HPUX ACLs" >&5
+-$as_echo "$as_me: Using HPUX ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using HPUX ACLs" >&5
++echo "$as_me: Using HPUX ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HPUX_ACLS 1
+@@ -72769,8 +69023,8 @@
+ 		default_static_modules="$default_static_modules vfs_hpuxacl"
+ 		;;
+ 	*irix*)
+-		{ $as_echo "$as_me:$LINENO: Using IRIX ACLs" >&5
+-$as_echo "$as_me: Using IRIX ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using IRIX ACLs" >&5
++echo "$as_me: Using IRIX ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IRIX_ACLS 1
+@@ -72779,8 +69033,8 @@
+ 		default_static_modules="$default_static_modules vfs_irixacl"
+ 		;;
+ 	*aix*)
+-		{ $as_echo "$as_me:$LINENO: Using AIX ACLs" >&5
+-$as_echo "$as_me: Using AIX ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using AIX ACLs" >&5
++echo "$as_me: Using AIX ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIX_ACLS 1
+@@ -72789,8 +69043,8 @@
+ 		default_static_modules="$default_static_modules vfs_aixacl"
+ 		;;
+ 	*osf*)
+-		{ $as_echo "$as_me:$LINENO: Using Tru64 ACLs" >&5
+-$as_echo "$as_me: Using Tru64 ACLs" >&6;}
++		{ echo "$as_me:$LINENO: Using Tru64 ACLs" >&5
++echo "$as_me: Using Tru64 ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_TRU64_ACLS 1
+@@ -72800,8 +69054,8 @@
+ 		default_static_modules="$default_static_modules vfs_tru64acl"
+ 		;;
+ 	*darwin*)
+-		{ $as_echo "$as_me:$LINENO: ACLs on Darwin currently not supported" >&5
+-$as_echo "$as_me: ACLs on Darwin currently not supported" >&6;}
++		{ echo "$as_me:$LINENO: ACLs on Darwin currently not supported" >&5
++echo "$as_me: ACLs on Darwin currently not supported" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NO_ACLS 1
+@@ -72809,10 +69063,10 @@
+ 
+ 		;;
+ 	*)
+-		{ $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
+-$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
++		{ echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
++echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lacl  $LIBS"
+@@ -72844,46 +69098,42 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_acl_acl_get_file=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_acl_acl_get_file=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
+-$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
+-if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
++echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6; }
++if test $ac_cv_lib_acl_acl_get_file = yes; then
+   ACL_LIBS="$ACL_LIBS -lacl"
+ fi
+ 
+ 		case "$host_os" in
+ 		*linux*)
+-			{ $as_echo "$as_me:$LINENO: checking for getxattr in -lattr" >&5
+-$as_echo_n "checking for getxattr in -lattr... " >&6; }
++			{ echo "$as_me:$LINENO: checking for getxattr in -lattr" >&5
++echo $ECHO_N "checking for getxattr in -lattr... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_attr_getxattr+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lattr  $LIBS"
+@@ -72915,46 +69165,42 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_attr_getxattr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_attr_getxattr=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_getxattr" >&5
+-$as_echo "$ac_cv_lib_attr_getxattr" >&6; }
+-if test "x$ac_cv_lib_attr_getxattr" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_attr_getxattr" >&5
++echo "${ECHO_T}$ac_cv_lib_attr_getxattr" >&6; }
++if test $ac_cv_lib_attr_getxattr = yes; then
+   ACL_LIBS="$ACL_LIBS -lattr"
+ fi
+ 
+ 			;;
+ 		esac
+-		{ $as_echo "$as_me:$LINENO: checking for POSIX ACL support" >&5
+-$as_echo_n "checking for POSIX ACL support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for POSIX ACL support" >&5
++echo $ECHO_N "checking for POSIX ACL support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_POSIX_ACLS+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 			acl_LIBS=$LIBS
+@@ -72988,49 +69234,45 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_POSIX_ACLS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_POSIX_ACLS=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=$acl_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_ACLS" >&5
+-$as_echo "$samba_cv_HAVE_POSIX_ACLS" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_ACLS" >&5
++echo "${ECHO_T}$samba_cv_HAVE_POSIX_ACLS" >&6; }
+ 		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+-			{ $as_echo "$as_me:$LINENO: Using posix ACLs" >&5
+-$as_echo "$as_me: Using posix ACLs" >&6;}
++			{ echo "$as_me:$LINENO: Using posix ACLs" >&5
++echo "$as_me: Using posix ACLs" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_POSIX_ACLS 1
+ _ACEOF
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for acl_get_perm_np" >&5
+-$as_echo_n "checking for acl_get_perm_np... " >&6; }
++			{ echo "$as_me:$LINENO: checking for acl_get_perm_np" >&5
++echo $ECHO_N "checking for acl_get_perm_np... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_ACL_GET_PERM_NP+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 				acl_LIBS=$LIBS
+@@ -73063,37 +69305,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_ACL_GET_PERM_NP=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_ACL_GET_PERM_NP=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=$acl_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_ACL_GET_PERM_NP" >&5
+-$as_echo "$samba_cv_HAVE_ACL_GET_PERM_NP" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_ACL_GET_PERM_NP" >&5
++echo "${ECHO_T}$samba_cv_HAVE_ACL_GET_PERM_NP" >&6; }
+ 			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -73103,8 +69341,8 @@
+ 			fi
+    			default_static_modules="$default_static_modules vfs_posixacl"
+ 		else
+-			{ $as_echo "$as_me:$LINENO: ACL support is not avaliable" >&5
+-$as_echo "$as_me: ACL support is not avaliable" >&6;}
++			{ echo "$as_me:$LINENO: ACL support is not avaliable" >&5
++echo "$as_me: ACL support is not avaliable" >&6;}
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NO_ACLS 1
+@@ -73120,23 +69358,23 @@
+ #################################################
+ # check for AIO support
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to support asynchronous io" >&5
+-$as_echo_n "checking whether to support asynchronous io... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to support asynchronous io" >&5
++echo $ECHO_N "checking whether to support asynchronous io... $ECHO_C" >&6; }
+ 
+ # Check whether --with-aio-support was given.
+ if test "${with_aio_support+set}" = set; then
+   withval=$with_aio_support;  case "$withval" in
+   yes)
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 	case "$host_os" in
+ 	*)
+ 		AIO_LIBS=$LIBS
+-		{ $as_echo "$as_me:$LINENO: checking for aio_read in -lrt" >&5
+-$as_echo_n "checking for aio_read in -lrt... " >&6; }
++		{ echo "$as_me:$LINENO: checking for aio_read in -lrt" >&5
++echo $ECHO_N "checking for aio_read in -lrt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_rt_aio_read+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+@@ -73168,44 +69406,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_rt_aio_read=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_rt_aio_read=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_aio_read" >&5
+-$as_echo "$ac_cv_lib_rt_aio_read" >&6; }
+-if test "x$ac_cv_lib_rt_aio_read" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_aio_read" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_aio_read" >&6; }
++if test $ac_cv_lib_rt_aio_read = yes; then
+   AIO_LIBS="$LIBS -lrt"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for aio_read in -laio" >&5
+-$as_echo_n "checking for aio_read in -laio... " >&6; }
++		{ echo "$as_me:$LINENO: checking for aio_read in -laio" >&5
++echo $ECHO_N "checking for aio_read in -laio... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_aio_aio_read+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-laio  $LIBS"
+@@ -73237,44 +69471,40 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_aio_aio_read=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_aio_aio_read=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aio_aio_read" >&5
+-$as_echo "$ac_cv_lib_aio_aio_read" >&6; }
+-if test "x$ac_cv_lib_aio_aio_read" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_aio_aio_read" >&5
++echo "${ECHO_T}$ac_cv_lib_aio_aio_read" >&6; }
++if test $ac_cv_lib_aio_aio_read = yes; then
+   AIO_LIBS="$LIBS -laio"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for asynchronous io support" >&5
+-$as_echo_n "checking for asynchronous io support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for asynchronous io support" >&5
++echo $ECHO_N "checking for asynchronous io support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_AIO+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		aio_LIBS=$LIBS
+@@ -73301,40 +69531,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_AIO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_AIO=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=$aio_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_AIO" >&5
+-$as_echo "$samba_cv_HAVE_AIO" >&6; }
+-		{ $as_echo "$as_me:$LINENO: checking for 64-bit asynchronous io support" >&5
+-$as_echo_n "checking for 64-bit asynchronous io support... " >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_AIO" >&5
++echo "${ECHO_T}$samba_cv_HAVE_AIO" >&6; }
++		{ echo "$as_me:$LINENO: checking for 64-bit asynchronous io support" >&5
++echo $ECHO_N "checking for 64-bit asynchronous io support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_AIO64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		aio_LIBS=$LIBS
+@@ -73361,36 +69587,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_AIO64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_AIO64=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=$aio_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_AIO64" >&5
+-$as_echo "$samba_cv_HAVE_AIO64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_AIO64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_AIO64" >&6; }
+ 		if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -73413,8 +69635,8 @@
+ 		fi
+ 
+ 		if test x"$samba_cv_HAVE_AIO" = x"yes"; then
+-			{ $as_echo "$as_me:$LINENO: checking for aio_read" >&5
+-$as_echo_n "checking for aio_read... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_read" >&5
++echo $ECHO_N "checking for aio_read... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_read(&a); }
+@@ -73425,41 +69647,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_READ 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_write" >&5
+-$as_echo_n "checking for aio_write... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_write" >&5
++echo $ECHO_N "checking for aio_write... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_write(&a); }
+@@ -73470,41 +69688,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_WRITE 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_fsync" >&5
+-$as_echo_n "checking for aio_fsync... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_fsync" >&5
++echo $ECHO_N "checking for aio_fsync... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_fsync(1, &a); }
+@@ -73515,41 +69729,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_FSYNC 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_return" >&5
+-$as_echo_n "checking for aio_return... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_return" >&5
++echo $ECHO_N "checking for aio_return... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_return(&a); }
+@@ -73560,41 +69770,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_RETURN 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_error" >&5
+-$as_echo_n "checking for aio_error... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_error" >&5
++echo $ECHO_N "checking for aio_error... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_error(&a); }
+@@ -73605,41 +69811,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_ERROR 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_cancel" >&5
+-$as_echo_n "checking for aio_cancel... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_cancel" >&5
++echo $ECHO_N "checking for aio_cancel... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_cancel(1, &a); }
+@@ -73650,41 +69852,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_CANCEL 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_suspend" >&5
+-$as_echo_n "checking for aio_suspend... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_suspend" >&5
++echo $ECHO_N "checking for aio_suspend... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }
+@@ -73695,43 +69893,39 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_SUSPEND 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 		fi
+ 
+ 		if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
+-			{ $as_echo "$as_me:$LINENO: checking for aio_read64" >&5
+-$as_echo_n "checking for aio_read64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_read64" >&5
++echo $ECHO_N "checking for aio_read64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_read64(&a); }
+@@ -73742,41 +69936,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_READ64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_write64" >&5
+-$as_echo_n "checking for aio_write64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_write64" >&5
++echo $ECHO_N "checking for aio_write64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_write64(&a); }
+@@ -73787,41 +69977,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_WRITE64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_fsync64" >&5
+-$as_echo_n "checking for aio_fsync64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_fsync64" >&5
++echo $ECHO_N "checking for aio_fsync64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_fsync64(1, &a); }
+@@ -73832,41 +70018,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_FSYNC64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_return64" >&5
+-$as_echo_n "checking for aio_return64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_return64" >&5
++echo $ECHO_N "checking for aio_return64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_return64(&a); }
+@@ -73877,41 +70059,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_RETURN64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_error64" >&5
+-$as_echo_n "checking for aio_error64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_error64" >&5
++echo $ECHO_N "checking for aio_error64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_error64(&a); }
+@@ -73922,41 +70100,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_ERROR64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_cancel64" >&5
+-$as_echo_n "checking for aio_cancel64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_cancel64" >&5
++echo $ECHO_N "checking for aio_cancel64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_cancel64(1, &a); }
+@@ -73967,41 +70141,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_CANCEL64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for aio_suspend64" >&5
+-$as_echo_n "checking for aio_suspend64... " >&6; }
++			{ echo "$as_me:$LINENO: checking for aio_suspend64" >&5
++echo $ECHO_N "checking for aio_suspend64... $ECHO_C" >&6; }
+ 			cat >conftest.$ac_ext <<_ACEOF
+ #include <aio.h>
+ int main() { struct aiocb a; return aio_suspend64(&a, 1, NULL); }
+@@ -74012,36 +70182,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AIO_SUSPEND64 1
+ _ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 		fi
+@@ -74049,8 +70215,8 @@
+         esac
+         ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NO_AIO 1
+@@ -74064,8 +70230,8 @@
+ #define HAVE_NO_AIO 1
+ _ACEOF
+ 
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -74081,23 +70247,23 @@
+ # check for sendfile support
+ 
+ with_sendfile_support=yes
+-{ $as_echo "$as_me:$LINENO: checking whether to check to support sendfile" >&5
+-$as_echo_n "checking whether to check to support sendfile... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to check to support sendfile" >&5
++echo $ECHO_N "checking whether to check to support sendfile... $ECHO_C" >&6; }
+ 
+ # Check whether --with-sendfile-support was given.
+ if test "${with_sendfile_support+set}" = set; then
+   withval=$with_sendfile_support;  case "$withval" in
+   yes)
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; };
+ 
+ 	case "$host_os" in
 -	*linux*)
+-		{ $as_echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
+-$as_echo_n "checking for linux sendfile64 support... " >&6; }
 +	linux*-gnu* | gnu* | k*bsd*-gnu)
- 		{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
- echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
++		{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
++echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -71413,11 +71467,11 @@
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74126,40 +70292,36 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE64=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE64" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE64" >&6; }
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for linux sendfile support" >&5
+-$as_echo_n "checking for linux sendfile support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for linux sendfile support" >&5
++echo $ECHO_N "checking for linux sendfile support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74188,41 +70350,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE" >&6; }
+ 
+ # Try and cope with broken Linux sendfile....
+-		{ $as_echo "$as_me:$LINENO: checking for broken linux sendfile support" >&5
+-$as_echo_n "checking for broken linux sendfile support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for broken linux sendfile support" >&5
++echo $ECHO_N "checking for broken linux sendfile support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_BROKEN_LINUX_SENDFILE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74255,35 +70413,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_BROKEN_LINUX_SENDFILE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_LINUX_SENDFILE" >&5
+-$as_echo "$samba_cv_HAVE_BROKEN_LINUX_SENDFILE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_LINUX_SENDFILE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_BROKEN_LINUX_SENDFILE" >&6; }
+ 
+ 	if test x"$samba_cv_HAVE_SENDFILE64" = x"yes"; then
+ 
+@@ -74329,16 +70483,16 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 
+ 	;;
+ 	*freebsd* | *dragonfly* )
+-		{ $as_echo "$as_me:$LINENO: checking for freebsd sendfile support" >&5
+-$as_echo_n "checking for freebsd sendfile support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for freebsd sendfile support" >&5
++echo $ECHO_N "checking for freebsd sendfile support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74378,35 +70532,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE" >&6; }
+ 
+ 	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
+ 
+@@ -74425,16 +70575,16 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 	;;
+ 
+ 	*hpux*)
+-		{ $as_echo "$as_me:$LINENO: checking for hpux sendfile64 support" >&5
+-$as_echo_n "checking for hpux sendfile64 support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for hpux sendfile64 support" >&5
++echo $ECHO_N "checking for hpux sendfile64 support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74471,35 +70621,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE64=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE64" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE64" >&6; }
+ 	if test x"$samba_cv_HAVE_SENDFILE64" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -74517,14 +70663,14 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for hpux sendfile support" >&5
+-$as_echo_n "checking for hpux sendfile support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for hpux sendfile support" >&5
++echo $ECHO_N "checking for hpux sendfile support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74561,35 +70707,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE" >&6; }
+ 	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -74607,17 +70749,17 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 	;;
+ 
+ 	*solaris*)
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sendfilev in -lsendfile" >&5
+-$as_echo_n "checking for sendfilev in -lsendfile... " >&6; }
++{ echo "$as_me:$LINENO: checking for sendfilev in -lsendfile" >&5
++echo $ECHO_N "checking for sendfilev in -lsendfile... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sendfile_sendfilev+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsendfile  $LIBS"
+@@ -74649,37 +70791,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_sendfile_sendfilev=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_sendfile_sendfilev=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sendfile_sendfilev" >&5
+-$as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; }
+-if test "x$ac_cv_lib_sendfile_sendfilev" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sendfile_sendfilev" >&5
++echo "${ECHO_T}$ac_cv_lib_sendfile_sendfilev" >&6; }
++if test $ac_cv_lib_sendfile_sendfilev = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSENDFILE 1
+ _ACEOF
+@@ -74688,10 +70826,10 @@
+ 
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for solaris sendfilev64 support" >&5
+-$as_echo_n "checking for solaris sendfilev64 support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for solaris sendfilev64 support" >&5
++echo $ECHO_N "checking for solaris sendfilev64 support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILEV64+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74735,35 +70873,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILEV64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILEV64=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILEV64" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILEV64" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILEV64" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILEV64" >&6; }
+ 
+ 	if test x"$samba_cv_HAVE_SENDFILEV64" = x"yes"; then
+ 
+@@ -74782,14 +70916,14 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for solaris sendfilev support" >&5
+-$as_echo_n "checking for solaris sendfilev support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for solaris sendfilev support" >&5
++echo $ECHO_N "checking for solaris sendfilev support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILEV+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74833,35 +70967,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILEV=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILEV=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILEV" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILEV" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILEV" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILEV" >&6; }
+ 
+ 	if test x"$samba_cv_HAVE_SENDFILEV" = x"yes"; then
+ 
+@@ -74880,15 +71010,15 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 	;;
+ 	*aix*)
+-		{ $as_echo "$as_me:$LINENO: checking for AIX send_file support" >&5
+-$as_echo_n "checking for AIX send_file support... " >&6; }
++		{ echo "$as_me:$LINENO: checking for AIX send_file support" >&5
++echo $ECHO_N "checking for AIX send_file support... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_SENDFILE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -74929,35 +71059,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_SENDFILE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_SENDFILE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
+-$as_echo "$samba_cv_HAVE_SENDFILE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_SENDFILE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_SENDFILE" >&6; }
+ 	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -74975,8 +71101,8 @@
+ _ACEOF
+ 
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; };
+ 	fi
+ 	;;
+ 	*)
+@@ -74984,13 +71110,13 @@
+         esac
+         ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ fi
+ 
+@@ -74998,10 +71124,10 @@
+ ############################################
+ # See if we have the Linux readahead syscall.
+ 
+-{ $as_echo "$as_me:$LINENO: checking for Linux readahead" >&5
+-$as_echo_n "checking for Linux readahead... " >&6; }
++{ echo "$as_me:$LINENO: checking for Linux readahead" >&5
++echo $ECHO_N "checking for Linux readahead... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_LINUX_READAHEAD+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -75029,35 +71155,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_LINUX_READAHEAD=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_LINUX_READAHEAD=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_LINUX_READAHEAD" >&5
+-$as_echo "$samba_cv_HAVE_LINUX_READAHEAD" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_LINUX_READAHEAD" >&5
++echo "${ECHO_T}$samba_cv_HAVE_LINUX_READAHEAD" >&6; }
+ 
+ if test x"$samba_cv_HAVE_LINUX_READAHEAD" = x"yes"; then
+ 
+@@ -75068,10 +71190,10 @@
+ fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for readahead declaration" >&5
+-$as_echo_n "checking for readahead declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for readahead declaration" >&5
++echo $ECHO_N "checking for readahead declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_readahead_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -75095,21 +71217,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_readahead_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_readahead_decl=no
+@@ -75117,8 +71238,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_readahead_decl" >&5
+-$as_echo "$ac_cv_have_readahead_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_readahead_decl" >&5
++echo "${ECHO_T}$ac_cv_have_readahead_decl" >&6; }
+  if test x"$ac_cv_have_readahead_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -75131,10 +71252,10 @@
+ ############################################
+ # See if we have the posix_fadvise syscall.
+ 
+-{ $as_echo "$as_me:$LINENO: checking for posix_fadvise" >&5
+-$as_echo_n "checking for posix_fadvise... " >&6; }
++{ echo "$as_me:$LINENO: checking for posix_fadvise" >&5
++echo $ECHO_N "checking for posix_fadvise... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_POSIX_FADVISE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -75162,35 +71283,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_POSIX_FADVISE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_POSIX_FADVISE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_FADVISE" >&5
+-$as_echo "$samba_cv_HAVE_POSIX_FADVISE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_POSIX_FADVISE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_POSIX_FADVISE" >&6; }
+ 
+ if test x"$samba_cv_HAVE_POSIX_FADVISE" = x"yes"; then
+ 
+@@ -75203,10 +71320,10 @@
+ ############################################
+ # See if we have the Linux splice syscall.
+ 
+-{ $as_echo "$as_me:$LINENO: checking for Linux splice" >&5
+-$as_echo_n "checking for Linux splice... " >&6; }
++{ echo "$as_me:$LINENO: checking for Linux splice" >&5
++echo $ECHO_N "checking for Linux splice... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_LINUX_SPLICE+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -75234,35 +71351,31 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   samba_cv_HAVE_LINUX_SPLICE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_LINUX_SPLICE=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_LINUX_SPLICE" >&5
+-$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_LINUX_SPLICE" >&5
++echo "${ECHO_T}$samba_cv_HAVE_LINUX_SPLICE" >&6; }
+ 
+ if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
+ 
+@@ -75273,10 +71386,10 @@
+ fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for splice declaration" >&5
+-$as_echo_n "checking for splice declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for splice declaration" >&5
++echo $ECHO_N "checking for splice declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_splice_decl+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -75300,21 +71413,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_have_splice_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_have_splice_decl=no
+@@ -75322,8 +71434,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_splice_decl" >&5
+-$as_echo "$ac_cv_have_splice_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_splice_decl" >&5
++echo "${ECHO_T}$ac_cv_have_splice_decl" >&6; }
+  if test x"$ac_cv_have_splice_decl" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -75338,8 +71450,8 @@
+ # Check whether winbind is supported on this platform.  If so we need to
+ # build and install client programs, sbin programs and shared libraries
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build winbind" >&5
+-$as_echo_n "checking whether to build winbind... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to build winbind" >&5
++echo $ECHO_N "checking whether to build winbind... $ECHO_C" >&6; }
+ 
+ # Initially, the value of $host_os decides whether winbind is supported
+ 
+@@ -75355,11 +71467,11 @@
  WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in
@@ -408,79 +63352,5905 @@
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		NSSSONAMEVERSIONSUFFIX=".1"
-@@ -77601,6 +77655,7 @@
- LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
- LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
- LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
+@@ -75474,8 +71586,8 @@
+ fi
+ 
+ if test x"$HAVE_WINBIND" = x"yes"; then
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_WINBIND 1
+@@ -75490,14 +71602,14 @@
+ 		UNINSTALL_PAM_MODULES="uninstallpammodules"
+ 	fi
+ else
+-        { $as_echo "$as_me:$LINENO: result: no$winbind_no_reason" >&5
+-$as_echo "no$winbind_no_reason" >&6; }
++        { echo "$as_me:$LINENO: result: no$winbind_no_reason" >&5
++echo "${ECHO_T}no$winbind_no_reason" >&6; }
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
+-$as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
++echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+@@ -75529,37 +71641,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_pthread_pthread_mutex_lock=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_pthread_pthread_mutex_lock=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
+-$as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
++if test $ac_cv_lib_pthread_pthread_mutex_lock = yes; then
+   WINBIND_NSS_PTHREAD="-lpthread"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -75581,10 +71689,10 @@
+ 
+ 
+ # Solaris 10 does have new member in nss_XbyY_key
+-{ $as_echo "$as_me:$LINENO: checking for union nss_XbyY_key.ipnode.af_family" >&5
+-$as_echo_n "checking for union nss_XbyY_key.ipnode.af_family... " >&6; }
++{ echo "$as_me:$LINENO: checking for union nss_XbyY_key.ipnode.af_family" >&5
++echo $ECHO_N "checking for union nss_XbyY_key.ipnode.af_family... $ECHO_C" >&6; }
+ if test "${ac_cv_member_union_nss_XbyY_key_ipnode_af_family+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -75610,21 +71718,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_union_nss_XbyY_key_ipnode_af_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -75651,21 +71758,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_union_nss_XbyY_key_ipnode_af_family=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_union_nss_XbyY_key_ipnode_af_family=no
+@@ -75676,9 +71782,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&5
+-$as_echo "$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&6; }
+-if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&5
++echo "${ECHO_T}$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&6; }
++if test $ac_cv_member_union_nss_XbyY_key_ipnode_af_family = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NSS_XBYY_KEY_IPNODE 1
+@@ -75690,10 +71796,10 @@
+ # Solaris has some extra fields in struct passwd that need to be
+ # initialised otherwise nscd crashes.
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_comment" >&5
+-$as_echo_n "checking for struct passwd.pw_comment... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct passwd.pw_comment" >&5
++echo $ECHO_N "checking for struct passwd.pw_comment... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_passwd_pw_comment+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -75719,21 +71825,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_passwd_pw_comment=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -75760,21 +71865,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_passwd_pw_comment=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_passwd_pw_comment=no
+@@ -75785,9 +71889,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_comment" >&5
+-$as_echo "$ac_cv_member_struct_passwd_pw_comment" >&6; }
+-if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_comment" >&5
++echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_comment" >&6; }
++if test $ac_cv_member_struct_passwd_pw_comment = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PASSWD_PW_COMMENT 1
+@@ -75796,10 +71900,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_age" >&5
+-$as_echo_n "checking for struct passwd.pw_age... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct passwd.pw_age" >&5
++echo $ECHO_N "checking for struct passwd.pw_age... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_passwd_pw_age+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -75825,21 +71929,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_passwd_pw_age=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -75866,21 +71969,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_passwd_pw_age=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_passwd_pw_age=no
+@@ -75891,9 +71993,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_age" >&5
+-$as_echo "$ac_cv_member_struct_passwd_pw_age" >&6; }
+-if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_age" >&5
++echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_age" >&6; }
++if test $ac_cv_member_struct_passwd_pw_age = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PASSWD_PW_AGE 1
+@@ -75904,10 +72006,10 @@
+ 
+ # AIX 4.3.x and 5.1 do not have as many members in
+ # struct secmethod_table as AIX 5.2
+-{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_attrlist" >&5
+-$as_echo_n "checking for struct secmethod_table.method_attrlist... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct secmethod_table.method_attrlist" >&5
++echo $ECHO_N "checking for struct secmethod_table.method_attrlist... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_secmethod_table_method_attrlist+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -75933,21 +72035,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_secmethod_table_method_attrlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -75974,21 +72075,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_secmethod_table_method_attrlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_secmethod_table_method_attrlist=no
+@@ -75999,9 +72099,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_attrlist" >&5
+-$as_echo "$ac_cv_member_struct_secmethod_table_method_attrlist" >&6; }
+-if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_attrlist" >&5
++echo "${ECHO_T}$ac_cv_member_struct_secmethod_table_method_attrlist" >&6; }
++if test $ac_cv_member_struct_secmethod_table_method_attrlist = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
+@@ -76010,10 +72110,10 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_version" >&5
+-$as_echo_n "checking for struct secmethod_table.method_version... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct secmethod_table.method_version" >&5
++echo $ECHO_N "checking for struct secmethod_table.method_version... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_secmethod_table_method_version+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -76039,21 +72139,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_secmethod_table_method_version=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -76080,21 +72179,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_member_struct_secmethod_table_method_version=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_member_struct_secmethod_table_method_version=no
+@@ -76105,9 +72203,9 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
+-$as_echo "$ac_cv_member_struct_secmethod_table_method_version" >&6; }
+-if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
++echo "${ECHO_T}$ac_cv_member_struct_secmethod_table_method_version" >&6; }
++if test $ac_cv_member_struct_secmethod_table_method_version = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
+@@ -76117,10 +72215,10 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for SO_PEERCRED" >&5
+-$as_echo_n "checking for SO_PEERCRED... " >&6; }
++{ echo "$as_me:$LINENO: checking for SO_PEERCRED" >&5
++echo $ECHO_N "checking for SO_PEERCRED... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_PEERCRED+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -76148,21 +72246,20 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   samba_cv_HAVE_PEERCRED=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	samba_cv_HAVE_PEERCRED=no
+@@ -76170,8 +72267,8 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_PEERCRED" >&5
+-$as_echo "$samba_cv_HAVE_PEERCRED" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_PEERCRED" >&5
++echo "${ECHO_T}$samba_cv_HAVE_PEERCRED" >&6; }
+ if test x"$samba_cv_HAVE_PEERCRED" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -76199,10 +72296,10 @@
+ fi
+ 
+ if test x"$INCLUDED_POPT" != x"yes"; then
+-    { $as_echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5
+-$as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
++    { echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5
++echo $ECHO_N "checking for poptGetContext in -lpopt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpopt  $LIBS"
+@@ -76234,37 +72331,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_popt_poptGetContext=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_popt_poptGetContext=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetContext" >&5
+-$as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
+-if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetContext" >&5
++echo "${ECHO_T}$ac_cv_lib_popt_poptGetContext" >&6; }
++if test $ac_cv_lib_popt_poptGetContext = yes; then
+   INCLUDED_POPT=no
+ else
+   INCLUDED_POPT=yes
+@@ -76272,17 +72365,17 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to use included popt" >&5
+-$as_echo_n "checking whether to use included popt... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use included popt" >&5
++echo $ECHO_N "checking whether to use included popt... $ECHO_C" >&6; }
+ if test x"$INCLUDED_POPT" = x"yes"; then
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     BUILD_POPT='$(POPT_OBJ)'
+     POPTLIBS='$(POPT_OBJ)'
+     FLAGS1="-I\$(srcdir)/popt"
+ else
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	BUILD_POPT=""
+     POPTLIBS="-lpopt"
+ fi
+@@ -76306,21 +72399,20 @@
+ 
+ for ac_header in dns_sd.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -76336,33 +72428,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -76376,52 +72467,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -76430,24 +72520,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -76463,11 +72550,11 @@
+ 
+ for ac_func in DNSServiceRegister
+ do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -76520,42 +72607,35 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -76570,10 +72650,10 @@
+ 
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for DNSServiceRegister in -ldns_sd" >&5
+-$as_echo_n "checking for DNSServiceRegister in -ldns_sd... " >&6; }
++        { echo "$as_me:$LINENO: checking for DNSServiceRegister in -ldns_sd" >&5
++echo $ECHO_N "checking for DNSServiceRegister in -ldns_sd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ext_dns_sd_DNSServiceRegister+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -76603,38 +72683,34 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ext_dns_sd_DNSServiceRegister=yes;
+ 		  ac_cv_lib_ext_dns_sd=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_ext_dns_sd_DNSServiceRegister=no;
+ 		  ac_cv_lib_ext_dns_sd=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_dns_sd_DNSServiceRegister" >&5
+-$as_echo "$ac_cv_lib_ext_dns_sd_DNSServiceRegister" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ext_dns_sd_DNSServiceRegister" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_dns_sd_DNSServiceRegister" >&6; }
+     if test $ac_cv_lib_ext_dns_sd_DNSServiceRegister = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DNSSERVICEREGISTER 1
+@@ -76673,8 +72749,8 @@
+ 
+     else
+     	if test x"$enable_dnssd" = x"yes"; then
+-	    { { $as_echo "$as_me:$LINENO: error: DNS service discovery support not available" >&5
+-$as_echo "$as_me: error: DNS service discovery support not available" >&2;}
++	    { { echo "$as_me:$LINENO: error: DNS service discovery support not available" >&5
++echo "$as_me: error: DNS service discovery support not available" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+     fi
+@@ -76699,10 +72775,10 @@
+ fi
+ 
+ if test x"$INCLUDED_INIPARSER" != x"yes"; then
+-    { $as_echo "$as_me:$LINENO: checking for iniparser_load in -liniparser" >&5
+-$as_echo_n "checking for iniparser_load in -liniparser... " >&6; }
++    { echo "$as_me:$LINENO: checking for iniparser_load in -liniparser" >&5
++echo $ECHO_N "checking for iniparser_load in -liniparser... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_iniparser_iniparser_load+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liniparser  $LIBS"
+@@ -76734,37 +72810,33 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_iniparser_iniparser_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_iniparser_iniparser_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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iniparser_iniparser_load" >&5
+-$as_echo "$ac_cv_lib_iniparser_iniparser_load" >&6; }
+-if test "x$ac_cv_lib_iniparser_iniparser_load" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_iniparser_iniparser_load" >&5
++echo "${ECHO_T}$ac_cv_lib_iniparser_iniparser_load" >&6; }
++if test $ac_cv_lib_iniparser_iniparser_load = yes; then
+   INCLUDED_INIPARSER=no
+ else
+   INCLUDED_INIPARSER=yes
+@@ -76772,17 +72844,17 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to use included iniparser" >&5
+-$as_echo_n "checking whether to use included iniparser... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to use included iniparser" >&5
++echo $ECHO_N "checking whether to use included iniparser... $ECHO_C" >&6; }
+ if test x"$INCLUDED_INIPARSER" = x"yes"; then
+-    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+     BUILD_INIPARSER='$(INIPARSER_OBJ)'
+ 	INIPARSERLIBS=""
+     FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
+ else
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	BUILD_INIPARSER=""
+     INIPARSERLIBS="-liniparser"
+ fi
+@@ -76794,10 +72866,10 @@
+ 
+ # Checks for the vfs_fileid module
+ # Start
+-{ $as_echo "$as_me:$LINENO: checking for getmntent" >&5
+-$as_echo_n "checking for getmntent... " >&6; }
++{ echo "$as_me:$LINENO: checking for getmntent" >&5
++echo $ECHO_N "checking for getmntent... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getmntent+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -76850,55 +72922,50 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_getmntent=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_func_getmntent=no
+ fi
+ 
+-rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getmntent" >&5
+-$as_echo "$ac_cv_func_getmntent" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getmntent" >&5
++echo "${ECHO_T}$ac_cv_func_getmntent" >&6; }
+ 
+ 
+ 
+ for ac_header in sys/statfs.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -76914,33 +72981,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_header_compiler=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -76954,52 +73020,51 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then
+   ac_header_preproc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
+ 
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+     ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -77008,24 +73073,21 @@
+      ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -77033,10 +73095,10 @@
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)" >&5
+-$as_echo_n "checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)... " >&6; }
++{ echo "$as_me:$LINENO: checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)" >&5
++echo $ECHO_N "checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)... $ECHO_C" >&6; }
+ if test "${vfsfileid_cv_statfs+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	     if test "$cross_compiling" = yes; then
+@@ -77064,32 +73126,29 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   vfsfileid_cv_statfs=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ vfsfileid_cv_statfs=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
+ 
+@@ -77097,8 +73156,8 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $vfsfileid_cv_statfs" >&5
+-$as_echo "$vfsfileid_cv_statfs" >&6; }
++{ echo "$as_me:$LINENO: result: $vfsfileid_cv_statfs" >&5
++echo "${ECHO_T}$vfsfileid_cv_statfs" >&6; }
+ 
+ if test x"$ac_cv_func_getmntent" = x"yes" -a \
+ 	x"$vfsfileid_cv_statfs" = x"yes"; then
+@@ -77155,8 +73214,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build pdb_ldap" >&5
+-$as_echo_n "checking how to build pdb_ldap... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build pdb_ldap" >&5
++echo $ECHO_N "checking how to build pdb_ldap... $ECHO_C" >&6; }
+ 	if test "$MODULE_pdb_ldap"; then
+ 		DEST=$MODULE_pdb_ldap
+ 	elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_ldap"; then
+@@ -77172,8 +73231,8 @@
+ _ACEOF
+ 
+ 		PDB_MODULES="$PDB_MODULES "bin/ldapsam.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules pdb_ldap"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77183,17 +73242,17 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
+ 
+ 		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules pdb_ldap"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build pdb_smbpasswd" >&5
+-$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build pdb_smbpasswd" >&5
++echo $ECHO_N "checking how to build pdb_smbpasswd... $ECHO_C" >&6; }
+ 	if test "$MODULE_pdb_smbpasswd"; then
+ 		DEST=$MODULE_pdb_smbpasswd
+ 	elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_smbpasswd"; then
+@@ -77209,8 +73268,8 @@
+ _ACEOF
+ 
+ 		PDB_MODULES="$PDB_MODULES "bin/smbpasswd.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules pdb_smbpasswd"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77220,17 +73279,17 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules pdb_smbpasswd"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build pdb_tdbsam" >&5
+-$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build pdb_tdbsam" >&5
++echo $ECHO_N "checking how to build pdb_tdbsam... $ECHO_C" >&6; }
+ 	if test "$MODULE_pdb_tdbsam"; then
+ 		DEST=$MODULE_pdb_tdbsam
+ 	elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_tdbsam"; then
+@@ -77246,8 +73305,8 @@
+ _ACEOF
+ 
+ 		PDB_MODULES="$PDB_MODULES "bin/tdbsam.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules pdb_tdbsam"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77257,12 +73316,12 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules pdb_tdbsam"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -77283,8 +73342,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_lsarpc" >&5
+-$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_lsarpc" >&5
++echo $ECHO_N "checking how to build rpc_lsarpc... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_lsarpc"; then
+ 		DEST=$MODULE_rpc_lsarpc
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_lsarpc"; then
+@@ -77300,8 +73359,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_lsarpc.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_lsarpc"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77311,17 +73370,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_lsarpc"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_winreg" >&5
+-$as_echo_n "checking how to build rpc_winreg... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_winreg" >&5
++echo $ECHO_N "checking how to build rpc_winreg... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_winreg"; then
+ 		DEST=$MODULE_rpc_winreg
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_winreg"; then
+@@ -77337,8 +73396,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_winreg.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_winreg"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77348,17 +73407,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_winreg"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_initshutdown" >&5
+-$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_initshutdown" >&5
++echo $ECHO_N "checking how to build rpc_initshutdown... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_initshutdown"; then
+ 		DEST=$MODULE_rpc_initshutdown
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_initshutdown"; then
+@@ -77374,8 +73433,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_initshutdown.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_initshutdown"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77385,17 +73444,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_initshutdown"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_dssetup" >&5
+-$as_echo_n "checking how to build rpc_dssetup... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_dssetup" >&5
++echo $ECHO_N "checking how to build rpc_dssetup... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_dssetup"; then
+ 		DEST=$MODULE_rpc_dssetup
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_dssetup"; then
+@@ -77411,8 +73470,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_dssetup.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_dssetup"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77422,17 +73481,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_dssetup"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_wkssvc" >&5
+-$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_wkssvc" >&5
++echo $ECHO_N "checking how to build rpc_wkssvc... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_wkssvc"; then
+ 		DEST=$MODULE_rpc_wkssvc
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_wkssvc"; then
+@@ -77448,8 +73507,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_wkssvc.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_wkssvc"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77459,17 +73518,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_wkssvc"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_svcctl2" >&5
+-$as_echo_n "checking how to build rpc_svcctl2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_svcctl2" >&5
++echo $ECHO_N "checking how to build rpc_svcctl2... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_svcctl2"; then
+ 		DEST=$MODULE_rpc_svcctl2
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_svcctl2"; then
+@@ -77485,8 +73544,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_svcctl2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_svcctl2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77496,17 +73555,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_svcctl2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_ntsvcs2" >&5
+-$as_echo_n "checking how to build rpc_ntsvcs2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_ntsvcs2" >&5
++echo $ECHO_N "checking how to build rpc_ntsvcs2... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_ntsvcs2"; then
+ 		DEST=$MODULE_rpc_ntsvcs2
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_ntsvcs2"; then
+@@ -77522,8 +73581,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_ntsvcs2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_ntsvcs2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77533,17 +73592,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_ntsvcs2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_netlogon" >&5
+-$as_echo_n "checking how to build rpc_netlogon... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_netlogon" >&5
++echo $ECHO_N "checking how to build rpc_netlogon... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_netlogon"; then
+ 		DEST=$MODULE_rpc_netlogon
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_netlogon"; then
+@@ -77559,8 +73618,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_NETLOGON.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_netlogon"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77570,17 +73629,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_netlogon"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_netdfs" >&5
+-$as_echo_n "checking how to build rpc_netdfs... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_netdfs" >&5
++echo $ECHO_N "checking how to build rpc_netdfs... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_netdfs"; then
+ 		DEST=$MODULE_rpc_netdfs
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_netdfs"; then
+@@ -77596,8 +73655,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_netdfs.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_netdfs"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77607,17 +73666,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_netdfs"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_srvsvc" >&5
+-$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_srvsvc" >&5
++echo $ECHO_N "checking how to build rpc_srvsvc... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_srvsvc"; then
+ 		DEST=$MODULE_rpc_srvsvc
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_srvsvc"; then
+@@ -77633,8 +73692,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_svcsvc.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_srvsvc"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77644,17 +73703,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_srvsvc"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_spoolss" >&5
+-$as_echo_n "checking how to build rpc_spoolss... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_spoolss" >&5
++echo $ECHO_N "checking how to build rpc_spoolss... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_spoolss"; then
+ 		DEST=$MODULE_rpc_spoolss
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_spoolss"; then
+@@ -77670,8 +73729,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_spoolss.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_spoolss"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77681,17 +73740,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_spoolss"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_eventlog2" >&5
+-$as_echo_n "checking how to build rpc_eventlog2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_eventlog2" >&5
++echo $ECHO_N "checking how to build rpc_eventlog2... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_eventlog2"; then
+ 		DEST=$MODULE_rpc_eventlog2
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_eventlog2"; then
+@@ -77707,8 +73766,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_eventlog2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_eventlog2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77718,17 +73777,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_eventlog2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_samr" >&5
+-$as_echo_n "checking how to build rpc_samr... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_samr" >&5
++echo $ECHO_N "checking how to build rpc_samr... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_samr"; then
+ 		DEST=$MODULE_rpc_samr
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_samr"; then
+@@ -77744,8 +73803,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_samr.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_samr"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77755,17 +73814,17 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_samr"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build rpc_rpcecho" >&5
+-$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build rpc_rpcecho" >&5
++echo $ECHO_N "checking how to build rpc_rpcecho... $ECHO_C" >&6; }
+ 	if test "$MODULE_rpc_rpcecho"; then
+ 		DEST=$MODULE_rpc_rpcecho
+ 	elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_rpcecho"; then
+@@ -77781,8 +73840,8 @@
+ _ACEOF
+ 
+ 		RPC_MODULES="$RPC_MODULES "bin/librpc_rpcecho.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules rpc_rpcecho"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77792,12 +73851,12 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules rpc_rpcecho"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -77817,8 +73876,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_ldap" >&5
+-$as_echo_n "checking how to build idmap_ldap... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_ldap" >&5
++echo $ECHO_N "checking how to build idmap_ldap... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_ldap"; then
+ 		DEST=$MODULE_idmap_ldap
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_ldap"; then
+@@ -77834,8 +73893,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/ldap.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_ldap"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77845,17 +73904,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_ldap"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_tdb" >&5
+-$as_echo_n "checking how to build idmap_tdb... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_tdb" >&5
++echo $ECHO_N "checking how to build idmap_tdb... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_tdb"; then
+ 		DEST=$MODULE_idmap_tdb
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_tdb"; then
+@@ -77871,8 +73930,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/tdb.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_tdb"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77882,17 +73941,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_tdb"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_tdb2" >&5
+-$as_echo_n "checking how to build idmap_tdb2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_tdb2" >&5
++echo $ECHO_N "checking how to build idmap_tdb2... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_tdb2"; then
+ 		DEST=$MODULE_idmap_tdb2
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_tdb2"; then
+@@ -77908,8 +73967,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/tdb2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_tdb2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77919,17 +73978,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_tdb2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_passdb" >&5
+-$as_echo_n "checking how to build idmap_passdb... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_passdb" >&5
++echo $ECHO_N "checking how to build idmap_passdb... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_passdb"; then
+ 		DEST=$MODULE_idmap_passdb
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_passdb"; then
+@@ -77945,8 +74004,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/passdb.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_passdb"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77956,17 +74015,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_passdb"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_nss" >&5
+-$as_echo_n "checking how to build idmap_nss... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_nss" >&5
++echo $ECHO_N "checking how to build idmap_nss... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_nss"; then
+ 		DEST=$MODULE_idmap_nss
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_nss"; then
+@@ -77982,8 +74041,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/nss.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_nss"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -77993,17 +74052,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_nss"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_rid" >&5
+-$as_echo_n "checking how to build idmap_rid... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_rid" >&5
++echo $ECHO_N "checking how to build idmap_rid... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_rid"; then
+ 		DEST=$MODULE_idmap_rid
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_rid"; then
+@@ -78019,8 +74078,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/rid.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_rid"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78030,17 +74089,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_rid"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_ad" >&5
+-$as_echo_n "checking how to build idmap_ad... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_ad" >&5
++echo $ECHO_N "checking how to build idmap_ad... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_ad"; then
+ 		DEST=$MODULE_idmap_ad
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_ad"; then
+@@ -78056,8 +74115,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/ad.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_ad"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78067,17 +74126,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_ad"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_hash" >&5
+-$as_echo_n "checking how to build idmap_hash... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_hash" >&5
++echo $ECHO_N "checking how to build idmap_hash... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_hash"; then
+ 		DEST=$MODULE_idmap_hash
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_hash"; then
+@@ -78093,8 +74152,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/hash.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_hash"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78104,17 +74163,17 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_hash"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build idmap_adex" >&5
+-$as_echo_n "checking how to build idmap_adex... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build idmap_adex" >&5
++echo $ECHO_N "checking how to build idmap_adex... $ECHO_C" >&6; }
+ 	if test "$MODULE_idmap_adex"; then
+ 		DEST=$MODULE_idmap_adex
+ 	elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_adex"; then
+@@ -78130,8 +74189,8 @@
+ _ACEOF
+ 
+ 		IDMAP_MODULES="$IDMAP_MODULES "bin/adex.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules idmap_adex"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78141,12 +74200,12 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules idmap_adex"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -78166,8 +74225,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build nss_info_template" >&5
+-$as_echo_n "checking how to build nss_info_template... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build nss_info_template" >&5
++echo $ECHO_N "checking how to build nss_info_template... $ECHO_C" >&6; }
+ 	if test "$MODULE_nss_info_template"; then
+ 		DEST=$MODULE_nss_info_template
+ 	elif test "$MODULE_nss_info" -a "$MODULE_DEFAULT_nss_info_template"; then
+@@ -78183,8 +74242,8 @@
+ _ACEOF
+ 
+ 		NSS_INFO_MODULES="$NSS_INFO_MODULES "bin/template.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules nss_info_template"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78194,12 +74253,12 @@
+ 		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules nss_info_template"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -78219,8 +74278,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build charset_weird" >&5
+-$as_echo_n "checking how to build charset_weird... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build charset_weird" >&5
++echo $ECHO_N "checking how to build charset_weird... $ECHO_C" >&6; }
+ 	if test "$MODULE_charset_weird"; then
+ 		DEST=$MODULE_charset_weird
+ 	elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_weird"; then
+@@ -78236,8 +74295,8 @@
+ _ACEOF
+ 
+ 		CHARSET_MODULES="$CHARSET_MODULES "bin/weird.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules charset_weird"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78247,17 +74306,17 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules charset_weird"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build charset_CP850" >&5
+-$as_echo_n "checking how to build charset_CP850... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build charset_CP850" >&5
++echo $ECHO_N "checking how to build charset_CP850... $ECHO_C" >&6; }
+ 	if test "$MODULE_charset_CP850"; then
+ 		DEST=$MODULE_charset_CP850
+ 	elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_CP850"; then
+@@ -78273,8 +74332,8 @@
+ _ACEOF
+ 
+ 		CHARSET_MODULES="$CHARSET_MODULES "bin/CP850.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules charset_CP850"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78284,17 +74343,17 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules charset_CP850"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build charset_CP437" >&5
+-$as_echo_n "checking how to build charset_CP437... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build charset_CP437" >&5
++echo $ECHO_N "checking how to build charset_CP437... $ECHO_C" >&6; }
+ 	if test "$MODULE_charset_CP437"; then
+ 		DEST=$MODULE_charset_CP437
+ 	elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_CP437"; then
+@@ -78310,8 +74369,8 @@
+ _ACEOF
+ 
+ 		CHARSET_MODULES="$CHARSET_MODULES "bin/CP437.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules charset_CP437"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78321,17 +74380,17 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules charset_CP437"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build charset_macosxfs" >&5
+-$as_echo_n "checking how to build charset_macosxfs... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build charset_macosxfs" >&5
++echo $ECHO_N "checking how to build charset_macosxfs... $ECHO_C" >&6; }
+ 	if test "$MODULE_charset_macosxfs"; then
+ 		DEST=$MODULE_charset_macosxfs
+ 	elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_macosxfs"; then
+@@ -78347,8 +74406,8 @@
+ _ACEOF
+ 
+ 		CHARSET_MODULES="$CHARSET_MODULES "bin/macosxfs.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules charset_macosxfs"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78358,12 +74417,12 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules charset_macosxfs"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -78383,8 +74442,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_sam" >&5
+-$as_echo_n "checking how to build auth_sam... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_sam" >&5
++echo $ECHO_N "checking how to build auth_sam... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_sam"; then
+ 		DEST=$MODULE_auth_sam
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_sam"; then
+@@ -78400,8 +74459,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/sam.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_sam"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78411,17 +74470,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_sam"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_unix" >&5
+-$as_echo_n "checking how to build auth_unix... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_unix" >&5
++echo $ECHO_N "checking how to build auth_unix... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_unix"; then
+ 		DEST=$MODULE_auth_unix
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_unix"; then
+@@ -78437,8 +74496,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/unix.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_unix"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78448,17 +74507,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_unix"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_winbind" >&5
+-$as_echo_n "checking how to build auth_winbind... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_winbind" >&5
++echo $ECHO_N "checking how to build auth_winbind... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_winbind"; then
+ 		DEST=$MODULE_auth_winbind
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_winbind"; then
+@@ -78474,8 +74533,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/winbind.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_winbind"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78485,17 +74544,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_winbind"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_server" >&5
+-$as_echo_n "checking how to build auth_server... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_server" >&5
++echo $ECHO_N "checking how to build auth_server... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_server"; then
+ 		DEST=$MODULE_auth_server
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_server"; then
+@@ -78511,8 +74570,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/smbserver.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_server"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78522,17 +74581,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_server"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_domain" >&5
+-$as_echo_n "checking how to build auth_domain... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_domain" >&5
++echo $ECHO_N "checking how to build auth_domain... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_domain"; then
+ 		DEST=$MODULE_auth_domain
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_domain"; then
+@@ -78548,8 +74607,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/domain.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_domain"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78559,17 +74618,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_domain"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_builtin" >&5
+-$as_echo_n "checking how to build auth_builtin... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_builtin" >&5
++echo $ECHO_N "checking how to build auth_builtin... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_builtin"; then
+ 		DEST=$MODULE_auth_builtin
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_builtin"; then
+@@ -78585,8 +74644,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/builtin.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_builtin"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78596,17 +74655,17 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_builtin"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build auth_script" >&5
+-$as_echo_n "checking how to build auth_script... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build auth_script" >&5
++echo $ECHO_N "checking how to build auth_script... $ECHO_C" >&6; }
+ 	if test "$MODULE_auth_script"; then
+ 		DEST=$MODULE_auth_script
+ 	elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_script"; then
+@@ -78622,8 +74681,8 @@
+ _ACEOF
+ 
+ 		AUTH_MODULES="$AUTH_MODULES "bin/script.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules auth_script"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78633,12 +74692,12 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules auth_script"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -78658,8 +74717,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_default" >&5
+-$as_echo_n "checking how to build vfs_default... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_default" >&5
++echo $ECHO_N "checking how to build vfs_default... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_default"; then
+ 		DEST=$MODULE_vfs_default
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_default"; then
+@@ -78675,8 +74734,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/default.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_default"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78686,17 +74745,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_default"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_recycle" >&5
+-$as_echo_n "checking how to build vfs_recycle... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_recycle" >&5
++echo $ECHO_N "checking how to build vfs_recycle... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_recycle"; then
+ 		DEST=$MODULE_vfs_recycle
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_recycle"; then
+@@ -78712,8 +74771,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/recycle.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_recycle"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78723,17 +74782,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_recycle"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_audit" >&5
+-$as_echo_n "checking how to build vfs_audit... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_audit" >&5
++echo $ECHO_N "checking how to build vfs_audit... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_audit"; then
+ 		DEST=$MODULE_vfs_audit
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_audit"; then
+@@ -78749,8 +74808,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/audit.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_audit"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78760,17 +74819,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_audit"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_extd_audit" >&5
+-$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_extd_audit" >&5
++echo $ECHO_N "checking how to build vfs_extd_audit... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_extd_audit"; then
+ 		DEST=$MODULE_vfs_extd_audit
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_extd_audit"; then
+@@ -78786,8 +74845,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/extd_audit.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_extd_audit"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78797,17 +74856,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_extd_audit"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_full_audit" >&5
+-$as_echo_n "checking how to build vfs_full_audit... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_full_audit" >&5
++echo $ECHO_N "checking how to build vfs_full_audit... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_full_audit"; then
+ 		DEST=$MODULE_vfs_full_audit
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_full_audit"; then
+@@ -78823,8 +74882,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/full_audit.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_full_audit"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78834,17 +74893,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_full_audit"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_netatalk" >&5
+-$as_echo_n "checking how to build vfs_netatalk... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_netatalk" >&5
++echo $ECHO_N "checking how to build vfs_netatalk... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_netatalk"; then
+ 		DEST=$MODULE_vfs_netatalk
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_netatalk"; then
+@@ -78860,8 +74919,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/netatalk.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_netatalk"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78871,17 +74930,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_netatalk"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_fake_perms" >&5
+-$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_fake_perms" >&5
++echo $ECHO_N "checking how to build vfs_fake_perms... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_fake_perms"; then
+ 		DEST=$MODULE_vfs_fake_perms
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_fake_perms"; then
+@@ -78897,8 +74956,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/fake_perms.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_fake_perms"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78908,17 +74967,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_fake_perms"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_default_quota" >&5
+-$as_echo_n "checking how to build vfs_default_quota... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_default_quota" >&5
++echo $ECHO_N "checking how to build vfs_default_quota... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_default_quota"; then
+ 		DEST=$MODULE_vfs_default_quota
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_default_quota"; then
+@@ -78934,8 +74993,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/default_quota.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_default_quota"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78945,17 +75004,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_default_quota"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_readonly" >&5
+-$as_echo_n "checking how to build vfs_readonly... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_readonly" >&5
++echo $ECHO_N "checking how to build vfs_readonly... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_readonly"; then
+ 		DEST=$MODULE_vfs_readonly
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_readonly"; then
+@@ -78971,8 +75030,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/readonly.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_readonly"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -78982,17 +75041,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_readonly"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_cap" >&5
+-$as_echo_n "checking how to build vfs_cap... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_cap" >&5
++echo $ECHO_N "checking how to build vfs_cap... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_cap"; then
+ 		DEST=$MODULE_vfs_cap
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_cap"; then
+@@ -79008,8 +75067,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/cap.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_cap"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79019,17 +75078,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_cap"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_expand_msdfs" >&5
+-$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_expand_msdfs" >&5
++echo $ECHO_N "checking how to build vfs_expand_msdfs... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_expand_msdfs"; then
+ 		DEST=$MODULE_vfs_expand_msdfs
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_expand_msdfs"; then
+@@ -79045,8 +75104,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/expand_msdfs.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_expand_msdfs"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79056,17 +75115,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_expand_msdfs"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_shadow_copy" >&5
+-$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_shadow_copy" >&5
++echo $ECHO_N "checking how to build vfs_shadow_copy... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_shadow_copy"; then
+ 		DEST=$MODULE_vfs_shadow_copy
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_shadow_copy"; then
+@@ -79082,8 +75141,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/shadow_copy.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_shadow_copy"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79093,17 +75152,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_shadow_copy"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_shadow_copy2" >&5
+-$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_shadow_copy2" >&5
++echo $ECHO_N "checking how to build vfs_shadow_copy2... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_shadow_copy2"; then
+ 		DEST=$MODULE_vfs_shadow_copy2
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_shadow_copy2"; then
+@@ -79119,8 +75178,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/shadow_copy2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_shadow_copy2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79130,17 +75189,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_shadow_copy2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_afsacl" >&5
+-$as_echo_n "checking how to build vfs_afsacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_afsacl" >&5
++echo $ECHO_N "checking how to build vfs_afsacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_afsacl"; then
+ 		DEST=$MODULE_vfs_afsacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_afsacl"; then
+@@ -79156,8 +75215,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/afsacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_afsacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79167,17 +75226,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_afsacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_xattr_tdb" >&5
+-$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_xattr_tdb" >&5
++echo $ECHO_N "checking how to build vfs_xattr_tdb... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_xattr_tdb"; then
+ 		DEST=$MODULE_vfs_xattr_tdb
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_xattr_tdb"; then
+@@ -79193,8 +75252,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/xattr_tdb.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_xattr_tdb"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79204,17 +75263,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_xattr_tdb"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_posixacl" >&5
+-$as_echo_n "checking how to build vfs_posixacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_posixacl" >&5
++echo $ECHO_N "checking how to build vfs_posixacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_posixacl"; then
+ 		DEST=$MODULE_vfs_posixacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_posixacl"; then
+@@ -79230,8 +75289,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/posixacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_posixacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79241,17 +75300,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_posixacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_aixacl" >&5
+-$as_echo_n "checking how to build vfs_aixacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_aixacl" >&5
++echo $ECHO_N "checking how to build vfs_aixacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_aixacl"; then
+ 		DEST=$MODULE_vfs_aixacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aixacl"; then
+@@ -79267,8 +75326,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/aixacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_aixacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79278,17 +75337,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_aixacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_aixacl2" >&5
+-$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_aixacl2" >&5
++echo $ECHO_N "checking how to build vfs_aixacl2... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_aixacl2"; then
+ 		DEST=$MODULE_vfs_aixacl2
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aixacl2"; then
+@@ -79304,8 +75363,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/aixacl2.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_aixacl2"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79315,17 +75374,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_aixacl2"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_solarisacl" >&5
+-$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_solarisacl" >&5
++echo $ECHO_N "checking how to build vfs_solarisacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_solarisacl"; then
+ 		DEST=$MODULE_vfs_solarisacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_solarisacl"; then
+@@ -79341,8 +75400,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/solarisacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_solarisacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79352,17 +75411,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_solarisacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_irixacl" >&5
+-$as_echo_n "checking how to build vfs_irixacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_irixacl" >&5
++echo $ECHO_N "checking how to build vfs_irixacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_irixacl"; then
+ 		DEST=$MODULE_vfs_irixacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_irixacl"; then
+@@ -79378,8 +75437,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/irixacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_irixacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79389,17 +75448,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_irixacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_hpuxacl" >&5
+-$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_hpuxacl" >&5
++echo $ECHO_N "checking how to build vfs_hpuxacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_hpuxacl"; then
+ 		DEST=$MODULE_vfs_hpuxacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_hpuxacl"; then
+@@ -79415,8 +75474,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/hpuxacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_hpuxacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79426,17 +75485,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_hpuxacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_tru64acl" >&5
+-$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_tru64acl" >&5
++echo $ECHO_N "checking how to build vfs_tru64acl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_tru64acl"; then
+ 		DEST=$MODULE_vfs_tru64acl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_tru64acl"; then
+@@ -79452,8 +75511,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/tru64acl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_tru64acl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79463,17 +75522,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_tru64acl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_catia" >&5
+-$as_echo_n "checking how to build vfs_catia... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_catia" >&5
++echo $ECHO_N "checking how to build vfs_catia... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_catia"; then
+ 		DEST=$MODULE_vfs_catia
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_catia"; then
+@@ -79489,8 +75548,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/catia.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_catia"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79500,17 +75559,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_catia"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_streams_xattr" >&5
+-$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_streams_xattr" >&5
++echo $ECHO_N "checking how to build vfs_streams_xattr... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_streams_xattr"; then
+ 		DEST=$MODULE_vfs_streams_xattr
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_streams_xattr"; then
+@@ -79526,8 +75585,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/streams_xattr.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_streams_xattr"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79537,17 +75596,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_streams_xattr"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_streams_depot" >&5
+-$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_streams_depot" >&5
++echo $ECHO_N "checking how to build vfs_streams_depot... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_streams_depot"; then
+ 		DEST=$MODULE_vfs_streams_depot
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_streams_depot"; then
+@@ -79563,8 +75622,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/streams_depot.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_streams_depot"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79574,17 +75633,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_streams_depot"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_cacheprime" >&5
+-$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_cacheprime" >&5
++echo $ECHO_N "checking how to build vfs_cacheprime... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_cacheprime"; then
+ 		DEST=$MODULE_vfs_cacheprime
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_cacheprime"; then
+@@ -79600,8 +75659,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/cacheprime.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_cacheprime"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79611,17 +75670,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_cacheprime"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_prealloc" >&5
+-$as_echo_n "checking how to build vfs_prealloc... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_prealloc" >&5
++echo $ECHO_N "checking how to build vfs_prealloc... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_prealloc"; then
+ 		DEST=$MODULE_vfs_prealloc
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_prealloc"; then
+@@ -79637,8 +75696,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/prealloc.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_prealloc"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79648,17 +75707,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_prealloc"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_commit" >&5
+-$as_echo_n "checking how to build vfs_commit... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_commit" >&5
++echo $ECHO_N "checking how to build vfs_commit... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_commit"; then
+ 		DEST=$MODULE_vfs_commit
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_commit"; then
+@@ -79674,8 +75733,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/commit.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_commit"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79685,17 +75744,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_commit"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_gpfs" >&5
+-$as_echo_n "checking how to build vfs_gpfs... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_gpfs" >&5
++echo $ECHO_N "checking how to build vfs_gpfs... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_gpfs"; then
+ 		DEST=$MODULE_vfs_gpfs
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_gpfs"; then
+@@ -79711,8 +75770,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/gpfs.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_gpfs"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79722,17 +75781,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_gpfs"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_readahead" >&5
+-$as_echo_n "checking how to build vfs_readahead... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_readahead" >&5
++echo $ECHO_N "checking how to build vfs_readahead... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_readahead"; then
+ 		DEST=$MODULE_vfs_readahead
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_readahead"; then
+@@ -79748,8 +75807,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/readahead.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_readahead"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79759,17 +75818,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_readahead"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_tsmsm" >&5
+-$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_tsmsm" >&5
++echo $ECHO_N "checking how to build vfs_tsmsm... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_tsmsm"; then
+ 		DEST=$MODULE_vfs_tsmsm
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_tsmsm"; then
+@@ -79785,8 +75844,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/tsmsm.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_tsmsm"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79796,17 +75855,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_tsmsm"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_fileid" >&5
+-$as_echo_n "checking how to build vfs_fileid... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_fileid" >&5
++echo $ECHO_N "checking how to build vfs_fileid... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_fileid"; then
+ 		DEST=$MODULE_vfs_fileid
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_fileid"; then
+@@ -79822,8 +75881,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/fileid.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_fileid"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79833,17 +75892,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_fileid"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_aio_fork" >&5
+-$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_aio_fork" >&5
++echo $ECHO_N "checking how to build vfs_aio_fork... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_aio_fork"; then
+ 		DEST=$MODULE_vfs_aio_fork
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aio_fork"; then
+@@ -79859,8 +75918,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/aio_fork.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_aio_fork"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79870,17 +75929,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_aio_fork"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_syncops" >&5
+-$as_echo_n "checking how to build vfs_syncops... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_syncops" >&5
++echo $ECHO_N "checking how to build vfs_syncops... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_syncops"; then
+ 		DEST=$MODULE_vfs_syncops
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_syncops"; then
+@@ -79896,8 +75955,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/syncops.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_syncops"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79907,17 +75966,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_syncops"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_zfsacl" >&5
+-$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_zfsacl" >&5
++echo $ECHO_N "checking how to build vfs_zfsacl... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_zfsacl"; then
+ 		DEST=$MODULE_vfs_zfsacl
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_zfsacl"; then
+@@ -79933,8 +75992,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/zfsacl.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_zfsacl"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79944,17 +76003,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_zfsacl"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_notify_fam" >&5
+-$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_notify_fam" >&5
++echo $ECHO_N "checking how to build vfs_notify_fam... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_notify_fam"; then
+ 		DEST=$MODULE_vfs_notify_fam
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_notify_fam"; then
+@@ -79970,8 +76029,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/notify_fam.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_notify_fam"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -79981,17 +76040,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_notify_fam"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_acl_xattr" >&5
+-$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_acl_xattr" >&5
++echo $ECHO_N "checking how to build vfs_acl_xattr... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_acl_xattr"; then
+ 		DEST=$MODULE_vfs_acl_xattr
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_acl_xattr"; then
+@@ -80007,8 +76066,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/acl_xattr.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_acl_xattr"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80018,17 +76077,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_acl_xattr"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_acl_tdb" >&5
+-$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_acl_tdb" >&5
++echo $ECHO_N "checking how to build vfs_acl_tdb... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_acl_tdb"; then
+ 		DEST=$MODULE_vfs_acl_tdb
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_acl_tdb"; then
+@@ -80044,8 +76103,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/acl_tdb.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_acl_tdb"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80055,17 +76114,17 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_acl_tdb"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_smb_traffic_analyzer" >&5
+-$as_echo_n "checking how to build vfs_smb_traffic_analyzer... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build vfs_smb_traffic_analyzer" >&5
++echo $ECHO_N "checking how to build vfs_smb_traffic_analyzer... $ECHO_C" >&6; }
+ 	if test "$MODULE_vfs_smb_traffic_analyzer"; then
+ 		DEST=$MODULE_vfs_smb_traffic_analyzer
+ 	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_smb_traffic_analyzer"; then
+@@ -80081,8 +76140,8 @@
+ _ACEOF
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/smb_traffic_analyzer.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80092,12 +76151,12 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_smb_traffic_analyzer"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -80119,8 +76178,8 @@
+ 
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build gpext_registry" >&5
+-$as_echo_n "checking how to build gpext_registry... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build gpext_registry" >&5
++echo $ECHO_N "checking how to build gpext_registry... $ECHO_C" >&6; }
+ 	if test "$MODULE_gpext_registry"; then
+ 		DEST=$MODULE_gpext_registry
+ 	elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_registry"; then
+@@ -80136,8 +76195,8 @@
+ _ACEOF
+ 
+ 		GPEXT_MODULES="$GPEXT_MODULES "bin/registry.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules gpext_registry"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80147,17 +76206,17 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules gpext_registry"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build gpext_scripts" >&5
+-$as_echo_n "checking how to build gpext_scripts... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build gpext_scripts" >&5
++echo $ECHO_N "checking how to build gpext_scripts... $ECHO_C" >&6; }
+ 	if test "$MODULE_gpext_scripts"; then
+ 		DEST=$MODULE_gpext_scripts
+ 	elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_scripts"; then
+@@ -80173,8 +76232,8 @@
+ _ACEOF
+ 
+ 		GPEXT_MODULES="$GPEXT_MODULES "bin/scripts.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules gpext_scripts"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80184,17 +76243,17 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules gpext_scripts"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build gpext_security" >&5
+-$as_echo_n "checking how to build gpext_security... " >&6; }
++	{ echo "$as_me:$LINENO: checking how to build gpext_security" >&5
++echo $ECHO_N "checking how to build gpext_security... $ECHO_C" >&6; }
+ 	if test "$MODULE_gpext_security"; then
+ 		DEST=$MODULE_gpext_security
+ 	elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_security"; then
+@@ -80210,8 +76269,8 @@
+ _ACEOF
+ 
+ 		GPEXT_MODULES="$GPEXT_MODULES "bin/security.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
+-$as_echo "shared" >&6; }
++		{ echo "$as_me:$LINENO: result: shared" >&5
++echo "${ECHO_T}shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules gpext_security"
+ 	elif test x"$DEST" = xSTATIC; then
+@@ -80221,12 +76280,12 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
+-$as_echo "static" >&6; }
++		{ echo "$as_me:$LINENO: result: static" >&5
++echo "${ECHO_T}static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules gpext_security"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
+-$as_echo "not" >&6; }
++		{ echo "$as_me:$LINENO: result: not" >&5
++echo "${ECHO_T}not" >&6; }
+ 	fi
+ 
+ 
+@@ -80261,19 +76320,19 @@
+ #################################################
+ # If run from the build farm, enable NASTY hacks
+ #################################################
+-{ $as_echo "$as_me:$LINENO: checking whether to enable build farm hacks" >&5
+-$as_echo_n "checking whether to enable build farm hacks... " >&6; }
++{ echo "$as_me:$LINENO: checking whether to enable build farm hacks" >&5
++echo $ECHO_N "checking whether to enable build farm hacks... $ECHO_C" >&6; }
+ if test x"$RUN_FROM_BUILD_FARM" = x"yes"; then
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_BUILD_FARM_HACKS 1
+ _ACEOF
+ 
+ else
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ #################################################
+@@ -80289,12 +76348,12 @@
+     rt_signal_lease_works=yes
+     rt_signal_aio_works=yes
+ 
+-    { $as_echo "$as_me:$LINENO: checking if sigaction works with realtime signals" >&5
+-$as_echo_n "checking if sigaction works with realtime signals... " >&6; }
++    { echo "$as_me:$LINENO: checking if sigaction works with realtime signals" >&5
++echo $ECHO_N "checking if sigaction works with realtime signals... $ECHO_C" >&6; }
+     if test "$cross_compiling" = yes; then
+ 
+-	    { $as_echo "$as_me:$LINENO: result: cross" >&5
+-$as_echo "cross" >&6; }
++	    { echo "$as_me:$LINENO: result: cross" >&5
++echo "${ECHO_T}cross" >&6; }
+ 
+ 	    # cross compiling, I hope you know what you are doing
+ 	    true
+@@ -80367,30 +76426,28 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 	    # no RT_SIGNAL bug, we are golden
+ 
+-    { $as_echo "$as_me:$LINENO: checking if libpthread is linked" >&5
+-$as_echo_n "checking if libpthread is linked... " >&6; }
++    { echo "$as_me:$LINENO: checking if libpthread is linked" >&5
++echo $ECHO_N "checking if libpthread is linked... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -80412,41 +76469,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+-		    { $as_echo "$as_me:$LINENO: WARNING: using libpthreads - this may degrade performance" >&5
+-$as_echo "$as_me: WARNING: using libpthreads - this may degrade performance" >&2;}
++		    { echo "$as_me:$LINENO: WARNING: using libpthreads - this may degrade performance" >&5
++echo "$as_me: WARNING: using libpthreads - this may degrade performance" >&2;}
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+@@ -80454,14 +76507,14 @@
+ 
+ 
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ 
+-	    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 	    case "$ac_status" in
+ 		1|11|101|111)  rt_signal_lease_ok=no ;;
+ 	    esac
+@@ -80474,8 +76527,8 @@
+ 
+ 	    # no RT_SIGNAL bug, we are golden
+ 
+-    { $as_echo "$as_me:$LINENO: checking if libpthread is linked" >&5
+-$as_echo_n "checking if libpthread is linked... " >&6; }
++    { echo "$as_me:$LINENO: checking if libpthread is linked" >&5
++echo $ECHO_N "checking if libpthread is linked... $ECHO_C" >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -80497,41 +76550,37 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+-	    { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++	    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+-		    { $as_echo "$as_me:$LINENO: WARNING: using libpthreads - this may degrade performance" >&5
+-$as_echo "$as_me: WARNING: using libpthreads - this may degrade performance" >&2;}
++		    { echo "$as_me:$LINENO: WARNING: using libpthreads - this may degrade performance" >&5
++echo "$as_me: WARNING: using libpthreads - this may degrade performance" >&2;}
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	    { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++	    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}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
+ 
+@@ -80539,7 +76588,6 @@
+ 
+ 
+ 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
+ 
+@@ -80657,37 +76705,37 @@
+ #################################################
+ # Display summary of libraries detected
+ 
+-{ $as_echo "$as_me:$LINENO: result: Using libraries:" >&5
+-$as_echo "Using libraries:" >&6; }
+-{ $as_echo "$as_me:$LINENO: result:     LIBS = $LIBS" >&5
+-$as_echo "    LIBS = $LIBS" >&6; }
++{ echo "$as_me:$LINENO: result: Using libraries:" >&5
++echo "${ECHO_T}Using libraries:" >&6; }
++{ echo "$as_me:$LINENO: result:     LIBS = $LIBS" >&5
++echo "${ECHO_T}    LIBS = $LIBS" >&6; }
+ if test x"$with_ads_support" != x"no"; then
+-    { $as_echo "$as_me:$LINENO: result:     KRB5_LIBS = $KRB5_LIBS" >&5
+-$as_echo "    KRB5_LIBS = $KRB5_LIBS" >&6; }
++    { echo "$as_me:$LINENO: result:     KRB5_LIBS = $KRB5_LIBS" >&5
++echo "${ECHO_T}    KRB5_LIBS = $KRB5_LIBS" >&6; }
+ fi
+ if test x"$with_ldap_support" != x"no"; then
+-    { $as_echo "$as_me:$LINENO: result:     LDAP_LIBS = $LDAP_LIBS" >&5
+-$as_echo "    LDAP_LIBS = $LDAP_LIBS" >&6; }
++    { echo "$as_me:$LINENO: result:     LDAP_LIBS = $LDAP_LIBS" >&5
++echo "${ECHO_T}    LDAP_LIBS = $LDAP_LIBS" >&6; }
+ fi
+ if test x"$with_dnsupdate_support" != x"no"; then
+-    { $as_echo "$as_me:$LINENO: result:     UUID_LIBS = $UUID_LIBS" >&5
+-$as_echo "    UUID_LIBS = $UUID_LIBS" >&6; }
++    { echo "$as_me:$LINENO: result:     UUID_LIBS = $UUID_LIBS" >&5
++echo "${ECHO_T}    UUID_LIBS = $UUID_LIBS" >&6; }
+ fi
+ if test x"$have_dnssd_support" != x"no"; then
+-    { $as_echo "$as_me:$LINENO: result:     DNSSD_LIBS = $DNSSD_LIBS" >&5
+-$as_echo "    DNSSD_LIBS = $DNSSD_LIBS" >&6; }
++    { echo "$as_me:$LINENO: result:     DNSSD_LIBS = $DNSSD_LIBS" >&5
++echo "${ECHO_T}    DNSSD_LIBS = $DNSSD_LIBS" >&6; }
+ fi
+-{ $as_echo "$as_me:$LINENO: result:     AUTH_LIBS = $AUTH_LIBS" >&5
+-$as_echo "    AUTH_LIBS = $AUTH_LIBS" >&6; }
++{ echo "$as_me:$LINENO: result:     AUTH_LIBS = $AUTH_LIBS" >&5
++echo "${ECHO_T}    AUTH_LIBS = $AUTH_LIBS" >&6; }
+ 
+ #################################################
+ # final configure stuff
+ 
+-{ $as_echo "$as_me:$LINENO: checking configure summary" >&5
+-$as_echo_n "checking configure summary... " >&6; }
++{ echo "$as_me:$LINENO: checking configure summary" >&5
++echo $ECHO_N "checking configure summary... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+-  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
+-$as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
++  { echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
++echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -80703,35 +76751,32 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { $as_echo "$as_me:$LINENO: error: summary failure. Aborting config" >&5
+-$as_echo "$as_me: error: summary failure. Aborting config" >&2;}
++{ { echo "$as_me:$LINENO: error: summary failure. Aborting config" >&5
++echo "$as_me: error: summary failure. Aborting config" >&2;}
+    { (exit 1); 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
+ 
+@@ -80776,12 +76821,11 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+       *) $as_unset $ac_var ;;
+       esac ;;
+     esac
+@@ -80814,12 +76858,12 @@
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+     test "x$cache_file" != "x/dev/null" &&
+-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+-$as_echo "$as_me: updating cache $cache_file" >&6;}
++      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
++    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -80835,7 +76879,7 @@
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++  ac_i=`echo "$ac_i" | sed "$ac_script"`
+   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+   #    will be set to the directory where LIBOBJS objects are built.
+   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+@@ -80847,15 +76891,12 @@
+ 
+ 
+ 
+-
+-
+ : ${CONFIG_STATUS=./config.status}
+-ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -80868,7 +76909,7 @@
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+@@ -80878,7 +76919,7 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -80900,45 +76941,17 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='printf %s\n'
+-  as_echo_n='printf %s'
+-else
+-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+-    as_echo_n='/usr/ucb/echo -n'
+-  else
+-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+-    as_echo_n_body='eval
+-      arg=$1;
+-      case $arg in
+-      *"$as_nl"*)
+-	expr "X$arg" : "X\\(.*\\)$as_nl";
+-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+-      esac;
+-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+-    '
+-    export as_echo_n_body
+-    as_echo_n='sh -c $as_echo_n_body as_echo'
+-  fi
+-  export as_echo_body
+-  as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  PATH_SEPARATOR=:
+-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+-      PATH_SEPARATOR=';'
+-  }
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
+ fi
+ 
+ # Support unset when possible.
+@@ -80954,6 +76967,8 @@
+ # 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.
+@@ -80976,7 +76991,7 @@
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -80989,10 +77004,17 @@
+ PS4='+ '
+ 
+ # NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++  fi
++done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -81014,7 +77036,7 @@
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
++echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -81065,7 +77087,7 @@
+       s/-\n.*//
+     ' >$as_me.lineno &&
+   chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+@@ -81093,6 +77115,7 @@
+ *)
+   ECHO_N='-n';;
+ esac
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -81105,22 +77128,19 @@
+   rm -f conf$$.dir/conf$$.file
+ else
+   rm -f conf$$.dir
+-  mkdir conf$$.dir 2>/dev/null
++  mkdir conf$$.dir
+ 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
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+@@ -81145,10 +77165,10 @@
+   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
+@@ -81171,7 +77191,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by Samba $as_me 3, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -81184,16 +77204,7 @@
+ 
+ _ACEOF
+ 
+-case $ac_config_files in *"
+-"*) set x $ac_config_files; shift; ac_config_files=$*;;
+-esac
+-
+-case $ac_config_headers in *"
+-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+-esac
+-
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+ config_headers="$ac_config_headers"
+@@ -81201,23 +77212,22 @@
+ 
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+-Usage: $0 [OPTION]... [FILE]...
++Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
+-  -q, --quiet, --silent
+-                   do not print progress messages
++  -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+-      --file=FILE[:TEMPLATE]
+-                   instantiate the configuration file FILE
+-      --header=FILE[:TEMPLATE]
+-                   instantiate the configuration header FILE
++  --file=FILE[:TEMPLATE]
++		   instantiate the configuration file FILE
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
+ 
+ Configuration files:
+ $config_files
+@@ -81231,25 +77241,24 @@
+ Report bugs to <bug-autoconf at gnu.org>."
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ Samba config.status 3
+-configured by $0, generated by GNU Autoconf 2.63,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.61,
++  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+-AWK='$AWK'
+-test -n "\$AWK" || AWK=awk
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# The default lists apply if the user does not specify any file.
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value.  By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+@@ -81271,36 +77280,30 @@
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+-    $as_echo "$ac_cs_version"; exit ;;
++    echo "$ac_cs_version"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+-    case $ac_optarg in
+-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    esac
+-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+-    case $ac_optarg in
+-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    esac
+-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { $as_echo "$as_me: error: ambiguous option: $1
++    { echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; };;
+   --help | --hel | -h )
+-    $as_echo "$ac_cs_usage"; exit ;;
++    echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { $as_echo "$as_me: error: unrecognized option: $1
++  -*) { echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
+ 
+@@ -81319,29 +77322,27 @@
+ fi
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+-  shift
+-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+-  CONFIG_SHELL='$SHELL'
++  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  CONFIG_SHELL=$SHELL
+   export CONFIG_SHELL
+-  exec "\$@"
++  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+-  $as_echo "$ac_log"
++  echo "$ac_log"
+ } >&5
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS
+ #
+@@ -81352,7 +77353,7 @@
+ 
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ # Handling of arguments.
+ for ac_config_target in $ac_config_targets
+@@ -81377,8 +77378,8 @@
+     "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
+     "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
+ 
+-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+@@ -81419,144 +77420,405 @@
+   (umask 077 && mkdir "$tmp")
+ } ||
+ {
+-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
++   echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+-# Set up the scripts for CONFIG_FILES section.
+-# No need to generate them if there are no CONFIG_FILES.
+-# This happens for instance with `./config.status config.h'.
++#
++# 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
+ if test -n "$CONFIG_FILES"; then
+ 
++_ACEOF
++
+ 
+-ac_cr='
+'
+-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
+-else
+-  ac_cs_awk_cr=$ac_cr
++
++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
++builddir!$builddir$ac_delim
++libreplacedir!$libreplacedir$ac_delim
++LIBREPLACEOBJ!$LIBREPLACEOBJ$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
++configdir!$configdir$ac_delim
++lockdir!$lockdir$ac_delim
++piddir!$piddir$ac_delim
++logfilebase!$logfilebase$ac_delim
++ctdbdir!$ctdbdir$ac_delim
++privatedir!$privatedir$ac_delim
++swatdir!$swatdir$ac_delim
++codepagedir!$codepagedir$ac_delim
++statedir!$statedir$ac_delim
++cachedir!$cachedir$ac_delim
++rootsbindir!$rootsbindir$ac_delim
++pammodulesdir!$pammodulesdir$ac_delim
++modulesdir!$modulesdir$ac_delim
++selftest_prefix!$selftest_prefix$ac_delim
++smbtorture4_path!$smbtorture4_path$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
++CPP!$CPP$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++libreplace_cv_immediate_structures!$libreplace_cv_immediate_structures$ac_delim
++tallocdir!$tallocdir$ac_delim
++TALLOC_OBJ!$TALLOC_OBJ$ac_delim
++TALLOC_CFLAGS!$TALLOC_CFLAGS$ac_delim
++TALLOC_LIBS!$TALLOC_LIBS$ac_delim
++TALLOC_OBJS!$TALLOC_OBJS$ac_delim
++tdbdir!$tdbdir$ac_delim
++TDB_CFLAGS!$TDB_CFLAGS$ac_delim
++TDB_OBJ!$TDB_OBJ$ac_delim
++TDB_OBJS!$TDB_OBJS$ac_delim
++SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim
++LDSHFLAGS!$LDSHFLAGS$ac_delim
++SONAMEFLAG!$SONAMEFLAG$ac_delim
++SHLD!$SHLD$ac_delim
++MODULE_EXPORTS!$MODULE_EXPORTS$ac_delim
++DSO_EXPORTS!$DSO_EXPORTS$ac_delim
++HOST_OS!$HOST_OS$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`
+ fi
+ 
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++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
+ _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
+-  . ./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; }; }
++  cat >conf$$subs.sed <<_ACEOF
++PICFLAG!$PICFLAG$ac_delim
++PIE_CFLAGS!$PIE_CFLAGS$ac_delim
++PIE_LDFLAGS!$PIE_LDFLAGS$ac_delim
++RELRO_LDFLAGS!$RELRO_LDFLAGS$ac_delim
++SHLIBEXT!$SHLIBEXT$ac_delim
++INSTALLLIBCMD_SH!$INSTALLLIBCMD_SH$ac_delim
++INSTALLLIBCMD_A!$INSTALLLIBCMD_A$ac_delim
++UNINSTALLLIBCMD_SH!$UNINSTALLLIBCMD_SH$ac_delim
++UNINSTALLLIBCMD_A!$UNINSTALLLIBCMD_A$ac_delim
++INSTALL_LIBWBCLIENT!$INSTALL_LIBWBCLIENT$ac_delim
++UNINSTALL_LIBWBCLIENT!$UNINSTALL_LIBWBCLIENT$ac_delim
++LIBWBCLIENT_SHARED_TARGET!$LIBWBCLIENT_SHARED_TARGET$ac_delim
++LIBWBCLIENT_SHARED!$LIBWBCLIENT_SHARED$ac_delim
++LIBWBCLIENT_STATIC_TARGET!$LIBWBCLIENT_STATIC_TARGET$ac_delim
++LIBWBCLIENT_STATIC!$LIBWBCLIENT_STATIC$ac_delim
++LIBWBCLIENT_SOVER!$LIBWBCLIENT_SOVER$ac_delim
++LIBWBCLIENT!$LIBWBCLIENT$ac_delim
++WINBIND_LIBS!$WINBIND_LIBS$ac_delim
++LIBSAMBAUTIL_SHARED!$LIBSAMBAUTIL_SHARED$ac_delim
++PRINT_LIBS!$PRINT_LIBS$ac_delim
++AUTH_LIBS!$AUTH_LIBS$ac_delim
++ACL_LIBS!$ACL_LIBS$ac_delim
++PASSDB_LIBS!$PASSDB_LIBS$ac_delim
++IDMAP_LIBS!$IDMAP_LIBS$ac_delim
++KRB5_LIBS!$KRB5_LIBS$ac_delim
++UUID_LIBS!$UUID_LIBS$ac_delim
++LDAP_LIBS!$LDAP_LIBS$ac_delim
++GPEXT_LIBS!$GPEXT_LIBS$ac_delim
++PAM_MODULES!$PAM_MODULES$ac_delim
++INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
++UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
++NSS_MODULES!$NSS_MODULES$ac_delim
++EXTRA_BIN_PROGS!$EXTRA_BIN_PROGS$ac_delim
++CIFSMOUNT_PROGS!$CIFSMOUNT_PROGS$ac_delim
++INSTALL_CIFSMOUNT!$INSTALL_CIFSMOUNT$ac_delim
++UNINSTALL_CIFSMOUNT!$UNINSTALL_CIFSMOUNT$ac_delim
++CIFSUPCALL_PROGS!$CIFSUPCALL_PROGS$ac_delim
++INSTALL_CIFSUPCALL!$INSTALL_CIFSUPCALL$ac_delim
++UNINSTALL_CIFSUPCALL!$UNINSTALL_CIFSUPCALL$ac_delim
++EXTRA_SBIN_PROGS!$EXTRA_SBIN_PROGS$ac_delim
++EXTRA_ALL_TARGETS!$EXTRA_ALL_TARGETS$ac_delim
++CONFIG_LIBS!$CONFIG_LIBS$ac_delim
++NSCD_LIBS!$NSCD_LIBS$ac_delim
++DEFAULT_TEST_OPTIONS!$DEFAULT_TEST_OPTIONS$ac_delim
++HAVE_SOCKET_WRAPPER!$HAVE_SOCKET_WRAPPER$ac_delim
++SOCKET_WRAPPER_OBJS!$SOCKET_WRAPPER_OBJS$ac_delim
++HAVE_NSS_WRAPPER!$HAVE_NSS_WRAPPER$ac_delim
++NSS_WRAPPER_OBJS!$NSS_WRAPPER_OBJS$ac_delim
++SWAT_SBIN_TARGETS!$SWAT_SBIN_TARGETS$ac_delim
++SWAT_INSTALL_TARGETS!$SWAT_INSTALL_TARGETS$ac_delim
++AWK!$AWK$ac_delim
++PERL!$PERL$ac_delim
++AR!$AR$ac_delim
++BROKEN_CC!$BROKEN_CC$ac_delim
++PIDL_ARGS!$PIDL_ARGS$ac_delim
++DYNEXP!$DYNEXP$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LIBDL!$LIBDL$ac_delim
++LIBREPLACE_OBJS!$LIBREPLACE_OBJS$ac_delim
++CUPS_CONFIG!$CUPS_CONFIG$ac_delim
++TERMLIBS!$TERMLIBS$ac_delim
++TERMLDFLAGS!$TERMLDFLAGS$ac_delim
++LIBUNWIND_PTRACE!$LIBUNWIND_PTRACE$ac_delim
++SYMSEXT!$SYMSEXT$ac_delim
++ROFF!$ROFF$ac_delim
++LIB_PATH_VAR!$LIB_PATH_VAR$ac_delim
++SMB_FAM_LIBS!$SMB_FAM_LIBS$ac_delim
++FAKE_KASERVER_OBJ!$FAKE_KASERVER_OBJ$ac_delim
++SMBLDAP!$SMBLDAP$ac_delim
++SMBLDAPUTIL!$SMBLDAPUTIL$ac_delim
++LDBLDAP!$LDBLDAP$ac_delim
++KRB5CONFIG!$KRB5CONFIG$ac_delim
++USESHARED!$USESHARED$ac_delim
++LIBTALLOC_SHARED_TARGET!$LIBTALLOC_SHARED_TARGET$ac_delim
++LIBTALLOC_STATIC_TARGET!$LIBTALLOC_STATIC_TARGET$ac_delim
++LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
++LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
++LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
 +LIBTALLOC_TARGET!$LIBTALLOC_TARGET$ac_delim
- INSTALL_LIBTALLOC!$INSTALL_LIBTALLOC$ac_delim
- UNINSTALL_LIBTALLOC!$UNINSTALL_LIBTALLOC$ac_delim
- LIBTALLOC_SOVER!$LIBTALLOC_SOVER$ac_delim
-@@ -77609,6 +77664,7 @@
- LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
- LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
- LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
++INSTALL_LIBTALLOC!$INSTALL_LIBTALLOC$ac_delim
++UNINSTALL_LIBTALLOC!$UNINSTALL_LIBTALLOC$ac_delim
++LIBTALLOC_SOVER!$LIBTALLOC_SOVER$ac_delim
++LIBTDB_SHARED_TARGET!$LIBTDB_SHARED_TARGET$ac_delim
++LIBTDB_STATIC_TARGET!$LIBTDB_STATIC_TARGET$ac_delim
++LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
++LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
++LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
 +LIBTDB_TARGET!$LIBTDB_TARGET$ac_delim
- INSTALL_LIBTDB!$INSTALL_LIBTDB$ac_delim
- UNINSTALL_LIBTDB!$UNINSTALL_LIBTDB$ac_delim
- LIBTDB_SOVER!$LIBTDB_SOVER$ac_delim
-@@ -77617,9 +77673,7 @@
- LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
- LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
- LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
--INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
--UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
--LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
++INSTALL_LIBTDB!$INSTALL_LIBTDB$ac_delim
++UNINSTALL_LIBTDB!$UNINSTALL_LIBTDB$ac_delim
++LIBTDB_SOVER!$LIBTDB_SOVER$ac_delim
++LIBNETAPI_SHARED_TARGET!$LIBNETAPI_SHARED_TARGET$ac_delim
++LIBNETAPI_STATIC_TARGET!$LIBNETAPI_STATIC_TARGET$ac_delim
++LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
++LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
++LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
 +LIBNETAPI_TARGET!$LIBNETAPI_TARGET$ac_delim
- _ACEOF
++_ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -77661,11 +77715,15 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
+-  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
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+     break
+   elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+ done
+-rm -f conf$$subs.sh
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+-_ACEOF
+-sed -n '
+-h
+-s/^/S["/; s/!.*/"]=/
+-p
+-g
+-s/^[^!]*!//
+-:repl
+-t repl
+-s/'"$ac_delim"'$//
+-t delim
+-:nl
+-h
+-s/\(.\{148\}\).*/\1/
+-t more1
+-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+-p
+-n
+-b repl
+-:more1
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t nl
+-:delim
+-h
+-s/\(.\{148\}\).*/\1/
+-t more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"/
+-p
+-b
+-:more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t delim
+-' <conf$$subs.awk | sed '
+-/^[^""]/{
+-  N
+-  s/\n//
+-}
+-' >>$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
++_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
++_ACEOF
+ 
+-  print line
+-}
+ 
+-_ACAWK
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
 +INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
 +UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
 +LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
- LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
- LIBSMBCLIENT_STATIC_TARGET!$LIBSMBCLIENT_STATIC_TARGET$ac_delim
- LIBSMBCLIENT_SHARED!$LIBSMBCLIENT_SHARED$ac_delim
- LIBSMBCLIENT_STATIC!$LIBSMBCLIENT_STATIC$ac_delim
- LIBSMBCLIENT_LIBS!$LIBSMBCLIENT_LIBS$ac_delim
++LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
++LIBSMBCLIENT_STATIC_TARGET!$LIBSMBCLIENT_STATIC_TARGET$ac_delim
++LIBSMBCLIENT_SHARED!$LIBSMBCLIENT_SHARED$ac_delim
++LIBSMBCLIENT_STATIC!$LIBSMBCLIENT_STATIC$ac_delim
++LIBSMBCLIENT_LIBS!$LIBSMBCLIENT_LIBS$ac_delim
 +LIBSMBCLIENT_TARGET!$LIBSMBCLIENT_TARGET$ac_delim
- INSTALL_LIBSMBCLIENT!$INSTALL_LIBSMBCLIENT$ac_delim
- UNINSTALL_LIBSMBCLIENT!$UNINSTALL_LIBSMBCLIENT$ac_delim
- LIBSMBCLIENT_SOVER!$LIBSMBCLIENT_SOVER$ac_delim
-@@ -77674,6 +77732,7 @@
- LIBSMBSHAREMODES_SHARED!$LIBSMBSHAREMODES_SHARED$ac_delim
- LIBSMBSHAREMODES_STATIC!$LIBSMBSHAREMODES_STATIC$ac_delim
- LIBSMBSHAREMODES_LIBS!$LIBSMBSHAREMODES_LIBS$ac_delim
++INSTALL_LIBSMBCLIENT!$INSTALL_LIBSMBCLIENT$ac_delim
++UNINSTALL_LIBSMBCLIENT!$UNINSTALL_LIBSMBCLIENT$ac_delim
++LIBSMBCLIENT_SOVER!$LIBSMBCLIENT_SOVER$ac_delim
++LIBSMBSHAREMODES_SHARED_TARGET!$LIBSMBSHAREMODES_SHARED_TARGET$ac_delim
++LIBSMBSHAREMODES_STATIC_TARGET!$LIBSMBSHAREMODES_STATIC_TARGET$ac_delim
++LIBSMBSHAREMODES_SHARED!$LIBSMBSHAREMODES_SHARED$ac_delim
++LIBSMBSHAREMODES_STATIC!$LIBSMBSHAREMODES_STATIC$ac_delim
++LIBSMBSHAREMODES_LIBS!$LIBSMBSHAREMODES_LIBS$ac_delim
 +LIBSMBSHAREMODES_TARGET!$LIBSMBSHAREMODES_TARGET$ac_delim
- INSTALL_LIBSMBSHAREMODES!$INSTALL_LIBSMBSHAREMODES$ac_delim
- UNINSTALL_LIBSMBSHAREMODES!$UNINSTALL_LIBSMBSHAREMODES$ac_delim
- LIBSMBSHAREMODES_SOVER!$LIBSMBSHAREMODES_SOVER$ac_delim
-@@ -77682,6 +77741,7 @@
- LIBADDNS_SHARED!$LIBADDNS_SHARED$ac_delim
- LIBADDNS_STATIC!$LIBADDNS_STATIC$ac_delim
- LIBADDNS_LIBS!$LIBADDNS_LIBS$ac_delim
++INSTALL_LIBSMBSHAREMODES!$INSTALL_LIBSMBSHAREMODES$ac_delim
++UNINSTALL_LIBSMBSHAREMODES!$UNINSTALL_LIBSMBSHAREMODES$ac_delim
++LIBSMBSHAREMODES_SOVER!$LIBSMBSHAREMODES_SOVER$ac_delim
++LIBADDNS_SHARED_TARGET!$LIBADDNS_SHARED_TARGET$ac_delim
++LIBADDNS_STATIC_TARGET!$LIBADDNS_STATIC_TARGET$ac_delim
++LIBADDNS_SHARED!$LIBADDNS_SHARED$ac_delim
++LIBADDNS_STATIC!$LIBADDNS_STATIC$ac_delim
++LIBADDNS_LIBS!$LIBADDNS_LIBS$ac_delim
 +LIBADDNS_TARGET!$LIBADDNS_TARGET$ac_delim
- INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
- UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
- LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
-@@ -77721,7 +77781,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
++INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
++UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
++LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
++WINBIND_NSS_PTHREAD!$WINBIND_NSS_PTHREAD$ac_delim
++WINBIND_NSS!$WINBIND_NSS$ac_delim
++WINBIND_WINS_NSS!$WINBIND_WINS_NSS$ac_delim
++WINBIND_NSS_LDSHFLAGS!$WINBIND_NSS_LDSHFLAGS$ac_delim
++WINBIND_NSS_EXTRA_OBJS!$WINBIND_NSS_EXTRA_OBJS$ac_delim
++WINBIND_NSS_EXTRA_LIBS!$WINBIND_NSS_EXTRA_LIBS$ac_delim
++NSSSONAMEVERSIONSUFFIX!$NSSSONAMEVERSIONSUFFIX$ac_delim
++PAM_WINBIND_EXTRA_LIBS!$PAM_WINBIND_EXTRA_LIBS$ac_delim
++WINBIND_KRB5_LOCATOR!$WINBIND_KRB5_LOCATOR$ac_delim
++BUILD_POPT!$BUILD_POPT$ac_delim
++POPTLIBS!$POPTLIBS$ac_delim
++FLAGS1!$FLAGS1$ac_delim
++DNSSD_LIBS!$DNSSD_LIBS$ac_delim
++BUILD_INIPARSER!$BUILD_INIPARSER$ac_delim
++INIPARSERLIBS!$INIPARSERLIBS$ac_delim
++PDB_STATIC!$PDB_STATIC$ac_delim
++PDB_MODULES!$PDB_MODULES$ac_delim
++RPC_STATIC!$RPC_STATIC$ac_delim
++RPC_MODULES!$RPC_MODULES$ac_delim
++IDMAP_STATIC!$IDMAP_STATIC$ac_delim
++IDMAP_MODULES!$IDMAP_MODULES$ac_delim
++NSS_INFO_STATIC!$NSS_INFO_STATIC$ac_delim
++NSS_INFO_MODULES!$NSS_INFO_MODULES$ac_delim
++CHARSET_STATIC!$CHARSET_STATIC$ac_delim
++CHARSET_MODULES!$CHARSET_MODULES$ac_delim
++AUTH_STATIC!$AUTH_STATIC$ac_delim
++AUTH_MODULES!$AUTH_MODULES$ac_delim
++VFS_STATIC!$VFS_STATIC$ac_delim
++VFS_MODULES!$VFS_MODULES$ac_delim
++GPEXT_STATIC!$GPEXT_STATIC$ac_delim
++GPEXT_MODULES!$GPEXT_MODULES$ac_delim
++DEVELOPER_CFLAGS!$DEVELOPER_CFLAGS$ac_delim
++SMBD_LIBS!$SMBD_LIBS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+-else
+-  cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.3.0rc2/source/include/config.h.in
++
+ # 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
+@@ -81572,133 +77834,19 @@
+ }'
+ fi
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ fi # test -n "$CONFIG_FILES"
+ 
+-# Set up the scripts for CONFIG_HEADERS section.
+-# No need to generate them if there are no CONFIG_HEADERS.
+-# This happens for instance with `./config.status Makefile'.
+-if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
+-BEGIN {
+-_ACEOF
+-
+-# Transform confdefs.h into an awk script `defines.awk', embedded as
+-# here-document in config.status, that substitutes the proper values into
+-# config.h.in to produce config.h.
+-
+-# Create a delimiter string that does not exist in confdefs.h, to ease
+-# handling of long lines.
+-ac_delim='%!_!# '
+-for ac_last_try in false false :; do
+-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_t"; then
+-    break
+-  elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+-   { (exit 1); exit 1; }; }
+-  else
+-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+-  fi
+-done
+-
+-# For the awk script, D is an array of macro values keyed by name,
+-# likewise P contains macro parameters if any.  Preserve backslash
+-# newline sequences.
+-
+-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+-sed -n '
+-s/.\{148\}/&'"$ac_delim"'/g
+-t rset
+-:rset
+-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+-t def
+-d
+-:def
+-s/\\$//
+-t bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3"/p
+-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+-d
+-:bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3\\\\\\n"\\/p
+-t cont
+-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+-t cont
+-d
+-:cont
+-n
+-s/.\{148\}/&'"$ac_delim"'/g
+-t clear
+-:clear
+-s/\\$//
+-t bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/"/p
+-d
+-:bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+-b cont
+-' <confdefs.h | sed '
+-s/'"$ac_delim"'/"\\\
+-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-  for (key in D) D_is_set[key] = 1
+-  FS = ""
+-}
+-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+-  line = \$ 0
+-  split(line, arg, " ")
+-  if (arg[1] == "#") {
+-    defundef = arg[2]
+-    mac1 = arg[3]
+-  } else {
+-    defundef = substr(arg[1], 2)
+-    mac1 = arg[2]
+-  }
+-  split(mac1, mac2, "(") #)
+-  macro = mac2[1]
+-  prefix = substr(line, 1, index(line, defundef) - 1)
+-  if (D_is_set[macro]) {
+-    # Preserve the white space surrounding the "#".
+-    print prefix "define", macro P[macro] D[macro]
+-    next
+-  } else {
+-    # Replace #undef with comments.  This is necessary, for example,
+-    # in the case of _POSIX_SOURCE, which is predefined and required
+-    # on some systems where configure will not decide to define it.
+-    if (defundef == "undef") {
+-      print "/*", prefix defundef, macro, "*/"
+-      next
+-    }
+-  }
+-}
+-{ print }
+-_ACAWK
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi # test -n "$CONFIG_HEADERS"
+-
+ 
+-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+-shift
+-for ac_tag
++for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+ do
+   case $ac_tag in
+   :[FHLC]) ac_mode=$ac_tag; continue;;
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
++  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+    { (exit 1); exit 1; }; };;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+@@ -81727,38 +77875,26 @@
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+    { (exit 1); exit 1; }; };;
+       esac
+-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+-      ac_file_inputs="$ac_file_inputs '$ac_f'"
++      ac_file_inputs="$ac_file_inputs $ac_f"
+     done
+ 
+     # Let's still pretend it is `configure' which instantiates (i.e., don't
+     # use $as_me), people would be surprised to read:
+     #    /* config.h.  Generated by config.status.  */
+-    configure_input='Generated from '`
+-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+-	`' by configure.'
++    configure_input="Generated from "`IFS=:
++	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+     if test x"$ac_file" != x-; then
+       configure_input="$ac_file.  $configure_input"
+-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+-$as_echo "$as_me: creating $ac_file" >&6;}
++      { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
+     fi
+-    # Neutralize special characters interpreted by sed in replacement strings.
+-    case $configure_input in #(
+-    *\&* | *\|* | *\\* )
+-       ac_sed_conf_input=`$as_echo "$configure_input" |
+-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+-    *) ac_sed_conf_input=$configure_input;;
+-    esac
+ 
+     case $ac_tag in
+-    *:-:* | *:-) cat >"$tmp/stdin" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++    *:-:* | *:-) cat >"$tmp/stdin";;
+     esac
+     ;;
+   esac
+@@ -81768,7 +77904,7 @@
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+ 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$ac_file" |
++echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -81794,7 +77930,7 @@
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+@@ -81803,7 +77939,7 @@
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+ 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
++echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -81824,17 +77960,17 @@
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+   ac_builddir=.
+ 
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+   case $ac_top_builddir_sub in
+   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -81874,13 +78010,12 @@
+   esac
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ # If the template does not know about datarootdir, expand it.
+ # FIXME: This hack should be removed a few years after 2.60.
+ ac_datarootdir_hack=; ac_datarootdir_seen=
+ 
+-ac_sed_dataroot='
+-/datarootdir/ {
++case `sed -n '/datarootdir/ {
+   p
+   q
+ }
+@@ -81889,14 +78024,13 @@
+ /@infodir@/p
+ /@localedir@/p
+ /@mandir@/p
+-'
+-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++' $ac_file_inputs` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<_ACEOF
+   ac_datarootdir_hack='
+   s&@datadir@&$datadir&g
+   s&@docdir@&$docdir&g
+@@ -81910,16 +78044,15 @@
+ # Neutralize VPATH when `$srcdir' = `.'.
+ # Shell code in configure.ac might set extrasub.
+ # FIXME: do we really want to maintain this feature?
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_sed_extra="$ac_vpsub
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s|@configure_input@|$ac_sed_conf_input|;t t
++s&@configure_input@&$configure_input&;t t
+ s&@top_builddir@&$ac_top_builddir_sub&;t t
+-s&@top_build_prefix@&$ac_top_build_prefix&;t t
+ s&@srcdir@&$ac_srcdir&;t t
+ s&@abs_srcdir@&$ac_abs_srcdir&;t t
+ s&@top_srcdir@&$ac_top_srcdir&;t t
+@@ -81929,62 +78062,123 @@
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
+ $ac_datarootdir_hack
+-"
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $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; }; }
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&5
+-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&2;}
+ 
+   rm -f "$tmp/stdin"
+   case $ac_file in
+-  -) cat "$tmp/out" && rm -f "$tmp/out";;
+-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+-  esac \
+-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++  -) cat "$tmp/out"; rm -f "$tmp/out";;
++  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++  esac
+  ;;
+   :H)
+   #
+   # CONFIG_HEADER
+   #
++_ACEOF
++
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status.  If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless.  But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
++ac_dB='\\)[	 (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
++
++uniq confdefs.h |
++  sed -n '
++	t rset
++	:rset
++	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
++	t ok
++	d
++	:ok
++	s/[\\&,]/\\&/g
++	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++  ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[	 #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++  # Write a here document:
++    cat >>$CONFIG_STATUS <<_ACEOF
++    # First, check the format of the line:
++    cat >"\$tmp/defines.sed" <<\\CEOF
++/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
++/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
++b
++:def
++_ACEOF
++  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++  grep . conftest.tail >/dev/null || break
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines conftest.tail
++
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
++cat >>$CONFIG_STATUS <<\_ACEOF
+   if test x"$ac_file" != x-; then
+-    {
+-      $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$tmp/config.h" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
+-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+-$as_echo "$as_me: $ac_file is unchanged" >&6;}
++    echo "/* $configure_input  */" >"$tmp/config.h"
++    cat "$ac_result" >>"$tmp/config.h"
++    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
++      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      rm -f "$ac_file"
+-      mv "$tmp/config.h" "$ac_file" \
+-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++      rm -f $ac_file
++      mv "$tmp/config.h" $ac_file
+     fi
+   else
+-    $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+-$as_echo "$as_me: error: could not create -" >&2;}
+-   { (exit 1); exit 1; }; }
++    echo "/* $configure_input  */"
++    cat "$ac_result"
+   fi
++  rm -f "$tmp/out12"
+  ;;
+ 
+-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+-$as_echo "$as_me: executing $ac_file commands" >&6;}
++  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
+  ;;
+   esac
+ 
+@@ -82004,11 +78198,6 @@
+ 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.
+@@ -82030,18 +78219,14 @@
+   # 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
+ 
+ 
+ #################################################
+ # Print very concise instructions on building/use
+ if test "x$enable_dmalloc" = xyes
+ then
+-	{ $as_echo "$as_me:$LINENO: result: Note: The dmalloc debug library will be included.  To turn it on use" >&5
+-$as_echo "Note: The dmalloc debug library will be included.  To turn it on use" >&6; }
+-	{ $as_echo "$as_me:$LINENO: result:       \$ eval \\`dmalloc samba\\`." >&5
+-$as_echo "      \$ eval \\`dmalloc samba\\`." >&6; }
++	{ echo "$as_me:$LINENO: result: Note: The dmalloc debug library will be included.  To turn it on use" >&5
++echo "${ECHO_T}Note: The dmalloc debug library will be included.  To turn it on use" >&6; }
++	{ echo "$as_me:$LINENO: result:       \$ eval \\`dmalloc samba\\`." >&5
++echo "${ECHO_T}      \$ eval \\`dmalloc samba\\`." >&6; }
+ fi
+Index: samba-3.3.0/source/include/config.h.in
 ===================================================================
---- samba-3.3.0rc2.orig/source/include/config.h.in
-+++ samba-3.3.0rc2/source/include/config.h.in
-@@ -66,6 +66,9 @@
+--- samba-3.3.0.orig/source/include/config.h.in
++++ samba-3.3.0/source/include/config.h.in
+@@ -69,6 +69,9 @@
  /* Whether to use fully FHS-compatible paths */
  #undef FHS_COMPATIBLE
  

Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/documentation.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -6,23 +6,23 @@
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.3.0rc2/docs/manpages/swat.8
+Index: samba-3.3.0/docs/manpages/swat.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/swat.8
-+++ samba-3.3.0rc2/docs/manpages/swat.8
-@@ -103,85 +103,6 @@
+--- samba-3.3.0.orig/docs/manpages/swat.8
++++ samba-3.3.0/docs/manpages/swat.8
+@@ -261,85 +261,6 @@
  .RS 4
- Print a summary of command line options\.
+ Print a summary of command line options\&.
  .RE
 -.SH "INSTALLATION"
 -.PP
--Swat is included as binary package with most distributions\. The package manager in this case takes care of the installation and configuration\. This section is only for those who have compiled swat from scratch\.
+-Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
 -.PP
 -After you compile SWAT you need to run
--make install
+-\FCmake install \F[]
 -to install the
--swat
--binary and the various help files and images\. A default install would put these in:
+-\FCswat\F[]
+-binary and the various help files and images\&. A default install would put these in:
 -.sp
 -.RS 4
 -.ie n \{\
@@ -60,249 +60,246 @@
 -.SS "Inetd Installation"
 -.PP
 -You need to edit your
--\fI/etc/inetd\.conf \fR
+-\FC/etc/inetd\&.conf \F[]
 -and
--\fI/etc/services\fR
+-\FC/etc/services\F[]
 -to enable SWAT to be launched via
--inetd\.
+-\FCinetd\F[]\&.
 -.PP
 -In
--\fI/etc/services\fR
+-\FC/etc/services\F[]
 -you need to add a line like this:
 -.PP
--swat 901/tcp
+-\FCswat 901/tcp\F[]
 -.PP
 -Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
--\fI /etc/services\fR
--file\.
+-\FC /etc/services\F[]
+-file\&.
 -.PP
 -the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
--inetd
--daemon)\.
+-\FCinetd\F[]
+-daemon)\&.
 -.PP
 -In
--\fI/etc/inetd\.conf\fR
+-\FC/etc/inetd\&.conf\F[]
 -you should add a line like this:
 -.PP
--swat stream tcp nowait\.400 root /usr/local/samba/sbin/swat swat
+-\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
 -.PP
 -Once you have edited
--\fI/etc/services\fR
+-\FC/etc/services\F[]
 -and
--\fI/etc/inetd\.conf\fR
--you need to send a HUP signal to inetd\. To do this use
--kill \-1 PID
--where PID is the process ID of the inetd daemon\.
+-\FC/etc/inetd\&.conf\F[]
+-you need to send a HUP signal to inetd\&. To do this use
+-\FCkill \-1 PID \F[]
+-where PID is the process ID of the inetd daemon\&.
  .SH "LAUNCHING"
  .PP
- To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\.
-@@ -199,14 +120,11 @@
- This file must contain a mapping of service name (e\.g\., swat) to service port (e\.g\., 901) and protocol type (e\.g\., tcp)\.
+ To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
+@@ -357,14 +278,11 @@
+ This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
  .RE
  .PP
--\fI/usr/local/samba/lib/smb\.conf\fR
-+\fI/etc/samba/smb.conf\fR
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
  .RS 4
  This is the default location of the
  \fBsmb.conf\fR(5)
--server configuration file that swat edits\. Other common places that systems install this file are
--\fI /usr/samba/lib/smb\.conf\fR
+-server configuration file that swat edits\&. Other common places that systems install this file are
+-\FC /usr/samba/lib/smb\&.conf\F[]
 -and
--\fI/etc/smb\.conf \fR\. This file describes all the services the server is to make available to clients\.
-+server configuration file that swat edits. This file describes all the services the server is to make available to clients.
+-\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is to make available to clients\&.
++server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.3.0rc2/docs/manpages/nmbd.8
+Index: samba-3.3.0/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/nmbd.8
-+++ samba-3.3.0rc2/docs/manpages/nmbd.8
-@@ -107,11 +107,9 @@
- to answer any name queries\. Adding a line to this file affects name NetBIOS resolution from this host
- \fIONLY\fR\.
+--- samba-3.3.0.orig/docs/manpages/nmbd.8
++++ samba-3.3.0/docs/manpages/nmbd.8
+@@ -265,10 +265,7 @@
+ to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
+ \fIONLY\fR\&.
  .sp
--The default path to this file is compiled into Samba as part of the build process\. Common defaults are
--\fI/usr/local/samba/lib/lmhosts\fR,
--\fI/usr/samba/lib/lmhosts\fR
+-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
+-\FC/usr/local/samba/lib/lmhosts\F[],
+-\FC/usr/samba/lib/lmhosts\F[]
 -or
--\fI/etc/samba/lmhosts\fR\. See the
 +The default path to this file is
-+\fI/etc/samba/lmhosts\fR.
-+See the
+ \FC/etc/samba/lmhosts\F[]\&. See the
  \fBlmhosts\fR(5)
- man page for details on the contents of this file\.
+ man page for details on the contents of this file\&.
+@@ -337,14 +334,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  .RE
-@@ -179,14 +177,11 @@
- inetd, this file must contain a mapping of service name (e\.g\., netbios\-ssn) to service port (e\.g\., 139) and protocol type (e\.g\., tcp)\.
- .RE
  .PP
--\fI/usr/local/samba/lib/smb\.conf\fR
-+\fI/etc/samba/smb.conf\fR
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
  .RS 4
  This is the default location of the
  \fBsmb.conf\fR(5)
--server configuration file\. Other common places that systems install this file are
--\fI/usr/samba/lib/smb\.conf\fR
+-server configuration file\&. Other common places that systems install this file are
+-\FC/usr/samba/lib/smb\&.conf\F[]
 -and
--\fI/etc/samba/smb\.conf\fR\.
-+server configuration file.
+-\FC/etc/samba/smb\&.conf\F[]\&.
++server configuration file\&.
  .sp
  When run as a WINS server (see the
- \fIwins support\fR
-@@ -230,10 +225,8 @@
+ \m[blue]\fBwins support\fR\m[]
+@@ -388,10 +382,8 @@
  will accept SIGHUP, which will cause it to dump out its namelists into the file
- \fInamelist\.debug \fR
+ \FCnamelist\&.debug \F[]
  in the
--\fI/usr/local/samba/var/locks\fR
+-\FC/usr/local/samba/var/locks\F[]
 -directory (or the
--\fIvar/locks\fR
--directory configured under wherever Samba was configured to install itself)\. This will also cause
-+\fI/var/run/samba\fR
-+directory. This will also cause
- nmbd
+-\FCvar/locks\F[]
+-directory configured under wherever Samba was configured to install itself)\&. This will also cause
++\FC/var/run/samba\F[]
++directory\&. This will also cause
+ \FCnmbd\F[]
  to dump out its server database in the
- \fIlog\.nmb\fR
-Index: samba-3.3.0rc2/docs/manpages/smbd.8
+ \FClog\&.nmb\F[]
+Index: samba-3.3.0/docs/manpages/smbd.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/smbd.8
-+++ samba-3.3.0rc2/docs/manpages/smbd.8
-@@ -161,14 +161,11 @@
- inetd, this file must contain a mapping of service name (e\.g\., netbios\-ssn) to service port (e\.g\., 139) and protocol type (e\.g\., tcp)\.
+--- samba-3.3.0.orig/docs/manpages/smbd.8
++++ samba-3.3.0/docs/manpages/smbd.8
+@@ -319,14 +319,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  .RE
  .PP
--\fI/usr/local/samba/lib/smb\.conf\fR
-+\fI/etc/samba/smb.conf\fR
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
  .RS 4
  This is the default location of the
  \fBsmb.conf\fR(5)
--server configuration file\. Other common places that systems install this file are
--\fI/usr/samba/lib/smb\.conf\fR
+-server configuration file\&. Other common places that systems install this file are
+-\FC/usr/samba/lib/smb\&.conf\F[]
 -and
--\fI/etc/samba/smb\.conf\fR\.
-+server configuration file.
+-\FC/etc/samba/smb\&.conf\F[]\&.
++server configuration file\&.
  .sp
- This file describes all the services the server is to make available to clients\. See
+ This file describes all the services the server is to make available to clients\&. See
  \fBsmb.conf\fR(5)
-Index: samba-3.3.0rc2/docs/manpages/lmhosts.5
+Index: samba-3.3.0/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/lmhosts.5
-+++ samba-3.3.0rc2/docs/manpages/lmhosts.5
-@@ -83,10 +83,8 @@
- file\.
+--- samba-3.3.0.orig/docs/manpages/lmhosts.5
++++ samba-3.3.0/docs/manpages/lmhosts.5
+@@ -257,10 +257,8 @@
+ file\&.
  .SH "FILES"
  .PP
--lmhosts is loaded from the configuration directory\. This is usually
--\fI/etc/samba\fR
+-lmhosts is loaded from the configuration directory\&. This is usually
+-\FC/etc/samba\F[]
 -or
--\fI/usr/local/samba/lib\fR\.
-+lmhosts is loaded from the configuration directory. This is
-+\fI/etc/samba\fR.
+-\FC/usr/local/samba/lib\F[]\&.
++lmhosts is loaded from the configuration directory\&. This is
++\FC/etc/samba\F[]\&.
  .SH "VERSION"
  .PP
- This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.3.0rc2/docs/manpages/ntlm_auth.1
+ This man page is correct for version 3 of the Samba suite\&.
+Index: samba-3.3.0/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.3.0rc2/docs/manpages/ntlm_auth.1
-@@ -35,7 +35,7 @@
+--- samba-3.3.0.orig/docs/manpages/ntlm_auth.1
++++ samba-3.3.0/docs/manpages/ntlm_auth.1
+@@ -193,7 +193,7 @@
  Some of these commands also require access to the directory
- \fIwinbindd_privileged\fR
+ \FCwinbindd_privileged\F[]
  in
--\fI$LOCKDIR\fR\. This should be done either by running this command as root or providing group access to the
-+\fI/var/run/samba\fR. This should be done either by running this command as root or providing group access to the
- \fIwinbindd_privileged\fR
- directory\. For security reasons, this directory should not be world\-accessable\.
+-\FC$LOCKDIR\F[]\&. This should be done either by running this command as root or providing group access to the
++\FC/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
+ \FCwinbindd_privileged\F[]
+ directory\&. For security reasons, this directory should not be world\-accessable\&.
  .SH "OPTIONS"
-@@ -61,7 +61,7 @@
+@@ -219,7 +219,7 @@
  Requires access to the directory
- \fIwinbindd_privileged\fR
+ \FCwinbindd_privileged\F[]
  in
--\fI$LOCKDIR\fR\. The protocol used is described here:
-+\fI/var/run/samba\fR. The protocol used is described here:
- http://devel\.squid\-cache\.org/ntlm/squid_helper_protocol\.html\. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
- YR
- command\. (Thus avoiding loss of information in the protocol exchange)\.
-@@ -84,7 +84,7 @@
+-\FC$LOCKDIR\F[]\&. The protocol used is described here:
++\FC/var/run/samba\F[]\&. The protocol used is described here:
+ http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
+ \FCYR\F[]
+ command\&. (Thus avoiding loss of information in the protocol exchange)\&.
+@@ -242,7 +242,7 @@
  Requires access to the directory
- \fIwinbindd_privileged\fR
+ \FCwinbindd_privileged\F[]
  in
--\fI$LOCKDIR\fR\.
-+\fI/var/run/samba\fR.
+-\FC$LOCKDIR\F[]\&.
++\FC/var/run/samba\F[]\&.
  .RE
  .PP
  gss\-spnego\-client
-Index: samba-3.3.0rc2/docs/manpages/tdbbackup.8
+Index: samba-3.3.0/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/tdbbackup.8
-+++ samba-3.3.0rc2/docs/manpages/tdbbackup.8
-@@ -69,7 +69,7 @@
+--- samba-3.3.0.orig/docs/manpages/tdbbackup.8
++++ samba-3.3.0/docs/manpages/tdbbackup.8
+@@ -227,7 +227,7 @@
  .\}
  
- secrets\.tdb
--\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\.
-+- usual location is in the /var/lib/samba directory.
+ \FCsecrets\&.tdb\F[]
+-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
++\- usual location is in the /var/lib/samba directory\&.
  .RE
  .sp
  .RS 4
-@@ -82,7 +82,7 @@
+@@ -240,7 +240,7 @@
  .\}
  
- passdb\.tdb
--\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\.
-+- usual location is in the /var/lib/samba directory.
+ \FCpassdb\&.tdb\F[]
+-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
++\- usual location is in the /var/lib/samba directory\&.
  .RE
  .sp
  .RS 4
-@@ -95,7 +95,7 @@
+@@ -253,7 +253,7 @@
  .\}
  
- *\.tdb
--located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\.
-+located in the /var/lib/samba and /var/run/samba directories.
+ \FC*\&.tdb\F[]
+-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
++located in the /var/lib/samba and /var/run/samba directories\&.
  .SH "VERSION"
  .PP
- This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.3.0rc2/docs/manpages/winbindd.8
+ This man page is correct for version 3 of the Samba suite\&.
+Index: samba-3.3.0/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/winbindd.8
-+++ samba-3.3.0rc2/docs/manpages/winbindd.8
-@@ -513,16 +513,16 @@
- file are owned by root\.
+--- samba-3.3.0.orig/docs/manpages/winbindd.8
++++ samba-3.3.0/docs/manpages/winbindd.8
+@@ -771,16 +771,16 @@
+ file are owned by root\&.
  .RE
  .PP
 -$LOCKDIR/winbindd_privileged/pipe
 +/var/run/samba/winbindd_privileged/pipe
  .RS 4
  The UNIX pipe over which \'privileged\' clients communicate with the
- winbindd
- program\. For security reasons, access to some winbindd functions \- like those needed by the
- ntlm_auth
--utility \- is restricted\. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
--\fI$LOCKDIR/winbindd_privileged\fR
-+utility - is restricted. By default, only users in the 'root' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like 'squid' to use ntlm_auth. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
-+\fI/var/run/samba/winbindd_privileged\fR
+ \FCwinbindd\F[]
+ program\&. For security reasons, access to some winbindd functions \- like those needed by the
+ \FCntlm_auth\F[]
+-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
+-\FC$LOCKDIR/winbindd_privileged\F[]
++utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
++\FC/var/run/samba/winbindd_privileged\F[]
  directory and
--\fI$LOCKDIR/winbindd_privileged/pipe\fR
-+\fI/var/run/samba/winbindd_privileged/pipe\fR
- file are owned by root\.
+-\FC$LOCKDIR/winbindd_privileged/pipe\F[]
++\FC/var/run/samba/winbindd_privileged/pipe\F[]
+ file are owned by root\&.
  .RE
  .PP
-@@ -531,15 +531,12 @@
- Implementation of name service switch library\.
+@@ -789,15 +789,12 @@
+ Implementation of name service switch library\&.
  .RE
  .PP
--$LOCKDIR/winbindd_idmap\.tdb
-+/var/run/samba/winbindd_idmap.tdb
+-$LOCKDIR/winbindd_idmap\&.tdb
++/var/run/samba/winbindd_idmap\&.tdb
  .RS 4
--Storage for the Windows NT rid to UNIX user/group id mapping\. The lock directory is specified when Samba is initially compiled using the
+-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
 -\fI\-\-with\-lockdir\fR
--option\. This directory is by default
--\fI/usr/local/samba/var/locks \fR\.
-+Storage for the Windows NT rid to UNIX user/group id mapping.
+-option\&. This directory is by default
+-\FC/usr/local/samba/var/locks \F[]\&.
++Storage for the Windows NT rid to UNIX user/group id mapping\&.
  .RE
  .PP
--$LOCKDIR/winbindd_cache\.tdb
-+/var/run/samba/winbindd_cache.tdb
+-$LOCKDIR/winbindd_cache\&.tdb
++/var/run/samba/winbindd_cache\&.tdb
  .RS 4
- Storage for cached user and group information\.
+ Storage for cached user and group information\&.
  .RE

Modified: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -46,11 +46,11 @@
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.3.0rc2/source/lib/util.c
+Index: samba-3.3.0/source/lib/util.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/lib/util.c
-+++ samba-3.3.0rc2/source/lib/util.c
-@@ -2637,6 +2637,15 @@
+--- samba-3.3.0.orig/source/lib/util.c
++++ samba-3.3.0/source/lib/util.c
+@@ -2644,6 +2644,15 @@
  	return xx_path(name, get_dyn_STATEDIR());
  }
  
@@ -66,10 +66,10 @@
  /**
   * @brief Returns the platform specific shared library extension.
   *
-Index: samba-3.3.0rc2/source/libsmb/samlogon_cache.c
+Index: samba-3.3.0/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.3.0rc2/source/libsmb/samlogon_cache.c
+--- samba-3.3.0.orig/source/libsmb/samlogon_cache.c
++++ samba-3.3.0/source/libsmb/samlogon_cache.c
 @@ -34,7 +34,7 @@
  bool netsamlogon_cache_init(void)
  {
@@ -79,10 +79,10 @@
  					       TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
  	}
  
-Index: samba-3.3.0rc2/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.3.0/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.3.0rc2/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.3.0.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.3.0/source/nmbd/nmbd_serverlistdb.c
 @@ -326,7 +326,7 @@
  
  	updatecount++;
@@ -92,23 +92,23 @@
  	if (!fname) {
  		return;
  	}
-Index: samba-3.3.0rc2/source/passdb/login_cache.c
+Index: samba-3.3.0/source/passdb/login_cache.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/passdb/login_cache.c
-+++ samba-3.3.0rc2/source/passdb/login_cache.c
+--- samba-3.3.0.orig/source/passdb/login_cache.c
++++ samba-3.3.0/source/passdb/login_cache.c
 @@ -35,7 +35,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
  
--	asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
-+	asprintf(&cache_fname, "%s/%s", get_dyn_CACHEDIR(), LOGIN_CACHE_FILE);
- 	if (cache_fname)
- 		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
- 	else {
-Index: samba-3.3.0rc2/source/printing/printing.c
+-	if (asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE) == -1) {
++	if (asprintf(&cache_fname, "%s/%s", get_dyn_CACHEDIR(), LOGIN_CACHE_FILE) == -1) {
+ 		DEBUG(0, ("Filename allocation failed.\n"));
+ 		return False;
+ 	}
+Index: samba-3.3.0/source/printing/printing.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/printing/printing.c
-+++ samba-3.3.0rc2/source/printing/printing.c
+--- samba-3.3.0.orig/source/printing/printing.c
++++ samba-3.3.0/source/printing/printing.c
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -120,10 +120,10 @@
  
  	/* handle a Samba upgrade */
  
-Index: samba-3.3.0rc2/source/printing/printing_db.c
+Index: samba-3.3.0/source/printing/printing_db.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/printing/printing_db.c
-+++ samba-3.3.0rc2/source/printing/printing_db.c
+--- samba-3.3.0.orig/source/printing/printing_db.c
++++ samba-3.3.0/source/printing/printing_db.c
 @@ -91,7 +91,7 @@
  	}
  
@@ -133,10 +133,10 @@
  				printername) < 0) {
  		DLIST_REMOVE(print_db_head, p);
  		SAFE_FREE(p);
-Index: samba-3.3.0rc2/source/smbd/lanman.c
+Index: samba-3.3.0/source/smbd/lanman.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/smbd/lanman.c
-+++ samba-3.3.0rc2/source/smbd/lanman.c
+--- samba-3.3.0.orig/source/smbd/lanman.c
++++ samba-3.3.0/source/smbd/lanman.c
 @@ -1154,9 +1154,9 @@
  	bool local_list_only;
  	int i;
@@ -149,11 +149,11 @@
  		return 0;
  	}
  
-Index: samba-3.3.0rc2/source/utils/smbcontrol.c
+Index: samba-3.3.0/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/utils/smbcontrol.c
-+++ samba-3.3.0rc2/source/utils/smbcontrol.c
-@@ -868,10 +868,10 @@
+--- samba-3.3.0.orig/source/utils/smbcontrol.c
++++ samba-3.3.0/source/utils/smbcontrol.c
+@@ -867,10 +867,10 @@
  	/* Remove the entry in the winbindd_cache tdb to tell a later
  	   starting winbindd that we're online. */
  
@@ -166,7 +166,7 @@
  		return False;
  	}
  
-@@ -898,13 +898,13 @@
+@@ -897,13 +897,13 @@
  	   starting winbindd that we're offline. We may actually create
  	   it here... */
  
@@ -182,10 +182,10 @@
  		return False;
  	}
  
-Index: samba-3.3.0rc2/source/libgpo/gpo_fetch.c
+Index: samba-3.3.0/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.3.0rc2/source/libgpo/gpo_fetch.c
+--- samba-3.3.0.orig/source/libgpo/gpo_fetch.c
++++ samba-3.3.0/source/libgpo/gpo_fetch.c
 @@ -59,7 +59,7 @@
  
  	if ((path = talloc_asprintf(mem_ctx,
@@ -204,11 +204,11 @@
  	char *current_dir;
  	char *tok;
  
-Index: samba-3.3.0rc2/source/winbindd/winbindd_cache.c
+Index: samba-3.3.0/source/winbindd/winbindd_cache.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.3.0rc2/source/winbindd/winbindd_cache.c
-@@ -2532,7 +2532,7 @@
+--- samba-3.3.0.orig/source/winbindd/winbindd_cache.c
++++ samba-3.3.0/source/winbindd/winbindd_cache.c
+@@ -2537,7 +2537,7 @@
  		return true;
  
  	/* when working offline we must not clear the cache on restart */
@@ -217,7 +217,7 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-@@ -2575,9 +2575,9 @@
+@@ -2580,9 +2580,9 @@
  		tdb_close(wcache->tdb);
  		wcache->tdb = NULL;
  
@@ -229,7 +229,7 @@
  				strerror(errno) ));
  			return false;
  		}
-@@ -2859,7 +2859,7 @@
+@@ -2864,7 +2864,7 @@
  		return;
  
  	/* when working offline we must not clear the cache on restart */
@@ -238,7 +238,7 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-@@ -3688,7 +3688,7 @@
+@@ -3693,7 +3693,7 @@
  int winbindd_validate_cache(void)
  {
  	int ret = -1;
@@ -247,7 +247,7 @@
  	TDB_CONTEXT *tdb = NULL;
  
  	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3730,7 +3730,7 @@
+@@ -3735,7 +3735,7 @@
  int winbindd_validate_cache_nobackup(void)
  {
  	int ret = -1;
@@ -256,10 +256,10 @@
  
  	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
  	smb_panic_fn = validate_panic;
-Index: samba-3.3.0rc2/source/printing/nt_printing.c
+Index: samba-3.3.0/source/printing/nt_printing.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/printing/nt_printing.c
-+++ samba-3.3.0rc2/source/printing/nt_printing.c
+--- samba-3.3.0.orig/source/printing/nt_printing.c
++++ samba-3.3.0/source/printing/nt_printing.c
 @@ -2552,7 +2552,7 @@
  
  	if (geteuid() == 0) {

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/series	2009-01-28 19:05:22 UTC (rev 2528)
@@ -18,5 +18,4 @@
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 shrink-dead-code.patch
-smb.conf.5-undefined-configure.patch
 swat-status-page.patch

Deleted: branches/samba/experimental/debian/patches/smb.conf.5-undefined-configure.patch
===================================================================
--- branches/samba/experimental/debian/patches/smb.conf.5-undefined-configure.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/smb.conf.5-undefined-configure.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -1,21 +0,0 @@
-Goal: Fix a syntax error in smb.conf(5)
-
-Fixes: #512843
-
-Status wrt upstream: Reported
-
-Note: Should rather be fixed in the original XML file
-
-Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
-===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0rc2/docs/manpages/smb.conf.5
-@@ -7769,7 +7769,7 @@
- This option is only available if Samba was configured with the argument
- \-\-with\-sys\-quotas
- or on linux when
--\./configure \-\-with\-quotas
-+ \./configure \-\-with\-quotas
- was used and a working quota api was found in the system\. Most packages are configured with these options already\.
- .sp
- This parameter should specify the path to a script that can set quota for the specified arguments\.

Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch	2009-01-28 05:02:00 UTC (rev 2527)
+++ branches/samba/experimental/debian/patches/usershare.patch	2009-01-28 19:05:22 UTC (rev 2528)
@@ -8,105 +8,27 @@
 
 Status wrt upstream: Debian-specific
 
-Index: samba-3.3.0rc2/docs/manpages/smb.conf.5
+Index: samba-3.3.0/docs/manpages/net.8
 ===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0rc2/docs/manpages/smb.conf.5
-@@ -269,7 +269,7 @@
- .PP
- usershare path
- .RS 4
--Points to the directory containing the user defined share definitions\. The filesystem permissions on this directory control who can create user defined shares\.
-+Points to the directory containing the user-defined share definitions. The filesystem permissions on this directory control who can create user-defined shares.
- .RE
- .PP
- usershare prefix allow list
-@@ -287,31 +287,7 @@
- Names a pre\-existing share used as a template for creating new usershares\. All other share parameters not specified in the user defined share definition are copied from this named share\.
- .RE
- .PP
--To allow members of the UNIX group
--foo
--to create user defined shares, create the directory to contain the share definitions as follows:
--.PP
--Become root:
--.sp
--.RS 4
--.nf
--mkdir /usr/local/samba/lib/usershares
--chgrp foo /usr/local/samba/lib/usershares
--chmod 1770 /usr/local/samba/lib/usershares
--.fi
--.RE
--.PP
--Then add the parameters
--.sp
--.RS 4
--.nf
--	\fIusershare path = /usr/local/samba/lib/usershares\fR
--	\fIusershare max shares = 10\fR # (or the desired number of shares)
--.fi
--.RE
--.sp
--to the global section of your
--\fIsmb\.conf\fR\. Members of the group foo may then manipulate the user defined shares using the following commands\.
-+Members of the \fBsambashare\fR group can manipulate the user-defined shares using the following commands:
- .PP
- net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
- .RS 4
-@@ -8841,25 +8817,25 @@
- usershare path (G)
- .PP
- .RS 4
--This parameter specifies the absolute path of the directory on the filesystem used to store the user defined share definition files\. This directory must be owned by root, and have no access for other, and be writable only by the group owner\. In addition the "sticky" bit must also be set, restricting rename and delete to owners of a file (in the same way the /tmp directory is usually configured)\. Members of the group owner of this directory are the users allowed to create usershares\. If this parameter is undefined then no user defined shares are allowed\.
-+This parameter specifies the absolute path of the directory on the filesystem used to store the user-defined share definition files. This directory must be owned by root, and have no access for other, and be writable only by the group owner. In addition the "sticky" bit must also be set, restricting rename and delete to owners of a file (in the same way the /tmp directory is usually configured). Members of the group owner of this directory are the users allowed to create usershares. If this parameter is undefined then no user-defined shares are allowed.
- .sp
--For example, a valid usershare directory might be /usr/local/samba/lib/usershares, set up as follows\.
-+For example, on Debian the default usershare directory of /var/lib/samba/usershares is set up as follows.
- .sp
- 
- .sp
- .RS 4
- .nf
--	ls \-ld /usr/local/samba/lib/usershares/
--	drwxrwx\-\-T  2 root power_users 4096 2006\-05\-05 12:27 /usr/local/samba/lib/usershares/
-+	ls -ld /var/lib/samba/usershares/
-+	drwxrwx--T  2 root sambashare 4096 2006-05-05 12:27 /var/lib/samba/usershares/
- 	
- .fi
- .RE
- .sp
- .sp
--In this case, only members of the group "power_users" can create user defined shares\.
-+In this case, only members of the group "sambashare" can create user defined shares.
- .sp
- Default:
--\fI\fIusershare path\fR\fR\fI = \fR\fINULL\fR\fI \fR
-+\fB\fIusershare path\fR = /var/lib/samba/usershares \fR
- .RE
- 
- usershare prefix allow list (G)
-Index: samba-3.3.0rc2/docs/manpages/net.8
-===================================================================
---- samba-3.3.0rc2.orig/docs/manpages/net.8
-+++ samba-3.3.0rc2/docs/manpages/net.8
-@@ -666,9 +666,9 @@
- Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\. In this case the secret is used as the password for the user DN used to bind to the ldap server\.
+--- samba-3.3.0.orig/docs/manpages/net.8
++++ samba-3.3.0/docs/manpages/net.8
+@@ -903,9 +903,9 @@
+ Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
  .SS "USERSHARE"
  .PP
--Starting with version 3\.0\.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\.
-+Starting with version 3\.0\.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\.
+-Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\&.
++Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\&.
  .PP
--To set this up, first set up your smb\.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\. Set the permissions on /usr/local/samba/lib/usershares to 01770\. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\.conf a line such as : usershare max shares = 100\. To allow 100 usershare definitions\. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\.
-+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below.
+-To set this up, first set up your smb\&.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\&. Set the permissions on /usr/local/samba/lib/usershares to 01770\&. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\&. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\&.conf a line such as : usershare max shares = 100\&. To allow 100 usershare definitions\&. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\&.
++Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below\&.
  .PP
  The usershare commands are:
- .IP "" 4
-Index: samba-3.3.0rc2/source/param/loadparm.c
+ .RS 4
+Index: samba-3.3.0/source/param/loadparm.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/param/loadparm.c
-+++ samba-3.3.0rc2/source/param/loadparm.c
-@@ -4913,7 +4913,7 @@
+--- samba-3.3.0.orig/source/param/loadparm.c
++++ samba-3.3.0/source/param/loadparm.c
+@@ -4906,7 +4906,7 @@
  	string_set(&Globals.szUsersharePath, s);
  	SAFE_FREE(s);
  	string_set(&Globals.szUsershareTemplateShare, "");




More information about the Pkg-samba-maint mailing list