[Pkg-samba-maint] r3360 - in branches/samba/experimental/debian: . patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Tue Mar 2 20:51:23 UTC 2010


Author: bubulle
Date: 2010-03-02 20:51:18 +0000 (Tue, 02 Mar 2010)
New Revision: 3360

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/autoconf.patch
   branches/samba/experimental/debian/patches/undefined-symbols.patch
Log:
Release 2:3.5.0~rc3~dfsg-1


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2010-03-02 20:50:43 UTC (rev 3359)
+++ branches/samba/experimental/debian/changelog	2010-03-02 20:51:18 UTC (rev 3360)
@@ -1,3 +1,9 @@
+samba (2:3.5.0~rc3~dfsg-1) experimental; urgency=low
+
+  * New upstream release candidate
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 20 Feb 2010 08:36:57 +0100
+
 samba (2:3.5.0~rc2~dfsg-1) experimental; urgency=low
 
   * New upstream pre-release

Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch	2010-03-02 20:50:43 UTC (rev 3359)
+++ branches/samba/experimental/debian/patches/autoconf.patch	2010-03-02 20:51:18 UTC (rev 3360)
@@ -838,7 +838,7 @@
  
  ac_unique_file="include/includes.h"
  ac_default_prefix=/usr/local/samba
-@@ -956,6 +913,7 @@
+@@ -957,6 +914,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -846,7 +846,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1182,8 +1140,7 @@
+@@ -1183,8 +1141,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -856,7 +856,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1209,8 +1166,7 @@
+@@ -1210,8 +1167,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -866,7 +866,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1414,8 +1370,7 @@
+@@ -1415,8 +1371,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -876,7 +876,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1431,8 +1386,7 @@
+@@ -1432,8 +1387,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -886,7 +886,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1462,17 +1416,17 @@
+@@ -1463,17 +1417,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -910,7 +910,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1489,15 +1443,13 @@
+@@ -1490,15 +1444,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -928,7 +928,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1520,8 +1472,7 @@
+@@ -1521,8 +1473,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -938,7 +938,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1551,11 +1502,9 @@
+@@ -1552,11 +1503,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -952,7 +952,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1594,13 +1543,11 @@
+@@ -1595,13 +1544,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -968,7 +968,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1847,7 +1794,7 @@
+@@ -1848,7 +1795,7 @@
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
@@ -977,7 +977,7 @@
                you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
    PKG_CONFIG  path to pkg-config utility
-@@ -1934,178 +1881,863 @@
+@@ -1935,178 +1882,863 @@
  if $ac_init_version; then
    cat <<\_ACEOF
  Samba configure 3
@@ -1987,7 +1987,7 @@
        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
        $as_echo "$ac_var='\''$ac_val'\''"
-@@ -2149,39 +2781,41 @@
+@@ -2150,39 +2782,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -2034,7 +2034,7 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2199,8 +2833,8 @@
+@@ -2200,8 +2834,8 @@
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
@@ -2045,7 +2045,7 @@
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2208,10 +2842,10 @@
+@@ -2209,10 +2843,10 @@
  done
  
  if test -r "$cache_file"; then
@@ -2060,7 +2060,7 @@
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2219,7 +2853,7 @@
+@@ -2220,7 +2854,7 @@
      esac
    fi
  else
@@ -2069,7 +2069,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2234,11 +2868,11 @@
+@@ -2235,11 +2869,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -2083,7 +2083,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2248,17 +2882,17 @@
+@@ -2249,17 +2883,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -2105,7 +2105,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2270,43 +2904,20 @@
+@@ -2271,43 +2905,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -2156,7 +2156,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2320,14 +2931,12 @@
+@@ -2321,14 +2932,12 @@
  ac_config_headers="$ac_config_headers include/config.h"
  
  
@@ -2173,7 +2173,7 @@
  $as_echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
  	;;
  esac
-@@ -2359,24 +2968,16 @@
+@@ -2360,24 +2969,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2206,7 +2206,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2388,57 +2989,29 @@
+@@ -2389,57 +2990,29 @@
  ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  
  
@@ -2271,7 +2271,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -2454,28 +3027,24 @@
+@@ -2455,28 +3028,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2305,7 +2305,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -2491,28 +3060,24 @@
+@@ -2492,28 +3061,24 @@
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2339,7 +2339,7 @@
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
-@@ -2535,6 +3100,27 @@
+@@ -2536,6 +3101,27 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
@@ -2367,7 +2367,7 @@
  echo "LIBREPLACE_LOCATION_CHECKS: END"
  
  
-@@ -2563,7 +3149,7 @@
+@@ -2564,7 +3150,7 @@
  
  
  # Check whether --with-fhs was given.
@@ -2376,7 +2376,7 @@
    withval=$with_fhs;  case "$withval" in
    yes)
      lockdir="\${VARDIR}/lib/samba"
-@@ -2580,9 +3166,7 @@
+@@ -2581,9 +3167,7 @@
      cachedir="\${VARDIR}/lib/samba"
      ncalrpcdir="\${VARDIR}/ncalrpc"
  
@@ -2387,7 +2387,7 @@
  
      ;;
    esac
-@@ -2593,13 +3177,13 @@
+@@ -2594,13 +3178,13 @@
  # set private directory location
  
  # Check whether --with-privatedir was given.
@@ -2403,7 +2403,7 @@
  $as_echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2613,13 +3197,13 @@
+@@ -2614,13 +3198,13 @@
  # set root sbin directory location
  
  # Check whether --with-rootsbindir was given.
@@ -2419,7 +2419,7 @@
  $as_echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2633,13 +3217,13 @@
+@@ -2634,13 +3218,13 @@
  # set lock directory location
  
  # Check whether --with-lockdir was given.
@@ -2435,7 +2435,7 @@
  $as_echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2653,13 +3237,13 @@
+@@ -2654,13 +3238,13 @@
  # set state directory location
  
  # Check whether --with-statedir was given.
@@ -2451,7 +2451,7 @@
  $as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2673,13 +3257,13 @@
+@@ -2674,13 +3258,13 @@
  # set cache directory location
  
  # Check whether --with-cachedir was given.
@@ -2467,7 +2467,7 @@
  $as_echo "$as_me: WARNING: --with-cachedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2693,13 +3277,13 @@
+@@ -2694,13 +3278,13 @@
  # set pid directory location
  
  # Check whether --with-piddir was given.
@@ -2483,13 +2483,13 @@
  $as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2713,13 +3297,13 @@
+@@ -2714,13 +3298,13 @@
  # set ncalrpc directory location
  
- # Check whether --with-ncalprcdir was given.
--if test "${with_ncalprcdir+set}" = set; then
-+if test "${with_ncalprcdir+set}" = set; then :
-   withval=$with_ncalprcdir;  case "$withval" in
+ # Check whether --with-ncalrpcdir was given.
+-if test "${with_ncalrpcdir+set}" = set; then
++if test "${with_ncalrpcdir+set}" = set; then :
+   withval=$with_ncalrpcdir;  case "$withval" in
    yes|no)
    #
    # Just in case anybody calls it without argument
@@ -2499,7 +2499,7 @@
  $as_echo "$as_me: WARNING: --with-ncalrpcdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2733,13 +3317,13 @@
+@@ -2734,13 +3318,13 @@
  # set SWAT directory location
  
  # Check whether --with-swatdir was given.
@@ -2515,7 +2515,7 @@
  $as_echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2753,13 +3337,13 @@
+@@ -2754,13 +3338,13 @@
  # set configuration directory location
  
  # Check whether --with-configdir was given.
@@ -2531,7 +2531,7 @@
  $as_echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2773,13 +3357,13 @@
+@@ -2774,13 +3358,13 @@
  # set log directory location
  
  # Check whether --with-logfilebase was given.
@@ -2547,7 +2547,7 @@
  $as_echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2794,13 +3378,13 @@
+@@ -2795,13 +3379,13 @@
  # set shared modules (internal lib) directory location
  
  # Check whether --with-modulesdir was given.
@@ -2563,7 +2563,7 @@
  $as_echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
    ;;
    * )
-@@ -2814,13 +3398,13 @@
+@@ -2815,13 +3399,13 @@
  # set PAM modules directory location
  
  # Check whether --with-pammodulesdir was given.
@@ -2579,7 +2579,7 @@
  $as_echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2834,13 +3418,13 @@
+@@ -2835,13 +3419,13 @@
  # set man directory location
  
  # Check whether --with-mandir was given.
@@ -2595,7 +2595,7 @@
  $as_echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
    ;;
    * )
-@@ -2854,13 +3438,13 @@
+@@ -2855,13 +3439,13 @@
  # set locale directory location
  
  # Check whether --with-localedir was given.
@@ -2611,7 +2611,7 @@
  $as_echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
    ;;
    *)
-@@ -2874,13 +3458,13 @@
+@@ -2875,13 +3459,13 @@
  # set codepage directory location
  
  # Check whether --with-codepagedir was given.
@@ -2627,7 +2627,7 @@
  $as_echo "$as_me: WARNING: --with-codepagedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2914,10 +3498,10 @@
+@@ -2915,10 +3499,10 @@
  
  
  # Check whether --with-selftest-prefix was given.
@@ -2640,7 +2640,7 @@
  $as_echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2934,10 +3518,10 @@
+@@ -2935,10 +3519,10 @@
  
  
  # Check whether --with-selftest-shrdir was given.
@@ -2653,7 +2653,7 @@
  $as_echo "$as_me: WARNING: --with-selftest-shrdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2956,19 +3540,15 @@
+@@ -2957,19 +3541,15 @@
  
  
  # Check whether --with-smbtorture4_path was given.
@@ -2676,7 +2676,7 @@
      fi
      smbtorture4_option="-t $withval"
    ;;
-@@ -2983,19 +3563,15 @@
+@@ -2984,19 +3564,15 @@
  
  
  # Check whether --with-selftest_custom_conf was given.
@@ -2699,7 +2699,7 @@
      fi
      selftest_custom_conf="-c $withval"
    ;;
-@@ -3008,7 +3584,7 @@
+@@ -3009,7 +3585,7 @@
  ## so that we don't mix -O and -g
  debug=no
  # Check whether --enable-debug was given.
@@ -2708,7 +2708,7 @@
    enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
  	debug=yes
      fi
-@@ -3018,7 +3594,7 @@
+@@ -3019,7 +3595,7 @@
  
  developer=no
  # Check whether --enable-developer was given.
@@ -2717,7 +2717,7 @@
    enableval=$enable_developer; if eval "test x$enable_developer = xyes"; then
          debug=yes
          developer=yes
-@@ -3028,7 +3604,7 @@
+@@ -3029,7 +3605,7 @@
  
  krb5developer=no
  # Check whether --enable-krb5developer was given.
@@ -2726,7 +2726,7 @@
    enableval=$enable_krb5developer; if eval "test x$enable_krb5developer = xyes"; then
          debug=yes
          developer=yes
-@@ -3039,7 +3615,7 @@
+@@ -3040,7 +3616,7 @@
  
  picky_developer=no
  # Check whether --enable-picky-developer was given.
@@ -2735,7 +2735,7 @@
    enableval=$enable_picky_developer; if eval "test x$enable_picky_developer = xyes"; then
          debug=yes
          developer=yes
-@@ -3050,7 +3626,7 @@
+@@ -3051,7 +3627,7 @@
  
  
  # Check whether --with-cfenc was given.
@@ -2744,7 +2744,7 @@
    withval=$with_cfenc;
  # May be in source $withval/CoreFoundation/StringEncodings.subproj.
  # Should have been in framework $withval/CoreFoundation.framework/Headers.
-@@ -3147,9 +3723,9 @@
+@@ -3148,9 +3724,9 @@
  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
@@ -2756,7 +2756,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3160,24 +3736,24 @@
+@@ -3161,24 +3737,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2786,7 +2786,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3187,9 +3763,9 @@
+@@ -3188,9 +3764,9 @@
    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
@@ -2798,7 +2798,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3200,24 +3776,24 @@
+@@ -3201,24 +3777,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2828,7 +2828,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3226,7 +3802,7 @@
+@@ -3227,7 +3803,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2837,7 +2837,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3240,9 +3816,9 @@
+@@ -3241,9 +3817,9 @@
            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
@@ -2849,7 +2849,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3253,24 +3829,24 @@
+@@ -3254,24 +3830,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2879,7 +2879,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3280,9 +3856,9 @@
+@@ -3281,9 +3857,9 @@
  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
@@ -2891,7 +2891,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3294,18 +3870,18 @@
+@@ -3295,18 +3871,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2913,7 +2913,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3324,10 +3900,10 @@
+@@ -3325,10 +3901,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2926,7 +2926,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3339,9 +3915,9 @@
+@@ -3340,9 +3916,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2938,7 +2938,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3352,24 +3928,24 @@
+@@ -3353,24 +3929,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2968,7 +2968,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3383,9 +3959,9 @@
+@@ -3384,9 +3960,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -2980,7 +2980,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3396,24 +3972,24 @@
+@@ -3397,24 +3973,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3010,7 +3010,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3426,7 +4002,7 @@
+@@ -3427,7 +4003,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3019,7 +3019,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3437,57 +4013,37 @@
+@@ -3438,57 +4014,37 @@
  fi
  
  
@@ -3097,7 +3097,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3503,8 +4059,8 @@
+@@ -3504,8 +4060,8 @@
  # 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.
@@ -3108,7 +3108,7 @@
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
  # The possible output files:
-@@ -3520,17 +4076,17 @@
+@@ -3521,17 +4077,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -3131,7 +3131,7 @@
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3547,7 +4103,7 @@
+@@ -3548,7 +4104,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -3140,7 +3140,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3566,84 +4122,42 @@
+@@ -3567,84 +4123,42 @@
  else
    ac_file=''
  fi
@@ -3246,7 +3246,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3658,32 +4172,83 @@
+@@ -3659,32 +4173,83 @@
    esac
  done
  else
@@ -3346,7 +3346,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3695,17 +4260,17 @@
+@@ -3696,17 +4261,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -3369,7 +3369,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3718,31 +4283,23 @@
+@@ -3719,31 +4284,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -3408,7 +3408,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3756,37 +4313,16 @@
+@@ -3757,37 +4314,16 @@
    return 0;
  }
  _ACEOF
@@ -3449,7 +3449,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3795,20 +4331,16 @@
+@@ -3796,20 +4332,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3473,7 +3473,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3819,35 +4351,11 @@
+@@ -3820,35 +4352,11 @@
    return 0;
  }
  _ACEOF
@@ -3512,7 +3512,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3858,36 +4366,12 @@
+@@ -3859,36 +4367,12 @@
    return 0;
  }
  _ACEOF
@@ -3553,7 +3553,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3898,42 +4382,17 @@
+@@ -3899,42 +4383,17 @@
    return 0;
  }
  _ACEOF
@@ -3598,7 +3598,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3950,18 +4409,14 @@
+@@ -3951,18 +4410,14 @@
      CFLAGS=
    fi
  fi
@@ -3620,7 +3620,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -4018,32 +4473,9 @@
+@@ -4019,32 +4474,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3654,7 +3654,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4054,17 +4486,19 @@
+@@ -4055,17 +4487,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3677,7 +3677,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4075,18 +4509,14 @@
+@@ -4076,18 +4510,14 @@
  CFLAGS=$savedCFLAGS
  
  if test x"$GCC" != x"yes" ; then
@@ -3699,7 +3699,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdbool.h>
-@@ -4228,32 +4658,9 @@
+@@ -4229,32 +4659,9 @@
  for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
  do
    CC="$ac_save_CC $ac_arg"
@@ -3733,7 +3733,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c99" != "xno" && break
  done
-@@ -4264,26 +4671,28 @@
+@@ -4265,26 +4672,28 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c99" in
    x)
@@ -3767,7 +3767,7 @@
  $as_echo "${GCC_VERSION}" >&6; }
  fi
  
-@@ -4292,14 +4701,14 @@
+@@ -4293,14 +4702,14 @@
  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
@@ -3784,7 +3784,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -4314,11 +4723,7 @@
+@@ -4315,11 +4724,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3797,7 +3797,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4327,78 +4732,34 @@
+@@ -4328,78 +4733,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -3881,7 +3881,7 @@
    break
  fi
  
-@@ -4410,7 +4771,7 @@
+@@ -4411,7 +4772,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -3890,7 +3890,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -4421,11 +4782,7 @@
+@@ -4422,11 +4783,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3903,7 +3903,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4434,87 +4791,40 @@
+@@ -4435,87 +4792,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -4000,7 +4000,7 @@
  fi
  
  ac_ext=c
-@@ -4524,9 +4834,9 @@
+@@ -4525,9 +4835,9 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -4012,7 +4012,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4537,7 +4847,7 @@
+@@ -4538,7 +4848,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4021,7 +4021,7 @@
      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
-@@ -4557,7 +4867,7 @@
+@@ -4558,7 +4868,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4030,7 +4030,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -4572,26 +4882,24 @@
+@@ -4573,26 +4883,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -4062,7 +4062,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4605,7 +4913,7 @@
+@@ -4606,7 +4914,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4071,7 +4071,7 @@
      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
-@@ -4625,7 +4933,7 @@
+@@ -4626,7 +4934,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4080,7 +4080,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4640,12 +4948,10 @@
+@@ -4641,12 +4949,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -4095,7 +4095,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4653,21 +4959,17 @@
+@@ -4654,21 +4960,17 @@
  
     fi
  fi
@@ -4121,7 +4121,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4682,48 +4984,23 @@
+@@ -4683,48 +4985,23 @@
    return 0;
  }
  _ACEOF
@@ -4175,7 +4175,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4733,18 +5010,14 @@
+@@ -4734,18 +5011,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4197,7 +4197,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4754,14 +5027,10 @@
+@@ -4755,14 +5028,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4214,7 +4214,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -4788,118 +5057,34 @@
+@@ -4789,118 +5058,34 @@
    return 0;
  }
  _ACEOF
@@ -4346,7 +4346,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4910,139 +5095,8 @@
+@@ -4911,139 +5096,8 @@
  
  
  
@@ -4488,7 +4488,7 @@
    MINIX=yes
  else
    MINIX=
-@@ -5051,34 +5105,23 @@
+@@ -5052,34 +5106,23 @@
  
    if test "$MINIX" = yes; then
  
@@ -4529,7 +4529,7 @@
  /* end confdefs.h.  */
  
  #	  define __EXTENSIONS__ 1
-@@ -5091,71 +5134,35 @@
+@@ -5092,71 +5135,35 @@
    return 0;
  }
  _ACEOF
@@ -4612,7 +4612,7 @@
  /* end confdefs.h.  */
  #ifndef __APPLE_CC__
  	       not a universal capable compiler
-@@ -5163,46 +5170,34 @@
+@@ -5164,46 +5171,34 @@
  	     typedef int dummy;
  
  _ACEOF
@@ -4681,7 +4681,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  	     #include <sys/param.h>
-@@ -5220,30 +5215,9 @@
+@@ -5221,30 +5216,9 @@
    return 0;
  }
  _ACEOF
@@ -4714,7 +4714,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  		#include <sys/param.h>
-@@ -5259,49 +5233,18 @@
+@@ -5260,49 +5234,18 @@
    return 0;
  }
  _ACEOF
@@ -4767,7 +4767,7 @@
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5316,30 +5259,9 @@
+@@ -5317,30 +5260,9 @@
    return 0;
  }
  _ACEOF
@@ -4800,7 +4800,7 @@
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5354,51 +5276,20 @@
+@@ -5355,51 +5277,20 @@
    return 0;
  }
  _ACEOF
@@ -4856,7 +4856,7 @@
  /* end confdefs.h.  */
  short int ascii_mm[] =
  		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -5424,24 +5315,7 @@
+@@ -5425,24 +5316,7 @@
    return 0;
  }
  _ACEOF
@@ -4882,7 +4882,7 @@
    if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
  	      ac_cv_c_bigendian=yes
  	    fi
-@@ -5453,20 +5327,10 @@
+@@ -5454,20 +5328,10 @@
  		ac_cv_c_bigendian=unknown
  	      fi
  	    fi
@@ -4904,7 +4904,7 @@
  /* end confdefs.h.  */
  $ac_includes_default
  int
-@@ -5486,81 +5350,43 @@
+@@ -5487,81 +5351,43 @@
    return 0;
  }
  _ACEOF
@@ -4998,7 +4998,7 @@
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -5569,41 +5395,17 @@
+@@ -5570,41 +5396,17 @@
  #endif
  
  _ACEOF
@@ -5042,7 +5042,7 @@
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
-@@ -5623,14 +5425,10 @@
+@@ -5624,14 +5426,10 @@
  saved_CFLAGS="$CFLAGS";
  c99_init=no
  if test x"$c99_init" = x"no"; then
@@ -5059,7 +5059,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5643,45 +5441,20 @@
+@@ -5644,45 +5442,20 @@
    return 0;
  }
  _ACEOF
@@ -5110,7 +5110,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5694,45 +5467,20 @@
+@@ -5695,45 +5468,20 @@
    return 0;
  }
  _ACEOF
@@ -5161,7 +5161,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5745,45 +5493,20 @@
+@@ -5746,45 +5494,20 @@
    return 0;
  }
  _ACEOF
@@ -5212,7 +5212,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5796,45 +5519,20 @@
+@@ -5797,45 +5520,20 @@
    return 0;
  }
  _ACEOF
@@ -5263,7 +5263,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5847,34 +5545,13 @@
+@@ -5848,34 +5546,13 @@
    return 0;
  }
  _ACEOF
@@ -5301,7 +5301,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5893,7 +5570,7 @@
+@@ -5894,7 +5571,7 @@
  else
      CFLAGS="$saved_CFLAGS"
      saved_CFLAGS=""
@@ -5310,7 +5310,7 @@
  $as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
  fi
  
-@@ -5912,10 +5589,10 @@
+@@ -5913,10 +5590,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -5323,7 +5323,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5923,11 +5600,11 @@
+@@ -5924,11 +5601,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5339,7 +5339,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -5964,7 +5641,7 @@
+@@ -5965,7 +5642,7 @@
      ;;
  esac
  
@@ -5348,7 +5348,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -5980,7 +5657,7 @@
+@@ -5981,7 +5658,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -5357,7 +5357,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -5992,17 +5669,13 @@
+@@ -5993,17 +5670,13 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -5378,7 +5378,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -6027,54 +5700,27 @@
+@@ -6028,54 +5701,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -5441,7 +5441,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -6082,7 +5728,6 @@
+@@ -6083,7 +5729,6 @@
  
  
  
@@ -5449,7 +5449,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE_EXTENDED
  #define _XOPEN_SOURCE_EXTENDED 1
-@@ -6091,15 +5736,15 @@
+@@ -6092,15 +5737,15 @@
  
  
  # Check whether --enable-largefile was given.
@@ -5468,7 +5468,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
-@@ -6108,11 +5753,7 @@
+@@ -6109,11 +5754,7 @@
         while :; do
  	 # IRIX 6.2 and later do not support large files by default,
  	 # so use the C compiler's -n32 option if that helps.
@@ -5481,7 +5481,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6131,60 +5772,14 @@
+@@ -6132,60 +5773,14 @@
    return 0;
  }
  _ACEOF
@@ -5544,7 +5544,7 @@
  rm -f core conftest.err conftest.$ac_objext
  	 break
         done
-@@ -6192,23 +5787,19 @@
+@@ -6193,23 +5788,19 @@
         rm -f conftest.$ac_ext
      fi
  fi
@@ -5572,7 +5572,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6227,38 +5818,11 @@
+@@ -6228,38 +5819,11 @@
    return 0;
  }
  _ACEOF
@@ -5613,7 +5613,7 @@
  /* end confdefs.h.  */
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -6278,38 +5842,15 @@
+@@ -6279,38 +5843,15 @@
    return 0;
  }
  _ACEOF
@@ -5654,7 +5654,7 @@
  $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
  case $ac_cv_sys_file_offset_bits in #(
    no | unknown) ;;
-@@ -6321,17 +5862,13 @@
+@@ -6322,17 +5863,13 @@
  esac
  rm -rf conftest*
    if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -5675,7 +5675,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6350,38 +5887,11 @@
+@@ -6351,38 +5888,11 @@
    return 0;
  }
  _ACEOF
@@ -5716,7 +5716,7 @@
  /* end confdefs.h.  */
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -6401,38 +5911,15 @@
+@@ -6402,38 +5912,15 @@
    return 0;
  }
  _ACEOF
@@ -5757,7 +5757,7 @@
  $as_echo "$ac_cv_sys_large_files" >&6; }
  case $ac_cv_sys_large_files in #(
    no | unknown) ;;
-@@ -6456,31 +5943,25 @@
+@@ -6457,31 +5944,25 @@
  	*hpux*)
  		# mmap on HPUX is completely broken...
  
@@ -5794,7 +5794,7 @@
  
  		if test "${GCC}" != "yes"; then
  			## for funky AIX compiler using strncpy()
-@@ -6492,7 +5973,6 @@
+@@ -6493,7 +5974,6 @@
  
  
  
@@ -5802,7 +5802,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 600
-@@ -6502,7 +5982,6 @@
+@@ -6503,7 +5983,6 @@
  
  
  
@@ -5810,7 +5810,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _OSF_SOURCE
  #define _OSF_SOURCE 1
-@@ -6519,9 +5998,7 @@
+@@ -6520,9 +5999,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
  
@@ -5821,7 +5821,7 @@
  
  				;;
  		esac
-@@ -6530,9 +6007,7 @@
+@@ -6531,9 +6008,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_SYSV"
  
@@ -5832,7 +5832,7 @@
  
  				;;
  		esac
-@@ -6541,978 +6016,385 @@
+@@ -6542,978 +6017,385 @@
  
  
  
@@ -7066,7 +7066,7 @@
  _ACEOF
  
  
-@@ -7520,30402 +6402,2005 @@
+@@ -7521,30401 +6403,2005 @@
  # 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.
@@ -8400,10 +8400,10 @@
 -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
@@ -8714,7 +8714,14 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_int16_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
+ 
+ 
 +# compile with optimization and without debugging by default, but
 +# allow people to set their own preference.
 +# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
@@ -8722,42 +8729,26 @@
 +# by default.
 +if test "x$debug" = "xyes" ; then
 +	CFLAGS="${CFLAGS} -g"
-+fi
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +if test "x$CFLAGS" = x; then
 +  CFLAGS="-O"
  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
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+  enableval=$enable_socket_wrapper;
-+fi
- 
- 
--fi
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if eval "test x$developer = xyes"; then
-+	enable_socket_wrapper=yes
- 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
-+if eval "test x$enable_socket_wrapper = xyes"; then
  
--fi
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++  enableval=$enable_socket_wrapper;
+ fi
  
 -{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
 -$as_echo_n "checking for uint16_t... " >&6; }
@@ -8837,27 +8828,30 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	DEFAULT_TEST_OPTIONS=--socket-wrapper
-+	HAVE_SOCKET_WRAPPER=yes
  
 -	ac_cv_type_uint16_t=yes
-+	# this is only used for samba3
-+	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++	enable_socket_wrapper=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
++if eval "test x$enable_socket_wrapper = xyes"; then
  
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
  
 -fi
++	DEFAULT_TEST_OPTIONS=--socket-wrapper
++	HAVE_SOCKET_WRAPPER=yes
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+  enableval=$enable_nss_wrapper;
++	# this is only used for samba3
++	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
 -$as_echo "$ac_cv_type_uint16_t" >&6; }
@@ -8869,13 +8863,8 @@
 -#define uint16_t unsigned short
 -_ACEOF
  
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+	enable_nss_wrapper=yes
- fi
+-fi
  
-+if eval "test x$enable_nss_wrapper = xyes"; then
  
 -if test $ac_cv_sizeof_int -eq 4 ; then
 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
@@ -8956,25 +8945,26 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
  
 -	ac_cv_type_int32_t=yes
-+	HAVE_NSS_WRAPPER=yes
-+
-+	# this is only used for samba3
-+	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++  enableval=$enable_nss_wrapper;
  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
++HAVE_NSS_WRAPPER=no
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++if eval "test x$developer = xyes"; then
++	enable_nss_wrapper=yes
+ 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
@@ -8984,8 +8974,10 @@
 -cat >>confdefs.h <<_ACEOF
 -#define int32_t int
 -_ACEOF
++if eval "test x$enable_nss_wrapper = xyes"; then
  
 -fi
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
  
 -{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
 -$as_echo_n "checking for uint32_t... " >&6; }
@@ -9065,20 +9057,11 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-+SWAT_INSTALL_TARGETS=installswat
-+
-+# Check whether --enable-swat was given.
-+if test "${enable_swat+set}" = set; then :
-+  enableval=$enable_swat;
-+    case "$enable_swat" in
-+	no)
-+	    SWAT_SBIN_TARGETS=''
-+	    SWAT_INSTALL_TARGETS=''
-+	    ;;
-+    esac
++	HAVE_NSS_WRAPPER=yes
  
 -	ac_cv_type_uint32_t=yes
++	# this is only used for samba3
++	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9107,17 +9090,8 @@
 -{ $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
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+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:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
-+$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-+if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_int32_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -9158,22 +9132,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -Wdeclaration-after-statement";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Wdeclaration_after_statement=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -9183,12 +9142,7 @@
 -  ;
 -  return 0;
 -}
-+
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -9208,37 +9162,32 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Wdeclaration_after_statement=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
++
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++  enableval=$enable_swat;
++    case "$enable_swat" in
++	no)
++	    SWAT_SBIN_TARGETS=''
++	    SWAT_INSTALL_TARGETS=''
++	    ;;
++    esac
+ 
 -	ac_cv_type_int32_t=yes
-+  samba_cv_HAVE_Wdeclaration_after_statement=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
  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
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
  
  
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
-+$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
@@ -9247,37 +9196,26 @@
 -if test "x$ac_cv_type_int32_t" = x""yes; then
 -  :
 -else
-+	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+	fi
  
 -cat >>confdefs.h <<_ACEOF
 -#define int32_t long
 -_ACEOF
-+	#-Werror-implicit-function-declaration
-+	{ $as_echo "$as_me:${as_lineno-$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; }
-+if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
  
 -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
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=cross
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++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:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  ac_cv_type_uint32_t=no
 -cat >conftest.$ac_ext <<_ACEOF
@@ -9285,8 +9223,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -9296,12 +9233,7 @@
 -  ;
 -  return 0;
 -}
-+
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -9358,12 +9290,23 @@
 -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
--else
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Wdeclaration-after-statement";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=cross
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -30115,8 +30058,7 @@
 -
 -
 -
--
--for ac_header in limits.h float.h pthread.h libintl.h
+-for ac_header in limits.h float.h libintl.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -35022,9 +34964,7 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -35044,12 +34984,9 @@
 -fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+  samba_cv_HAVE_Werror_implicit_function_declaration=no
- fi
+-fi
 -rm -f conftest.val
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
 -
@@ -35125,7 +35062,7 @@
 -  }
 -  return !cs[0] && !zero.x;
 -#endif
- 
+-
 -  ;
 -  return 0;
 -}
@@ -35152,49 +35089,60 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -	ac_cv_c_const=no
--fi
- 
++	    int main(void)
++	    {
++	    	return 0;
++	    }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=yes
++else
++  samba_cv_HAVE_Wdeclaration_after_statement=no
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 -$as_echo "$ac_cv_c_const" >&6; }
 -if test $ac_cv_c_const = no; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
-+$as_echo "$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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define const /**/
 -_ACEOF
-+	# krb5developer is like developer, except we don't get
-+	# -Wstrict-prototypes.
-+       if test x"$krb5_developer" != x"$yes" ; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+       fi
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
++
  
-+       if test x"$picky_developer" = x"yes"; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+       fi
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
  
 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
 -$as_echo_n "checking for inline... " >&6; }
 -if test "${ac_cv_c_inline+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++	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:${as_lineno-$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; }
++if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_c_inline=no
 -for ac_kw in inline __inline__ __inline; do
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -35202,14 +35150,33 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Werror_implicit_function_declaration=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#ifndef __cplusplus
 -typedef int foo_t;
 -static $ac_kw foo_t static_foo () {return 0; }
 -$ac_kw foo_t foo () {return 0; }
 -#endif
--
--_ACEOF
+ 
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -35229,14 +35196,56 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_inline=$ac_kw
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  samba_cv_HAVE_Werror_implicit_function_declaration=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
+ 
+ 
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++$as_echo "$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
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  test "$ac_cv_c_inline" != no && break
+-done
++	# krb5developer is like developer, except we don't get
++	# -Wstrict-prototypes.
++       if test x"$krb5_developer" != x"$yes" ; then
++	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
++       fi
+ 
++       if test x"$picky_developer" = x"yes"; then
++	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
++       fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
+ 
 +#################################################
 +# check for a shared memory profiling support
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
 +$as_echo_n "checking whether to use profiling... " >&6; }
- 
++
 +# Check whether --with-profiling-data was given.
 +if test "${with_profiling_data+set}" = set; then :
 +  withval=$with_profiling_data;  case "$withval" in
@@ -35244,32 +35253,13 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
  
--fi
+-case $ac_cv_c_inline in
+-  inline | yes) ;;
 +$as_echo "#define WITH_PROFILE 1" >>confdefs.h
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  test "$ac_cv_c_inline" != no && break
--done
++
 +    samba_cv_WITH_PROFILE=yes
 +    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    samba_cv_WITH_PROFILE=no
-+    ;;
-+  esac
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--$as_echo "$ac_cv_c_inline" >&6; }
- 
- 
--case $ac_cv_c_inline in
--  inline | yes) ;;
--  *)
+   *)
 -    case $ac_cv_c_inline in
 -      no) ac_val=;;
 -      *) ac_val=$ac_cv_c_inline;;
@@ -35279,14 +35269,25 @@
 -#define inline $ac_val
 -#endif
 -_ACEOF
--    ;;
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    samba_cv_WITH_PROFILE=no
+     ;;
 -esac
-+merged_build_possible=yes
++  esac
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++fi
  
  
 - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 -if test "${ac_cv_c_bigendian+set}" = set; then
++merged_build_possible=yes
++
++
 +for ac_prog in gawk mawk nawk awk
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -36490,7 +36491,22 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Werror";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Werror=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36500,7 +36516,12 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++  int main(void)
++  {
++  	return 0;
++  }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36520,16 +36541,55 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Werror=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_size_t=yes
++  samba_cv_HAVE_Werror=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 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
+-
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
--	ac_cv_type_size_t=yes
--fi
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
++$as_echo "$samba_cv_HAVE_Werror" >&6; }
++if test x"$samba_cv_HAVE_Werror" = x"yes"; then
++   Werror_FLAGS="-Werror"
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
++$as_echo_n "checking that the C compiler understands -w2... " >&6; }
++if test "${samba_cv_HAVE_w2+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
  
 -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
+-  :
++
 +	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -Werror";
++	CFLAGS="$CFLAGS -w2";
 +	export CFLAGS;
 +	old_CPPFLAGS="$CPPFLAGS";
 +	CPPFLAGS="$CPPFLAGS";
@@ -36538,38 +36598,31 @@
 +	LDFLAGS="$LDFLAGS";
 +	export LDFLAGS;
 +	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Werror=cross
++  samba_cv_HAVE_w2=cross
  else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
 +  int main(void)
 +  {
 +  	return 0;
 +  }
-+_ACEOF
+ _ACEOF
+-
 +if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror=yes
++  samba_cv_HAVE_w2=yes
 +else
-+  samba_cv_HAVE_Werror=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  samba_cv_HAVE_w2=no
++fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $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
--  :
--else
  
--cat >>confdefs.h <<_ACEOF
--#define size_t unsigned int
--_ACEOF
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
+-if test "${ac_cv_type_pid_t+set}" = set; then
 +	CFLAGS="$old_CFLAGS";
 +	old_CFLAGS="";
 +	export CFLAGS;
@@ -36579,17 +36632,17 @@
 +	LDFLAGS="$old_LDFLAGS";
 +	old_LDFLAGS="";
 +	export LDFLAGS;
- 
- fi
--
--{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
--$as_echo_n "checking for pid_t... " >&6; }
--if test "${ac_cv_type_pid_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
-+$as_echo "$samba_cv_HAVE_Werror" >&6; }
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+   Werror_FLAGS="-Werror"
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
++$as_echo "$samba_cv_HAVE_w2" >&6; }
++if test x"$samba_cv_HAVE_w2" = x"yes"; then
++   Werror_FLAGS="-w2"
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
++$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++if test "${samba_cv_HAVE_errwarn+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  ac_cv_type_pid_t=no
 -cat >conftest.$ac_ext <<_ACEOF
@@ -36631,7 +36684,22 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -errwarn=%all";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_errwarn=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36641,7 +36709,12 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++   int main(void)
++   {
++	return 0;
++   }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36661,80 +36734,67 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
-+$as_echo_n "checking that the C compiler understands -w2... " >&6; }
-+if test "${samba_cv_HAVE_w2+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_errwarn=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_pid_t=yes
--fi
++  samba_cv_HAVE_errwarn=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -w2";
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
 +	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
 +	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
 +	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_w2=cross
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
-+  int main(void)
-+  {
-+  	return 0;
-+  }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_w2=yes
-+else
-+  samba_cv_HAVE_w2=no
  fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++   Werror_FLAGS="-errwarn=%all"
  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
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define pid_t int
 -_ACEOF
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
+-
+ fi
++fi
++
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
  
- fi
--
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
 -$as_echo_n "checking for struct stat.st_rdev... " >&6; }
 -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+   Werror_FLAGS="-w2"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
++$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -36772,11 +36832,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36785,21 +36841,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -errwarn=%all";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_errwarn=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36810,12 +36852,7 @@
 -  ;
 -  return 0;
 -}
-+
-+   int main(void)
-+   {
-+	return 0;
-+   }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36835,73 +36872,37 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_errwarn=yes
++    if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  samba_cv_HAVE_errwarn=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
- 
+-
 -	ac_cv_member_struct_stat_st_rdev=no
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+   Werror_FLAGS="-errwarn=%all"
-+fi
- fi
--
+-fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-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
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
-+$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-+if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
 +	#include <stdio.h>
 +	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
 +	int main(void) {
 +		enum negative_values v1 = NEGATIVE_VALUE;
 +		unsigned v2 = NEGATIVE_VALUE;
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_RDEV 1
+-_ACEOF
 +		if (v1 != 0xFFFFFFFF) {
 +			printf("%u != 0xFFFFFFFF\n", v1);
 +			return 1;
@@ -37252,6 +37253,14 @@
 -	 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
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }; c99_init=yes
@@ -37259,70 +37268,43 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_type_wchar_t=yes
+-
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
  fi
 -
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--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 "`uname`" = "HP-UX"; then
-+  if test "$ac_cv_c_compiler_gnu" = no; then
-+	# special override for broken HP-UX compiler - I can't find a way to test
-+	# this properly (its a compiler bug)
-+	CFLAGS="$CFLAGS -AC99";
-+	c99_init=yes;
-+  fi
- 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
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define wchar_t unsigned short
 -_ACEOF
-+if test x"$c99_init" = x"yes"; then
-+    saved_CFLAGS=""
+-
+-fi
+-
  
-+else
-+    CFLAGS="$saved_CFLAGS"
-+    saved_CFLAGS=""
-+    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
- fi
- 
- 
 -############################################
 -# for cups support we need libcups, and a handful of header files
-+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
-+$as_echo_n "checking uname -s... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
-+$as_echo "${UNAME_S}" >&6; }
- 
+-
 -# Check whether --enable-cups was given.
 -if test "${enable_cups+set}" = set; then
 -  enableval=$enable_cups;
--fi
-+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
-+$as_echo_n "checking uname -r... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
-+$as_echo "${UNAME_R}" >&6; }
++if test "`uname`" = "HP-UX"; then
++  if test "$ac_cv_c_compiler_gnu" = no; then
++	# special override for broken HP-UX compiler - I can't find a way to test
++	# this properly (its a compiler bug)
++	CFLAGS="$CFLAGS -AC99";
++	c99_init=yes;
++  fi
+ fi
  
-+UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
-+$as_echo_n "checking uname -m... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
-+$as_echo "${UNAME_M}" >&6; }
++if test x"$c99_init" = x"yes"; then
++    saved_CFLAGS=""
  
 -if test x$enable_cups != xno; then
 -	# Extract the first word of "cups-config", so it can be a program name with args.
@@ -37351,54 +37333,44 @@
 -done
 -done
 -IFS=$as_save_IFS
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
-+$as_echo_n "checking uname -p... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
-+$as_echo "${UNAME_P}" >&6; }
- 
+-
 -  ;;
-+UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
-+$as_echo_n "checking uname -i... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
-+$as_echo "${UNAME_I}" >&6; }
-+
-+  case "$host_os" in
-+	*irix6*)
-+		#TODO add to libreplace
-+		if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
-+																								CFLAGS="$CFLAGS -diag_error 1035"
-+												CFLAGS="$CFLAGS -woff 1209,1174,3201"
-+		fi
-+	;;
- esac
+-esac
 -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; }
--else
+ else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
--fi
++    CFLAGS="$saved_CFLAGS"
++    saved_CFLAGS=""
++    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
  
-+DYNEXP=
  
-+LDSHFLAGS_Z_DEFS=
++UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
++$as_echo_n "checking uname -s... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
++$as_echo "${UNAME_S}" >&6; }
  
 -        if test "x$CUPS_CONFIG" != x; then
-+LDSHFLAGS_Z_NODEFS=
- 
+-
 -		ac_save_CFLAGS=$CFLAGS
 -		ac_save_LDFLAGS=$LDFLAGS
 -		ac_save_PRINT_LIBS=$PRINT_LIBS
 -		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 -		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
 -		PRINT_LIBS="$PRINT_LIBS -lcups"
+-
++UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
++$as_echo_n "checking uname -r... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
++$as_echo "${UNAME_R}" >&6; }
  
-+default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
- 
 -for ac_header in cups/cups.h cups/language.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37447,31 +37419,28 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
++UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
++$as_echo_n "checking uname -m... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
++$as_echo "${UNAME_M}" >&6; }
  
 -	ac_header_compiler=no
-+if test "x$developer" = xyes; then
-+   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
-+   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
- fi
+-fi
++UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
++$as_echo_n "checking uname -p... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
++$as_echo "${UNAME_P}" >&6; }
  
 -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; }
-+#
-+# Config CPPFLAG settings for strange OS's that must be set
-+# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
-+# case statement; its first reference must be unconditional.
-+#
-+case "$host_os" in
-+    *hpux*)
-+#
-+# Defines needed for HPUX support.
-+# HPUX has bigcrypt but (sometimes?) doesn't use it for
-+# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
-+#
-+      case `uname -r` in
-+		*9*|*10*|*11)
++UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
++$as_echo_n "checking uname -i... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
++$as_echo "${UNAME_I}" >&6; }
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -37488,7 +37457,15 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++  case "$host_os" in
++	*irix6*)
++		#TODO add to libreplace
++		if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++																								CFLAGS="$CFLAGS -diag_error 1035"
++												CFLAGS="$CFLAGS -woff 1209,1174,3201"
++		fi
++	;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
@@ -37505,24 +37482,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
- 
+-
 -  ac_header_preproc=no
 -fi
-+		;;
-+      esac
-+      ;;
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+#
-+# CRAY Unicos has broken const handling
-+       *unicos*)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
-+$as_echo "disabling const" >&6; }
-+	  CPPFLAGS="$CPPFLAGS -Dconst="
-+	  ;;
++DYNEXP=
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -37565,14 +37532,7 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+#
-+# AIX4.x doesn't even admit to having large
-+# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
-+#
-+    *aix4*)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+      CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
++LDSHFLAGS_Z_DEFS=
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -37581,150 +37541,100 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+$as_echo "#define _LARGE_FILES 1" >>confdefs.h
++LDSHFLAGS_Z_NODEFS=
  
 -fi
-+      ;;
-+#
-+# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
-+# to the existance of large files..
-+# Note that -D_LARGEFILE64_SOURCE is different from the Sun
-+# recommendations on large file support, however it makes the
-+# compile work using gcc 2.7 and 2.8, whereas using the Sun
-+# recommendation makes the compile fail on gcc2.7. JRA.
-+#
-+# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
-+#
-+	*solaris*)
  
 -done
-+$as_echo "#define SYSV 1" >>confdefs.h
++default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
  
 -		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
 -		        x"$ac_cv_header_cups_language_h" = xyes; then
-+		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:${as_lineno-$LINENO}: result: no large file support" >&5
-+$as_echo "no large file support" >&6; }
-+				;;
-+			5.*)
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "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`
-+				rm -fr conftest.c
-+				case "$ac_cv_gcc_compiler_version_number" in
-+					*"gcc version 2.6"*|*"gcc version 2.7"*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-+						LDFLAGS="$LDFLAGS -lthread"
++default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++if test "x$developer" = xyes; then
++   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
++   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
++fi
  
 -			samba_cv_HAVE_CUPS=yes
-+						;;
-+					*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+						LDFLAGS="$LDFLAGS -lthread"
++#
++# Config CPPFLAG settings for strange OS's that must be set
++# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
++# case statement; its first reference must be unconditional.
++#
++case "$host_os" in
++    *hpux*)
++#
++# Defines needed for HPUX support.
++# HPUX has bigcrypt but (sometimes?) doesn't use it for
++# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
++#
++      case `uname -r` in
++		*9*|*10*|*11)
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
  
++		;;
++      esac
++      ;;
  
 -ac_check_lib_ext_save_LIBS=$LIBS
 -LIBS="-lcups $PRINT_LIBS  $LIBS"
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++#
++# CRAY Unicos has broken const handling
++       *unicos*)
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++	  CPPFLAGS="$CPPFLAGS -Dconst="
++	  ;;
  
-+						;;
-+				esac
-+			else
-+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+				LDFLAGS="$LDFLAGS -lthread"
++#
++# AIX4.x doesn't even admit to having large
++# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
++#
++    *aix4*)
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++      CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
  
++      ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
++#
++	*solaris*)
  
 -        { $as_echo "$as_me:$LINENO: checking for httpConnectEncrypt in -lcups" >&5
 -$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
 -if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+
-+			fi
-+			;;
-+		esac
-+		;;
-+#
-+# IRIX uses SYSV printing.  Make sure to set that here
-+#
-+	*irix*)
-+
-+$as_echo "#define SYSV 1" >>confdefs.h
-+
-+		;;
-+	*freebsd*|*dragonfly*)
-+
-+$as_echo "#define FREEBSD 1" >>confdefs.h
-+
-+		;;
-+#
-+# VOS may need to have POSIX support and System V compatibility enabled.
-+#
-+    *vos*)
-+    case "$CPPFLAGS" in
-+	  *-D_POSIX_C_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
-+
-+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
-+
-+		;;
-+    esac
-+    case "$CPPFLAGS" in
-+	  *-D_SYSV*|*-D_SVID_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_SYSV"
-+
-+$as_echo "#define _SYSV 1" >>confdefs.h
-+
-+    esac
-+    ;;
-+#
-+# Tests needed for SINIX large file support.
-+#
-+    *sysv4*)
-+      if test $host = mips-sni-sysv4 ; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  SINIX_LFS_SUPPORT=cross
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
++$as_echo "#define SYSV 1" >>confdefs.h
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
- #endif
+-#endif
 -char httpConnectEncrypt ();
 -int
 -main ()
@@ -37757,64 +37667,87 @@
 -       }; then
 -  ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
 -		  ac_cv_lib_ext_cups=yes
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  SINIX_LFS_SUPPORT=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++		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:${as_lineno-$LINENO}: result: no large file support" >&5
++$as_echo "no large file support" >&6; }
++				;;
++			5.*)
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "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`
++				rm -fr conftest.c
++				case "$ac_cv_gcc_compiler_version_number" in
++					*"gcc version 2.6"*|*"gcc version 2.7"*)
++						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
++						LDFLAGS="$LDFLAGS -lthread"
+ 
 -	ac_cv_lib_ext_cups_httpConnectEncrypt=no;
 -		  ac_cv_lib_ext_cups=no
 -fi
--
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--
-+  SINIX_LFS_SUPPORT=no
- fi
++						;;
++					*)
++						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++						LDFLAGS="$LDFLAGS -lthread"
+ 
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
 -$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
 -    if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_HTTPCONNECTENCRYPT 1
 -_ACEOF
--
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
+-fi
+ 
 -LIBS=$ac_check_lib_ext_save_LIBS
--
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
 -if test $ac_cv_lib_ext_cups = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBCUPS 1
 -_ACEOF
--
++						;;
++				esac
++			else
++				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++				LDFLAGS="$LDFLAGS -lthread"
+ 
 -		case "$PRINT_LIBS" in
 -		    *-lcups*)
 -			;;
 -		    *)
 -			PRINT_LIBS="-lcups $PRINT_LIBS"
--			;;
--		esac
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$SINIX_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
- 
 +$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++
++			fi
+ 			;;
+ 		esac
++		;;
++#
++# IRIX uses SYSV printing.  Make sure to set that here
++#
++	*irix*)
  
++$as_echo "#define SYSV 1" >>confdefs.h
+ 
 -fi
-+          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
-+          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
-+          LIBS="`getconf LFS64_LIBS` $LIBS"
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
-+$as_echo "$SINIX_LFS_SUPPORT" >&6; }
-+      fi
-+    ;;
++		;;
++	*freebsd*|*dragonfly*)
  
 -		else
 -			{ $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
@@ -37823,10 +37756,7 @@
 -			LDFLAGS=$ac_save_LDFLAGS
 -			PRINT_LIBS=$ac_save_PRINT_LIBS
 -		fi
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++$as_echo "#define FREEBSD 1" >>confdefs.h
  
 -	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
@@ -37834,30 +37764,77 @@
 -   { (exit 1); exit 1; }; }
 -        fi
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++		;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++    *vos*)
++    case "$CPPFLAGS" in
++	  *-D_POSIX_C_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
  
 -# Check whether --enable-iprint was given.
 -if test "${enable_iprint+set}" = set; then
 -  enableval=$enable_iprint;
 -fi
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++
++		;;
++    esac
++    case "$CPPFLAGS" in
++	  *-D_SYSV*|*-D_SVID_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_SYSV"
  
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++$as_echo "#define _SYSV 1" >>confdefs.h
  
 -if test x$enable_iprint != xno; then
 -	if test x"$samba_cv_HAVE_CUPS" = xyes; then
++    esac
++    ;;
++#
++# Tests needed for SINIX large file support.
++#
++    *sysv4*)
++      if test $host = mips-sni-sysv4 ; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++        if test "$cross_compiling" = yes; then :
++  SINIX_LFS_SUPPORT=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_IPRINT 1
--_ACEOF
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- 
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
++}
+ _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;}
 -   { (exit 1); exit 1; }; }
 -        fi
--fi
-+	;;
++if ac_fn_c_try_run "$LINENO"; then :
++  SINIX_LFS_SUPPORT=yes
++else
++  SINIX_LFS_SUPPORT=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
  
 -############################################
 -# check if the compiler will optimize out function calls
@@ -37865,73 +37842,48 @@
 -$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
 -if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+#
-+    *linux*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+       if test "$cross_compiling" = yes; then :
-+  LINUX_LFS_SUPPORT=cross
- else
--
+-else
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$SINIX_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+ 
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -#include <stdio.h>
 -int
 -main ()
 -{
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
-+#include <stdlib.h>
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+       struct utsname uts;
-+       char *release;
-+       int major, minor;
++          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
++          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
++          LIBS="`getconf LFS64_LIBS` $LIBS"
++        fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
++$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++      fi
++    ;;
  
 -		if (0) {
 -		   this_function_does_not_exist();
 -		} else {
 -		  return 1;
 -		}
-+       /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
++# Systems with LFS support.
++#
++    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
-+       if (libc_major < 2)
-+              exit(1);
-+       if (libc_minor < 2)
-+              exit(1);
-+#endif
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -  ;
 -  return 0;
-+       /* Ensure this is kernel 2.4 or higher */
-+
-+       uname(&uts);
-+       release = strdup(uts.release);
-+       major = atoi(strsep(&release, "."));
-+       minor = atoi(strsep(&release, "."));
-+
-+       if (major > 2 || (major == 2 && minor > 3))
-+               exit(0);
-+       exit(1);
-+#else
-+       exit(1);
-+#endif
- }
-+
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -37954,22 +37906,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  samba_cv_optimize_out_funcation_calls=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  LINUX_LFS_SUPPORT=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	samba_cv_optimize_out_funcation_calls=no
-+  LINUX_LFS_SUPPORT=no
- fi
--
+-fi
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_optimize_out_funcation_calls" >&5
 -$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
 -if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
@@ -37977,12 +37925,10 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
 -_ACEOF
-+	CPPFLAGS="$old_CPPFLAGS"
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++	;;
  
 -#############################################
 -# check for fd passing struct via msg_control
@@ -37990,24 +37936,41 @@
 -$as_echo_n "checking for fd passing via msg_control... " >&6; }
 -if test "${samba_cv_msghdr_msg_control+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
- 
++# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
++#
++    *linux*)
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++       if test "$cross_compiling" = yes; then :
++  LINUX_LFS_SUPPORT=cross
+ else
+-
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
 -#include <sys/types.h>
--#include <stdlib.h>
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
+ #include <stdlib.h>
 -#include <stddef.h>
 -#include <sys/socket.h>
 -#include <sys/un.h>
 -int
 -main ()
 -{
++main() {
++#if _LFS64_LARGEFILE == 1
++       struct utsname uts;
++       char *release;
++       int major, minor;
  
 -	struct msghdr msg;
 -	union {
@@ -38016,12 +37979,35 @@
 -	} control_un;
 -	msg.msg_control = control_un.control;
 -	msg.msg_controllen = sizeof(control_un.control);
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++       /* Ensure this is glibc 2.2 or higher */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++       int libc_major = __GLIBC__;
++       int libc_minor = __GLIBC_MINOR__;
  
 -  ;
 -  return 0;
--}
--_ACEOF
++       if (libc_major < 2)
++              exit(1);
++       if (libc_minor < 2)
++              exit(1);
++#endif
++
++       /* Ensure this is kernel 2.4 or higher */
++
++       uname(&uts);
++       release = strdup(uts.release);
++       major = atoi(strsep(&release, "."));
++       minor = atoi(strsep(&release, "."));
++
++       if (major > 2 || (major == 2 && minor > 3))
++               exit(0);
++       exit(1);
++#else
++       exit(1);
++#endif
+ }
++
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38041,36 +38027,32 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_control=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  LINUX_LFS_SUPPORT=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+	;;
- 
+-
 -	samba_cv_msghdr_msg_control=no
--fi
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+    *darwin*)
- 
++  LINUX_LFS_SUPPORT=no
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
 -$as_echo "$samba_cv_msghdr_msg_control" >&6; }
 -if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_CONTROL 1
 -_ACEOF
  
 -fi
-+# Add a system specific charset module.
-+	default_shared_modules="$default_shared_modules charset_macosxfs"
++	CPPFLAGS="$old_CPPFLAGS"
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
 -#############################################
 -# check for fd passing struct via msg_acctrights
@@ -38078,23 +38060,15 @@
 -$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
 -if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+	;;
-+    *hurd*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  GLIBC_LFS_SUPPORT=cross
- else
--
+-else
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
  
 -#include <sys/types.h>
 -#include <stdlib.h>
@@ -38104,23 +38078,17 @@
 -int
 -main ()
 -{
--
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
 -	struct msghdr msg;
 -	int fd;
 -	msg.msg_acctrights = (caddr_t) &fd;
 -	msg.msg_acctrightslen = sizeof(fd);
--
+ 
 -  ;
 -  return 0;
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
- }
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38140,34 +38108,38 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_acctrights=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  GLIBC_LFS_SUPPORT=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+ 
 -	samba_cv_msghdr_msg_acctrights=no
-+  GLIBC_LFS_SUPPORT=no
- fi
--
+-fi
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++	;;
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
 -$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
 -if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
--
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++    *darwin*)
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
 -_ACEOF
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
  
 -fi
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++# Add a system specific charset module.
++	default_shared_modules="$default_shared_modules charset_macosxfs"
  
 -for ac_func in dirfd
 -do
@@ -38176,38 +38148,43 @@
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--else
++	;;
++    *hurd*)
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++        if test "$cross_compiling" = yes; then :
++  GLIBC_LFS_SUPPORT=cross
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -#ifdef __STDC__
 -# include <limits.h>
--#else
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
+ #else
 -# include <assert.h>
 -#endif
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+    ;;
-+    *qnx*)
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
- 
+-
 -#undef $ac_func
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -38220,23 +38197,23 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
-+        ;;
- 
++exit(1);
+ #endif
+-
 -int
 -main ()
 -{
 -return $ac_func ();
 -  ;
 -  return 0;
--}
--_ACEOF
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
@@ -38253,17 +38230,22 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  GLIBC_LFS_SUPPORT=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
++  GLIBC_LFS_SUPPORT=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
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam 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
@@ -38274,15 +38256,17 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
--
+ 
 -fi
 -done
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$GLIBC_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
  
 -if test x"$ac_cv_func_dirfd" = x"yes"; then
 -	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
 -fi
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
 -$as_echo_n "checking for struct sigevent type... " >&6; }
@@ -38296,7 +38280,18 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++        fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
++$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
++    ;;
++    *qnx*)
++        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++        ;;
  
 -#include <sys/types.h>
 -#if STDC_HEADERS
@@ -38317,7 +38312,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -38334,30 +38329,36 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	samba_cv_struct_sigevent=no
+-fi
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++echo "LIBREPLACE_BROKEN_CHECKS: START"
++
 +libreplacedir=""
 +libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
 +for d in $libreplacepaths; do
 +	if test -f "$d/replace.c"; then
 +		libreplacedir="$d"
- 
--	samba_cv_struct_sigevent=no
++
 +		break;
 +	fi
 +done
 +if test x"$libreplacedir" = "x"; then
 +	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
  fi
- 
--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; }
 -if test x"$samba_cv_struct_sigevent" = x"yes"; then
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_SIGEVENT 1
 -_ACEOF
++LIBREPLACEOBJ="$libreplacedir/replace.o"
  
 -   { $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; }
@@ -38371,7 +38372,6 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <signal.h>
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
  
 -int
 -main ()
@@ -38402,19 +38402,21 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include <sys/types.h>
@@ -38574,46 +38576,50 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_cv_type_uid_t=no
  fi
 +rm -f conftest*
  
 -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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
 +$as_echo "$ac_cv_type_uid_t" >&6; }
 +if test $ac_cv_type_uid_t = no; then
  
+-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
++$as_echo "#define uid_t int" >>confdefs.h
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
 -_ACEOF
-+$as_echo "#define uid_t int" >>confdefs.h
  
- 
--fi
 +$as_echo "#define gid_t int" >>confdefs.h
  
  fi
  
+-fi
++ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
++if test "x$ac_cv_type_mode_t" = x""yes; then :
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
 -$as_echo_n "checking for struct timespec type... " >&6; }
 -if test "${samba_cv_struct_timespec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
--
+ else
+ 
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -#include <sys/types.h>
 -#if STDC_HEADERS
 -#include <stdlib.h>
@@ -38629,8 +38635,10 @@
 -#  include <time.h>
 -# endif
 -#endif
-+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-+if test "x$ac_cv_type_mode_t" = x""yes; then :
++fi
++
++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
++if test "x$ac_cv_type_off_t" = x""yes; then :
  
 -int
 -main ()
@@ -38666,7 +38674,7 @@
 -	samba_cv_struct_timespec=no
 -fi
 +cat >>confdefs.h <<_ACEOF
-+#define mode_t int
++#define off_t long int
 +_ACEOF
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -38677,13 +38685,13 @@
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_TIMESPEC 1
-+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-+if test "x$ac_cv_type_off_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
 +
 +else
 +
 +cat >>confdefs.h <<_ACEOF
-+#define off_t long int
++#define size_t unsigned int
  _ACEOF
  
  fi
@@ -38695,8 +38703,8 @@
 -if test "${samba_cv_have_setresuid+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
++if test "x$ac_cv_type_pid_t" = x""yes; then :
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresuid=cross
@@ -38711,7 +38719,7 @@
 -main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
 +
 +cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
++#define pid_t int
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -38748,14 +38756,15 @@
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
 +
-+else
-+
 +cat >>confdefs.h <<_ACEOF
-+#define pid_t int
++#define HAVE_STRUCT_STAT_ST_RDEV 1
 +_ACEOF
++
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
  
  fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
@@ -38764,16 +38773,16 @@
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESUID 1
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
 +
++ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
++if test "x$ac_cv_type_ino_t" = x""yes; then :
++
++else
++
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
++#define ino_t unsigned
  _ACEOF
  
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
  fi
  
 -# Do the same check for setresguid...
@@ -38783,12 +38792,11 @@
 -if test "${samba_cv_have_setresgid+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++if test "x$ac_cv_type_loff_t" = x""yes; then :
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresgid=cross
-+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ino_t" = x""yes; then :
-+
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -38801,7 +38809,7 @@
 -main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
 +
 +cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
++#define loff_t off_t
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -38838,27 +38846,17 @@
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_loff_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
-+_ACEOF
++ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
++if test "x$ac_cv_type_offset_t" = x""yes; then :
  
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
 -$as_echo "$samba_cv_have_setresgid" >&6; }
 -if test x"$samba_cv_have_setresgid" = x"yes"; then
++else
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESGID 1
-+ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-+if test "x$ac_cv_type_offset_t" = x""yes; then :
-+
-+else
-+
 +cat >>confdefs.h <<_ACEOF
 +#define offset_t loff_t
  _ACEOF
@@ -38886,7 +38884,7 @@
  /* end confdefs.h.  */
  $ac_includes_default
  int
-@@ -37950,44 +8435,17 @@
+@@ -37950,44 +8436,17 @@
    return 0;
  }
  _ACEOF
@@ -38936,28 +38934,50 @@
  $as_echo "$ac_cv_func_memcmp_working" >&6; }
  test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
    *" memcmp.$ac_objext "* ) ;;
-@@ -37997,166 +8455,26 @@
+@@ -37997,317 +8456,154 @@
  
  
  
 -###############################################
 -# Readline included by default unless explicitly asked not to
 -test "${with_readline+set}" != "set" && with_readline=yes
--
++for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
 -# 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; }
--
++fi
++done
+ 
 -# 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; }
--
--
--
--
+ 
++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`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
++fi
+ 
++done
+ 
 -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`
@@ -38983,7 +39003,15 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++for ac_header in setjmp.h utime.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39006,14 +39034,20 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
--fi
--
+ 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; }
--
++done
++
++
++ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdint_h" = x""yes; then :
++   ac_config_commands="$ac_config_commands rm-stdint.h"
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39024,15 +39058,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39051,18 +39077,19 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++   ac_config_commands="$ac_config_commands mk-stdint.h"
++
  
 -  ac_header_preproc=no
  fi
-+done
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39097,32 +39124,33 @@
 -$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
++
++ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdbool_h" = x""yes; then :
++   ac_config_commands="$ac_config_commands rm-stdbool.h"
++
+ 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_config_commands="$ac_config_commands mk-stdbool.h"
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in stdbool.h stdint.h sys/select.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -38165,149 +8483,12 @@
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
  
- done
+ fi
  
--
+-done
+ 
+ 
 -for ac_header in readline/history.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39131,7 +39159,19 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--fi
++
++ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
++$ac_includes_default
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type_bool" = x""yes; then :
++
++$as_echo "#define HAVE_BOOL 1" >>confdefs.h
++
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39146,7 +39186,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
++
++
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
+ $ac_includes_default
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -39171,14 +39214,22 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
++
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
+ 
 -	ac_header_compiler=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39187,9 +39238,20 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_MMAP=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++#include "$libreplacedir/test/shared_mmap.c"
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39208,17 +39270,28 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_MMAP=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  libreplace_cv_HAVE_MMAP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
 -  ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39255,17 +39328,31 @@
 -  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ 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
++
++
++for ac_header in sys/syslog.h syslog.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in setjmp.h utime.h
++
++done
++
++for ac_header in sys/time.h time.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -39274,15 +39361,34 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -38317,474 +8498,97 @@
+@@ -38316,475 +8612,274 @@
+ 
  done
  
++for ac_header in stdarg.h vararg.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
  
-+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdint_h" = x""yes; then :
-+   ac_config_commands="$ac_config_commands rm-stdint.h"
++fi
  
--
++done
++
++for ac_header in sys/mount.h mntent.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39291,7 +39397,7 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--fi
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39302,13 +39408,33 @@
 -$as_echo_n "checking $ac_header usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++done
++
++for ac_header in stropts.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
++if test "x$ac_cv_header_stropts_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_STROPTS_H 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++fi
++
++done
++
++for ac_header in unix.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default"
++if test "x$ac_cv_header_unix_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_UNIX_H 1
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39328,29 +39454,50 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
--fi
--
+ 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; }
-+   ac_config_commands="$ac_config_commands mk-stdint.h"
++done
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++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`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++
++fi
++done
++
++for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39375,11 +39522,21 @@
  
 -  ac_header_preproc=no
  fi
++done
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39416,27 +39573,54 @@
 -  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ 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; }
++done
++
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
  
--fi
+ 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
++done
++
++for ac_func in isatty chown lchown link readlink symlink realpath
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $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; }
 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++fi
++done
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
++$as_echo_n "checking for setresuid declaration... " >&6; }
++if test "${ac_cv_have_setresuid_decl+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-l${termlib}  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -39444,10 +39628,28 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
-+   ac_config_commands="$ac_config_commands rm-stdbool.h"
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)setresuid
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_setresuid_decl=yes
++else
++  ac_cv_have_setresuid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
++$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -39456,14 +39658,29 @@
 -extern "C"
 -#endif
 -char tgetent ();
--int
--main ()
--{
++$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5
++$as_echo_n "checking for setresgid declaration... " >&6; }
++if test "${ac_cv_have_setresgid_decl+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <unistd.h>
+ int
+ main ()
+ {
 -return tgetent ();
--  ;
--  return 0;
--}
--_ACEOF
++int i = (int)setresgid
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39486,13 +39703,24 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_Lib=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_setresgid_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+   ac_config_commands="$ac_config_commands mk-stdbool.h"
++  ac_cv_have_setresgid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
++$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
++
++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
  
 -	eval "$as_ac_Lib=no"
 -fi
++ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39507,14 +39735,17 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 -  TERMLIBS="-l${termlib}"; break
- fi
+-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; }
 -if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
++$as_echo_n "checking for errno declaration... " >&6; }
++if test "${ac_cv_have_errno_decl+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lreadline $TERMLIBS $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -39531,14 +39762,18 @@
 -extern "C"
 -#endif
 -char rl_callback_handler_install ();
--int
--main ()
--{
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <errno.h>
+ int
+ main ()
+ {
 -return rl_callback_handler_install ();
--  ;
--  return 0;
--}
--_ACEOF
++int i = (int)errno
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39564,10 +39799,10 @@
 -else
 -  $as_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
@@ -39577,25 +39812,24 @@
 -$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
 -  TERMLIBS="-lreadline $TERMLIBS"
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBREADLINE 1
 -_ACEOF
-+"
-+if test "x$ac_cv_type_bool" = x""yes; then :
- 
+-
 -       break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_errno_decl=yes
+ else
 -  TERMLIBS=
--fi
-+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
- 
++  ac_cv_have_errno_decl=no
  fi
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5
++$as_echo "$ac_cv_have_errno_decl" >&6; }
++ if test x"$ac_cv_have_errno_decl" = x"yes"; then
  
 -done
 -
@@ -39617,9 +39851,11 @@
 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
 -    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
 -
--
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
  
--
++ fi
+ 
+ 
 -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`
@@ -39627,7 +39863,10 @@
 -  { $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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
++$as_echo_n "checking for secure mkstemp... " >&6; }
++if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
@@ -39643,8 +39882,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
- $ac_includes_default
+-$ac_includes_default
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -39666,21 +39904,16 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_header_compiler=no
 -fi
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
- 
+-
 -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; }
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -39690,9 +39923,27 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_SECURE_MKSTEMP=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++main() {
++  struct stat st;
++  char tpl[20]="/tmp/test.XXXXXX";
++  int fd = mkstemp(tpl);
++  if (fd == -1) exit(1);
++  unlink(tpl);
++  if (fstat(fd, &st) != 0) exit(1);
++  if ((st.st_mode & 0777) != 0600) exit(1);
++  exit(0);
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39711,17 +39962,27 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
++  libreplace_cv_HAVE_SECURE_MKSTEMP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
 -  ac_header_preproc=no
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -39756,47 +40017,20 @@
 -{ $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 "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_MMAP=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include "$libreplacedir/test/shared_mmap.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_MMAP=yes
-+else
-+  libreplace_cv_HAVE_MMAP=no
  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; }
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
-+$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
-+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
-+
-+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
  
- fi
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+
-+for ac_header in sys/syslog.h syslog.h
++for ac_header in stdio.h strings.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -39805,7 +40039,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -38793,149 +8597,40 @@
+@@ -38793,1135 +8888,564 @@
  
  done
  
@@ -39823,7 +40057,10 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++  ac_have_decl=1
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -39835,14 +40072,11 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+for ac_header in sys/time.h time.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -39863,18 +40097,21 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++  ac_have_decl=1
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_header_compiler=no
++  ac_have_decl=0
  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; }
-+done
- 
+-
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39885,14 +40122,8 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+for ac_header in stdarg.h vararg.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VSNPRINTF $ac_have_decl
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -39912,11 +40143,15 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
++  ac_have_decl=1
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  ac_header_preproc=no
++  ac_have_decl=0
  fi
  
 -rm -f conftest.err conftest.$ac_ext
@@ -39957,44 +40192,47 @@
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--else
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_ASPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
++  ac_have_decl=1
+ else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++  ac_have_decl=0
+ 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; }
-+done
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in sys/mount.h mntent.h
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
++_ACEOF
++
++for ac_func in snprintf vsnprintf asprintf vasprintf
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -38944,733 +8639,569 @@
  
+ fi
+-
  done
  
-+for ac_header in stropts.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stropts_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STROPTS_H 1
-+_ACEOF
  
-+fi
- 
-+done
- 
+-
+-
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40002,13 +40240,16 @@
 -  { $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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
++$as_echo_n "checking for C99 vsnprintf... " >&6; }
++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
+   $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40020,13 +40261,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+for ac_header in unix.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default"
-+if test "x$ac_cv_header_unix_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_UNIX_H 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -40046,49 +40281,62 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_C99_VSNPRINTF=cross
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -	ac_header_compiler=no
- fi
+-fi
++#include <sys/types.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <stdlib.h>
++void foo(const char *format, ...) {
++       va_list ap;
++       int len;
++       char buf[20];
++       long long l = 1234567890;
++       l *= 100;
  
 -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; }
-+done
++       va_start(ap, format);
++       len = vsnprintf(buf, 0, format, ap);
++       va_end(ap);
++       if (len != 5) exit(1);
++
++       va_start(ap, format);
++       len = vsnprintf(0, 0, format, ap);
++       va_end(ap);
++       if (len != 5) exit(2);
++
++       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
++
++       if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
++       if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
++       if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
++       if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
++
++       exit(0);
++}
++main() { foo("hello"); }
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+
-+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`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+
-+fi
-+done
-+
-+for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -40108,26 +40356,27 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_C99_VSNPRINTF=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  libreplace_cv_HAVE_C99_VSNPRINTF=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
 -  ac_header_preproc=no
  fi
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40170,47 +40419,23 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+done
-+
-+for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
  
- fi
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_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; }
 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
++$as_echo_n "checking for va_copy... " >&6; }
++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40229,14 +40454,15 @@
 -extern "C"
 -#endif
 -char tgetent ();
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <unistd.h>
++#include <stdarg.h>
++va_list ap1,ap2;
  int
  main ()
  {
 -return tgetent ();
-+int i = (int)setresuid
++va_copy(ap1,ap2);
    ;
    return 0;
  }
@@ -40263,51 +40489,22 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_Lib=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresuid_decl=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  libreplace_cv_HAVE_VA_COPY=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_Lib=no"
-+  ac_cv_have_setresuid_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  libreplace_cv_HAVE_VA_COPY=no
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
-+$as_echo "$ac_cv_have_setresuid_decl" >&6; }
-+ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5
-+$as_echo_n "checking for setresgid declaration... " >&6; }
-+if test "${ac_cv_have_setresgid_decl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresgid
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresgid_decl=yes
-+else
-+  ac_cv_have_setresgid_decl=no
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
 -		 $as_echo "$as_val"'`
@@ -40317,24 +40514,22 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 -  TERMLIBS="-l${termlib}"; break
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
++
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
++
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
-+$as_echo "$ac_cv_have_setresgid_decl" >&6; }
-+ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
  
 -      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; }
 -if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
-+$as_echo_n "checking for errno declaration... " >&6; }
-+if test "${ac_cv_have_errno_decl+set}" = set; then :
++if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
++$as_echo_n "checking for __va_copy... " >&6; }
++if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40353,14 +40548,15 @@
 -extern "C"
 -#endif
 -char rl_callback_handler_install ();
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <errno.h>
++#include <stdarg.h>
++va_list ap1,ap2;
  int
  main ()
  {
 -return rl_callback_handler_install ();
-+int i = (int)errno
++__va_copy(ap1,ap2);
    ;
    return 0;
  }
@@ -40387,64 +40583,22 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_readline_rl_callback_handler_install=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_errno_decl=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  libreplace_cv_HAVE___VA_COPY=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_have_errno_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5
-+$as_echo "$ac_cv_have_errno_decl" >&6; }
-+ if test x"$ac_cv_have_errno_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
-+
-+ fi
- 
+-
 -	ac_cv_lib_readline_rl_callback_handler_install=no
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
-+$as_echo_n "checking for secure mkstemp... " >&6; }
-+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+main() {
-+  struct stat st;
-+  char tpl[20]="/tmp/test.XXXXXX";
-+  int fd = mkstemp(tpl);
-+  if (fd == -1) exit(1);
-+  unlink(tpl);
-+  if (fstat(fd, &st) != 0) exit(1);
-+  if ((st.st_mode & 0777) != 0600) exit(1);
-+  exit(0);
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
-+else
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
++  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
 -LIBS=$ac_check_lib_save_LIBS
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  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; }
@@ -40453,103 +40607,72 @@
 -       TERMCPPFLAGS="-I$with_readline/include"
 -       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
 -       TERMLIBS="-lreadline $TERMLIBS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
-+$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
-+if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBREADLINE 1
 -_ACEOF
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
  
 -       break
 -else
 -  TERMLIBS= CPPFLAGS=$_cppflags
  fi
- 
-+for ac_header in stdio.h strings.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
+-
  fi
  
- done
- 
-+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
- 
+-done
+-
+-
 -    LDFLAGS=$_ldflags
 -    ;;
 -  esac
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+  ac_have_decl=1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
  
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ASPRINTF $ac_have_decl
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++printf("%s\n", __FUNCTION__);
++  ;
++  return 0;
++}
 +_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+  ac_have_decl=1
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_HAVE_FUNCTION_MACRO=yes
 +else
-+  ac_have_decl=0
++  libreplace_cv_HAVE_FUNCTION_MACRO=no
  fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
++if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
  
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VASPRINTF $ac_have_decl
-+_ACEOF
++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
  
-+for ac_func in snprintf vsnprintf asprintf vasprintf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
-+fi
-+done
- 
+-
+-
 -# 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; }
 -if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
-+$as_echo_n "checking for C99 vsnprintf... " >&6; }
-+if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
++else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
++$as_echo_n "checking for __func__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40559,12 +40682,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_C99_VSNPRINTF=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -40573,44 +40691,17 @@
 -extern "C"
 -#endif
 -char rl_completion_matches ();
--int
--main ()
--{
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
+ int
+ main ()
+ {
 -return rl_completion_matches ();
--  ;
--  return 0;
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) {
-+       va_list ap;
-+       int len;
-+       char buf[20];
-+       long long l = 1234567890;
-+       l *= 100;
-+
-+       va_start(ap, format);
-+       len = vsnprintf(buf, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(1);
-+
-+       va_start(ap, format);
-+       len = vsnprintf(0, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(2);
-+
-+       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
-+
-+       if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
-+       if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
-+       if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
-+       if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
-+
-+       exit(0);
++printf("%s\n", __func__);
+   ;
+   return 0;
  }
-+main() { foo("hello"); }
-+
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -40634,46 +40725,66 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_readline_rl_completion_matches=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_C99_VSNPRINTF=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_HAVE_func_MACRO=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_readline_rl_completion_matches=no
-+  libreplace_cv_HAVE_C99_VSNPRINTF=no
++  libreplace_cv_HAVE_func_MACRO=no
 +fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++    if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
++
++    fi
  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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
-+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
-+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
++for ac_header in sys/param.h limits.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
  
  fi
  
++done
  
 -# 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; }
 -if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
-+$as_echo_n "checking for va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
++
++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
++
++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
++
++fi
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
++$as_echo_n "checking for setenv declaration... " >&6; }
++if test "${ac_cv_have_setenv_decl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -40684,10 +40795,9 @@
 -/* end confdefs.h.  */
 -#include <readline/readline.h>
  
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <stdlib.h>
  int
  main ()
  {
@@ -40695,7 +40805,7 @@
 -  (void) rl_event_hook;
 -#endif
 -
-+va_copy(ap1,ap2);
++int i = (int)setenv
    ;
    return 0;
  }
@@ -40719,49 +40829,55 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_have_decl_rl_event_hook=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  libreplace_cv_HAVE_VA_COPY=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_setenv_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_decl_rl_event_hook=no
-+  libreplace_cv_HAVE_VA_COPY=no
++  ac_cv_have_setenv_decl=no
  fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
+ 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
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_RL_EVENT_HOOK 1
 -_ACEOF
--
--
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
+ 
++ fi
+ 
 -else
--  cat >>confdefs.h <<_ACEOF
++for ac_func in setenv unsetenv
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_RL_EVENT_HOOK 0
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
- 
+-
  fi
++done
  
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
 -$as_echo_n "checking for history_list in -lreadline... " >&6; }
 -if test "${ac_cv_lib_readline_history_list+set}" = set; then
-+if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
-+$as_echo_n "checking for __va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40780,15 +40896,14 @@
 -extern "C"
 -#endif
 -char history_list ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <unistd.h>
  int
  main ()
  {
 -return history_list ();
-+__va_copy(ap1,ap2);
++int i = (int)environ
    ;
    return 0;
  }
@@ -40815,23 +40930,45 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_readline_history_list=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  libreplace_cv_HAVE___VA_COPY=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_environ_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_have_environ_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
++$as_echo "$ac_cv_have_environ_decl" >&6; }
++ if test x"$ac_cv_have_environ_decl" = x"yes"; then
++
++$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
++
++ fi
++
++
++for ac_func in strnlen
++do :
++  ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
++if test "x$ac_cv_func_strnlen" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_STRNLEN 1
++_ACEOF
+ 
 -	ac_cv_lib_readline_history_list=no
-+  libreplace_cv_HAVE___VA_COPY=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
++done
 +
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
++for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -40841,50 +40978,35 @@
 -{ $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
-+fi
++done
 +
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
-+$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
++
++# this test disabled as we don't actually need __VA_ARGS__ yet
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#define eprintf(...) fprintf(stderr, __VA_ARGS__)
++eprintf("bla", "bar");
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_HISTORY_LIST 1
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("%s\n", __FUNCTION__);
-+  ;
-+  return 0;
-+}
  _ACEOF
--
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_FUNCTION_MACRO=yes
-+else
-+  libreplace_cv_HAVE_FUNCTION_MACRO=no
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
+ 
  fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++rm -f conftest.err conftest.$ac_ext
  
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
  
 -###############################################
 -# 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; }
 -if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-+else
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
-+$as_echo_n "checking for __func__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
++$as_echo_n "checking for sig_atomic_t type... " >&6; }
++if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_func_search_save_LIBS=$LIBS
@@ -40893,23 +41015,27 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--#endif
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
+ #endif
 -char yp_get_default_domain ();
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
++#include <signal.h>
  int
  main ()
  {
 -return yp_get_default_domain ();
-+printf("%s\n", __func__);
++sig_atomic_t i = 0
    ;
    return 0;
  }
@@ -40943,357 +41069,55 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_search_yp_get_default_domain=$ac_res
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_func_MACRO=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_HAVE_func_MACRO=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
-+    if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
- 
-+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
- 
-+    fi
- fi
- 
+-
+-
+-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
 -  break
-+for ac_header in sys/param.h limits.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
-+
- done
+-fi
+-done
 -if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
 -  :
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_sig_atomic_t=yes
+ else
 -  ac_cv_search_yp_get_default_domain=no
--fi
++  libreplace_cv_sig_atomic_t=no
+ fi
 -rm conftest.$ac_ext
 -LIBS=$ac_func_search_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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; }
 -ac_res=$ac_cv_search_yp_get_default_domain
 -if test "$ac_res" != no; then
 -  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
--fi
- 
-+ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
-+if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
- 
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
-+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
-+$as_echo_n "checking for setenv declaration... " >&6; }
-+if test "${ac_cv_have_setenv_decl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
- int
- main ()
- {
--return $ac_func ();
-+int i = (int)setenv
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setenv_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  ac_cv_have_setenv_decl=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
-+$as_echo "$ac_cv_have_setenv_decl" >&6; }
-+ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
++$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
++if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
 +
-+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+for ac_func in setenv unsetenv
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -39679,101 +9210,56 @@
- done
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
  
- 
--# Check if we have execl, if not we need to compile smbrun.
--
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
-+$as_echo_n "checking for environ declaration... " >&6; }
-+if test "${ac_cv_have_environ_decl+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
- 
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
- int
- main ()
- {
--return $ac_func ();
-+int i = (int)environ
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_environ_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  ac_cv_have_environ_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
-+$as_echo "$ac_cv_have_environ_decl" >&6; }
-+ if test x"$ac_cv_have_environ_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+for ac_func in strnlen
-+do :
-+  ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-+if test "x$ac_cv_func_strnlen" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRNLEN 1
-+_ACEOF
  
--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
-+done
-+
-+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -39781,353 +9267,184 @@
- fi
- done
  
--if test x"$ac_cv_func_execl" = x"no"; then
--    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
--fi
- 
-+# this test disabled as we don't actually need __VA_ARGS__ yet
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
-+eprintf("bla", "bar");
- 
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
- 
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
- 
--for ac_func in getcwd fchown chmod fchmod mknod mknod64
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
-+$as_echo_n "checking for sig_atomic_t type... " >&6; }
-+if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41318,7 +41142,7 @@
 -#endif
  
 -#undef $ac_func
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -41333,18 +41157,16 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
++#include <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
  #endif
 -
-+#include <signal.h>
  int
  main ()
  {
 -return $ac_func ();
-+sig_atomic_t i = 0
++int fd = open("/dev/null", O_DIRECT);
    ;
    return 0;
  }
@@ -41372,13 +41194,13 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_sig_atomic_t=yes
++  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  libreplace_cv_sig_atomic_t=no
++  libreplace_cv_HAVE_OPEN_O_DIRECT=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -41396,25 +41218,27 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
-+$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
-+
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
  
- fi
+-fi
 -done
++$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
  
++fi
  
--for ac_func in strtol
+-# Check if we have execl, if not we need to compile smbrun.
+ 
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
-+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
++$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++if test "${libreplace_cv_volatile+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41431,7 +41255,7 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
@@ -41439,9 +41263,7 @@
 -#endif
 -
 -#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -41454,16 +41276,16 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
- #endif
--
+-#endif
+ 
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
  int
  main ()
  {
 -return $ac_func ();
-+int fd = open("/dev/null", O_DIRECT);
++volatile int i = 0
    ;
    return 0;
  }
@@ -41491,13 +41313,13 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
++  libreplace_cv_volatile=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  libreplace_cv_HAVE_OPEN_O_DIRECT=no
++  libreplace_cv_volatile=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -41515,26 +41337,37 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
++$as_echo "$libreplace_cv_volatile" >&6; }
++if test x"$libreplace_cv_volatile" = x"yes"; then
  
 -fi
 -done
-+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
  
-+fi
+-if test x"$ac_cv_func_execl" = x"no"; then
+-    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+ fi
  
- 
--for ac_func in strchr chflags
+-
+-
+-
+-
+-
+-
+-for ac_func in getcwd fchown chmod fchmod 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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
-+$as_echo_n "checking that the C compiler understands volatile... " >&6; }
-+if test "${libreplace_cv_volatile+set}" = set; then :
++# filesys
++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:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41542,47 +41375,25 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+volatile int i = 0
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_volatile=yes
-+else
-+  libreplace_cv_volatile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
- 
+-
 -#undef $ac_func
-+fi
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -41596,17 +41407,6 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+# filesys
-+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:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <$ac_hdr>
  
@@ -41676,12 +41476,9 @@
 +ac_header_dirent=$ac_hdr; break
  fi
 -done
--
--
  
 -
--
--for ac_func in getrlimit fsync fdatasync setpgid
+-for ac_func in strtol
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -41722,7 +41519,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -40135,104 +9452,56 @@
+@@ -39929,101 +9453,56 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -41819,10 +41616,7 @@
  
 +fi
  
--
--
--
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-for ac_func in strchr 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
@@ -41861,7 +41655,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -40240,170 +9509,148 @@
+@@ -40031,166 +9510,148 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -41982,21 +41776,7 @@
 +done
  
  
-+# select
-+for ac_header in sys/select.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SELECT_H 1
-+_ACEOF
- 
-+fi
- 
-+done
- 
- 
--for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+-for ac_func in getrlimit fsync fdatasync 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
@@ -42006,15 +41786,13 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+# time
-+for ac_header in sys/time.h utime.h
++# select
++for ac_header in sys/select.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_select_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_SELECT_H 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -42022,21 +41800,21 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+fi
++done
  
 -#undef $ac_func
-+done
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -42051,6 +41829,21 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++# time
++for ac_header in sys/time.h utime.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test "${ac_cv_header_time+set}" = set; then :
@@ -42069,9 +41862,9 @@
 +if ((struct tm *) 0)
 +return 0;
    ;
-   return 0;
- }
- _ACEOF
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -42094,6 +41887,9 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_header_time=yes
  else
@@ -42132,7 +41928,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40412,426 +9659,311 @@
+@@ -40199,425 +9660,311 @@
  done
  
  
@@ -42140,9 +41936,7 @@
 -
 -
 -
--
--
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-for ac_func in setsid glob strpbrk 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
@@ -42272,11 +42066,10 @@
  _ACEOF
  
  fi
--done
++
+ done
  
-+done
  
- 
 +case "$host_os" in
 +*linux*)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
@@ -42284,10 +42077,10 @@
 +if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
- 
++
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +	#ifdef HAVE_SYS_VFS_H
 +	#include <sys/vfs.h>
 +	#endif
@@ -42301,57 +42094,61 @@
  
 +	int i;
  
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
++else
++  libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
+ 
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
++$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
++if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
+ 
++$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
+ 
++fi
+ 
+-for ac_func in 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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
++$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
++if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+  ;
-+  return 0;
-+}
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
-+else
-+  libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
-+$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
-+if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
-+
-+fi
  
 -#undef $ac_func
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
-+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -42366,9 +42163,6 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
 +	#ifdef HAVE_SYS_CAPABILITY_H
 +	#include <sys/capability.h>
 +	#endif
@@ -42451,9 +42245,13 @@
  _ACEOF
  
  fi
-+
- done
+-done
+-
+-
+-
  
++done
+ 
 +for ac_func in getpwnam_r getpwuid_r getpwent_r
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42468,50 +42266,15 @@
 +done
  
  
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
-+$as_echo_n "checking for getpwent_r declaration... " >&6; }
-+if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+	#include <unistd.h>
-+	#include <pwd.h>
- 
-+int
-+main ()
-+{
-+int i = (int)getpwent_r
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_getpwent_r_decl=yes
-+else
-+  ac_cv_have_getpwent_r_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
-+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
- 
-+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
- 
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
+-for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ fi
-+
-+{ $as_echo "$as_me:${as_lineno-$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; }
-+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
++$as_echo_n "checking for getpwent_r declaration... " >&6; }
++if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -42519,29 +42282,25 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+		$ac_includes_default
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+	#include <unistd.h>
-+	#include <pwd.h>
  
 -#undef $ac_func
-+		struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
-+		{
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -42556,20 +42315,17 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	#ifndef HAVE_GETPWENT_R_DECL
-+	#error missing getpwent_r prototype
-+	#endif
-+	return NULL;
-+
-+		}
++	#include <unistd.h>
++	#include <pwd.h>
  
--int
--main ()
--{
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
++int i = (int)getpwent_r
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -42594,20 +42350,19 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
-+
++  ac_cv_have_getpwent_r_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
--fi
-+		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
- 
++  ac_cv_have_getpwent_r_decl=no
+ fi
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -42618,13 +42373,52 @@
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
++$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
++ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
++
++$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
++
++ fi
++
++{ $as_echo "$as_me:${as_lineno-$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; }
++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
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++		$ac_includes_default
++
++	#include <unistd.h>
++	#include <pwd.h>
++
++		struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
++		{
++
++	#ifndef HAVE_GETPWENT_R_DECL
++	#error missing getpwent_r prototype
++	#endif
++	return NULL;
++
++		}
++
+ _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+-fi
+-done
++		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
+ 
++else
+ 
++		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
+ 
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- fi
--done
--
--
++fi
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then :
@@ -42633,14 +42427,14 @@
 +$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
  
  
-+fi
- 
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-for ac_func in setpriv setgidx setuidx setgroups sysconf 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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++fi
++
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
@@ -42670,11 +42464,16 @@
 -#endif
 +	#include <unistd.h>
 +	#include <pwd.h>
- 
--#undef $ac_func
++
 +		struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)
 +		{
  
+-#undef $ac_func
++	#ifndef HAVE_GETPWENT_R_DECL
++	#error missing getpwent_r prototype
++	#endif
++	return NULL;
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -42688,11 +42487,6 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	#ifndef HAVE_GETPWENT_R_DECL
-+	#error missing getpwent_r prototype
-+	#endif
-+	return NULL;
-+
 +		}
  
 -int
@@ -42769,7 +42563,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40840,347 +9972,221 @@
+@@ -40626,255 +9973,221 @@
  done
  
  
@@ -42806,14 +42600,15 @@
  
 +$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
  
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
++ fi
+ 
+-
+-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ fi
-+
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
@@ -42909,22 +42704,11 @@
 -	eval "$as_ac_var=no"
 -fi
 +		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$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; }
-+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
-+
-+
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -42935,12 +42719,23 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
 -done
+-
++{ $as_echo "$as_me:${as_lineno-$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; }
++if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
  
  
--for ac_func in getpwent_r
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
+ 
+ 
++fi
+ 
+ 
+-for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43041,20 +42836,10 @@
 -	eval "$as_ac_var=no"
 +		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no
 +
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--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
++
++fi
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
@@ -43069,25 +42854,14 @@
 +do :
 +  ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
 +if test "x$ac_cv_func_getgrouplist" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETGROUPLIST 1
- _ACEOF
- 
- fi
- done
- 
- 
--for ac_func in 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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++_ACEOF
++
++fi
++done
++
++
 +# locale
 +for ac_header in ctype.h locale.h langinfo.h
 +do :
@@ -43097,50 +42871,16 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
++_ACEOF
++
+ fi
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
- 
--#undef $ac_func
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +done
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
++
++
 +# glob
 +for ac_header in fnmatch.h
 +do :
@@ -43148,40 +42888,9 @@
 +if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_FNMATCH_H 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	eval "$as_ac_var=no"
++_ACEOF
++
  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
@@ -43189,6 +42898,7 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
 +done
 +
 +
@@ -43219,56 +42929,56 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
  
 +done
  
--for ac_func in setenv strcasecmp fcvt fcvtl
+ 
+ 
++save_LIBS="$LIBS"
++LIBS=""
+ 
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++libreplace_cv_dlfcn=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
++$as_echo_n "checking for library containing dlopen... " >&6; }
++if test "${ac_cv_search_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+save_LIBS="$LIBS"
-+LIBS=""
- 
+-
 -#undef $ac_func
-+libreplace_cv_dlfcn=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-+$as_echo_n "checking for library containing dlopen... " >&6; }
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41188,102 +10194,85 @@
+@@ -40882,100 +10195,85 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43312,9 +43022,6 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 +for ac_lib in '' dl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -43332,23 +43039,36 @@
 +fi
 +done
 +if test "${ac_cv_search_dlopen+set}" = set; then :
- 
--	eval "$as_ac_var=no"
-+else
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_search_dlopen=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
 +$as_echo "$ac_cv_search_dlopen" >&6; }
 +ac_res=$ac_cv_search_dlopen
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-	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
++
++for ac_header in dlfcn.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
++_ACEOF
++
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -43358,37 +43078,25 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
++done
 +
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DLFCN_H 1
- _ACEOF
- 
- fi
-+
- done
- 
 +for ac_func in dlopen dlsym dlerror dlclose
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 +eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
 +else
 +  libreplace_cv_dlfcn=yes
-+fi
-+done
+ fi
+ done
  
  
--for ac_func in syslog vsyslog timegm
+-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
@@ -43427,7 +43135,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41291,966 +10280,612 @@
+@@ -40983,1172 +10281,612 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43544,8 +43252,7 @@
  done
  
  
--
--for ac_func in setlocale nl_langinfo
+-for ac_func in 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
@@ -43640,10 +43347,8 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
+-fi
 +		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
-+
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -43659,19 +43364,20 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-done
+-
+-
 +{ $as_echo "$as_me:${as_lineno-$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; }
 +if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
-+
-+
-+$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
-+
  
- fi
--done
  
++$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
  
--for ac_func in nanosleep
+-for ac_func in setenv strcasecmp fcvt fcvtl
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43688,27 +43394,22 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
-+fi
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+LIBDL="$LIBS"
++fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+LIBS="$save_LIBS"
  
 -#undef $ac_func
-+ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
-+if test "x$ac_cv_func_getpass" = x""yes; then :
-+  libreplace_cv_HAVE_GETPASS=yes
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
 +fi
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -43724,32 +43425,130 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++LIBDL="$LIBS"
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++LIBS="$save_LIBS"
+ 
+-	eval "$as_ac_var=no"
++ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
++if test "x$ac_cv_func_getpass" = x""yes; then :
++  libreplace_cv_HAVE_GETPASS=yes
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
 +if test "x$ac_cv_func_getpassphrase" = x""yes; then :
 +  libreplace_cv_HAVE_GETPASSPHRASE=yes
-+fi
-+
+ 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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ 
+-fi
+-done
 +if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
-+
+ 
 +$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
-+
-+
+ 
+ 
 +$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-+
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 +	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
-+else
-+
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
 +$as_echo_n "checking whether getpass should be replaced... " >&6; }
 +if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
-+
+ 
+-#undef $ac_func
 +SAVE_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
 +#include "confdefs.h"
 +#define NO_CONFIG_H
 +#include "$libreplacedir/getpass.c"
@@ -43790,23 +43589,16 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  libreplace_cv_REPLACE_GETPASS=no
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +CPPFLAGS="$SAVE_CPPFLAGS"
  
--	eval "$as_ac_var=no"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
-+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
-+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
-+
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
- 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -43818,46 +43610,136 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
++$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
++if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
  
+-fi
+-done
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
+ 
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
 +fi
-+
+ 
++fi
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
 +$as_echo_n "checking whether strptime is available and works... " >&6; }
 +if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
 +	if test "$cross_compiling" = yes; then :
 +  libreplace_cv_STRPTIME_OK="assuming not"
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
 +		#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
 +		#include "$libreplacedir/test/strptime.c"
-+
-+_ACEOF
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_STRPTIME_OK=yes
  else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  libreplace_cv_STRPTIME_OK=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
++
  
- 
-+fi
+-	eval "$as_ac_var=no"
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
 +$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
 +if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
 +
-+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
- 
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS  $LIBS"
 +        LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +
 +for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
 +do :
@@ -43865,18 +43747,22 @@
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
  
-+fi
+ fi
++
+ done
  
-+done
  
- 
--        { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
--$as_echo_n "checking for nanosleep in -lrt... " >&6; }
--if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +#######################################
 +# Check for mkdir mode
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
@@ -43891,14 +43777,37 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char nanosleep ();
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+ 
 +		#include <stdio.h>
 +		#ifdef HAVE_DIRECT_H
 +		#include <direct.h>
@@ -43906,7 +43815,7 @@
  int
  main ()
  {
--return nanosleep ();
+-return $ac_func ();
 +
 +			mkdir("foo",0777);
 +			return 0;
@@ -43936,16 +43845,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_ext_rt_nanosleep=yes;
--		  ac_cv_lib_ext_rt=yes
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_mkdir_has_mode="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_ext_rt_nanosleep=no;
--		  ac_cv_lib_ext_rt=no
+-	eval "$as_ac_var=no"
 +  libreplace_cv_mkdir_has_mode="no"
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -43955,50 +43862,44 @@
 +
 +if test "$libreplace_cv_mkdir_has_mode" = "yes"
 +then
++
++$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
- 
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
--$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
--    if test $ac_cv_lib_ext_rt_nanosleep = yes; then
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +
 +for ac_func in timegm
 +do :
 +  ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
 +if test "x$ac_cv_func_timegm" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define HAVE_NANOSLEEP 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_TIMEGM 1
  _ACEOF
  
-+else
+ else
 +  LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
- fi
++fi
 +done
  
--LIBS=$ac_check_lib_ext_save_LIBS
  
--if test $ac_cv_lib_ext_rt = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
--_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
 +$as_echo_n "checking for broken readdir... " >&6; }
 +if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
  
--		case "$LIBS" in
--		    *-lrt*)
--			;;
--		    *)
--			LIBS="-lrt $LIBS"
--			;;
--		esac
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS  $LIBS"
 +	if test "$cross_compiling" = yes; then :
 +  libreplace_cv_READDIR_NEEDED="assuming not"
 +else
@@ -44018,7 +43919,7 @@
 +fi
  
  
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
 +$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
 +
@@ -44029,17 +43930,14 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_DIRFD 1
 +_ACEOF
++
++fi
++done
  
- fi
- done
  
- 
--for ac_func in utimensat
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-        { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
+-$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
 +$as_echo_n "checking for dirfd declaration... " >&6; }
 +if test "${ac_cv_have_dirfd_decl+set}" = set; then :
@@ -44051,44 +43949,21 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
- 
+-char nanosleep ();
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <dirent.h>
  int
  main ()
  {
--return $ac_func ();
+-return nanosleep ();
 +int i = (int)dirfd
    ;
    return 0;
@@ -44115,43 +43990,43 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_ext_rt_nanosleep=yes;
+-		  ac_cv_lib_ext_rt=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_have_dirfd_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_ext_rt_nanosleep=no;
+-		  ac_cv_lib_ext_rt=no
 +  ac_cv_have_dirfd_decl=no
  fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+-    if test $ac_cv_lib_ext_rt_nanosleep = yes; then
 -  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_NANOSLEEP 1
 -_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
 +$as_echo "$ac_cv_have_dirfd_decl" >&6; }
 + if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
  
 -fi
--done
 +$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
- 
++
 + fi
  
+-LIBS=$ac_check_lib_ext_save_LIBS
  
+-if test $ac_cv_lib_ext_rt = yes; then
 +#
 +# try to replace with getdirentries() if needed
 +#
@@ -44160,14 +44035,27 @@
 +do :
 +  ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
 +if test "x$ac_cv_func_getdirentries" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
 +#define HAVE_GETDIRENTRIES 1
-+_ACEOF
+ _ACEOF
  
-+fi
-+done
+-		case "$LIBS" in
+-		    *-lrt*)
+-			;;
+-		    *)
+-			LIBS="-lrt $LIBS"
+-			;;
+-		esac
+-
+-
+-fi
+-
+ fi
+ done
  
--for ac_func in mlock munlock mlockall munlockall
+-
+-for ac_func in utimensat
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44291,15 +44179,15 @@
 +$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
  
  
--for ac_func in memalign posix_memalign hstrerror
++fi
+ 
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
 +
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
 +$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
 +if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
@@ -44415,6 +44303,155 @@
 +if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
  
  
++$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
+ 
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
++$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++	if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++#define _LIBREPLACE_REPLACE_H
++#include "$libreplacedir/repdir_getdirentries.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_READDIR_GETDIRENTRIES=yes
++else
++  libreplace_cv_READDIR_GETDIRENTRIES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
++$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++fi
++if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
+-fi
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
++	libreplace_cv_READDIR_NEEDED=no
+ 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
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDENTS 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+-
 -for ac_header in sys/mman.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44422,13 +44459,16 @@
 -  { $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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
++$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
+   $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -44437,10 +44477,24 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++	if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++#define _LIBREPLACE_REPLACE_H
++#error _donot_use_getdents_replacement_anymore
++#include "$libreplacedir/repdir_getdents.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -44460,23 +44514,29 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_READDIR_GETDENTS=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
-+
++  libreplace_cv_READDIR_GETDENTS=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
 -	ac_header_compiler=no
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
++$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
  fi
++if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
  
 -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; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
-+$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -44486,21 +44546,9 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+	if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <$ac_header>
-+
-+#define _LIBREPLACE_REPLACE_H
-+#include "$libreplacedir/repdir_getdirentries.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
- _ACEOF
+-_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44519,22 +44567,20 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_READDIR_GETDIRENTRIES=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
-+  libreplace_cv_READDIR_GETDIRENTRIES=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
++	libreplace_cv_READDIR_NEEDED=no
++fi
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -44570,45 +44616,40 @@
 -$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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
++$as_echo_n "checking a usable readdir()... " >&6; }
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
++$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
+ else
 -  eval "$as_ac_Header=\$ac_header_preproc"
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&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; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
-+fi
-+if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
-+
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
  
-+
-+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
-+	libreplace_cv_READDIR_NEEDED=no
- fi
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdents
++###############################################
++# test for where we get crypt() from
++for ac_header in crypt.h
 +do :
-+  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-+if test "x$ac_cv_func_getdents" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
++if test "x$ac_cv_header_crypt_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_GETDENTS 1
++#define HAVE_CRYPT_H 1
  _ACEOF
  
  fi
--
+ 
  done
  
 -# setbuffer, shmget, shm_open are needed for smbtorture
@@ -44620,9 +44661,9 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
-+$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
++$as_echo_n "checking for library containing crypt... " >&6; }
++if test "${ac_cv_search_ext_crypt+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -44630,15 +44671,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+	if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -44647,40 +44680,25 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_READDIR_GETDENTS=yes
-+else
-+  libreplace_cv_READDIR_GETDENTS=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
- 
+-
 -#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
-+fi
-+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
++ac_func_search_ext_save_LIBS=$LIBS
++ac_cv_search_ext_crypt=no
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -42156,101 +10894,25 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -44688,16 +44706,17 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
- 
--int
--main ()
--{
+-
++char crypt ();
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++return crypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -44723,28 +44742,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
-+	libreplace_cv_READDIR_NEEDED=no
- fi
- 
+-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:${as_lineno-$LINENO}: checking a usable readdir()" >&5
-+$as_echo_n "checking a usable readdir()... " >&6; }
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
-+$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
-+else
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44752,41 +44757,37 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+###############################################
-+# test for where we get crypt() from
-+for ac_header in crypt.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-+if test "x$ac_cv_header_crypt_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CRYPT_H 1
- _ACEOF
- 
+-_ACEOF
+-
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_ext_crypt="none required"
  fi
 -done
 -
- 
-+done
- 
+-
+-
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-+$as_echo_n "checking for library containing crypt... " >&6; }
-+if test "${ac_cv_search_ext_crypt+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_ext_crypt" = no; then
++  for ac_lib in crypt; do
++    LIBS="-l$ac_lib $CRYPT_LIBS  $ac_func_search_save_ext_LIBS"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -44795,7 +44796,7 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
@@ -44803,14 +44804,10 @@
 -#endif
 -
 -#undef $ac_func
-+ac_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_crypt=no
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -42258,101 +10893,25 @@
+@@ -42258,1278 +10920,665 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44859,12 +44856,29 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
--
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_ext_crypt="-l$ac_lib"
++break
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_ext_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
++$as_echo "$ac_cv_search_ext_crypt" >&6; }
++if test "$ac_cv_search_ext_crypt" != no; then :
++  test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS"
+ 
 -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 "#define HAVE_CRYPT 1" >>confdefs.h
++
++else
++   LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44872,17 +44886,26 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_ext_crypt="none required"
++
++
++for ac_func in printf memset memcpy
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
++else
++  as_fn_error "Required function not found" "$LINENO" 5
  fi
--done
--
--
--
+ done
+ 
+ 
++echo "LIBREPLACE_BROKEN_CHECKS: END"
+ 
 -for ac_func in bindtextdomain textdomain
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44896,13 +44919,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_ext_crypt" = no; then
-+  for ac_lib in crypt; do
-+    LIBS="-l$ac_lib $CRYPT_LIBS  $ac_func_search_save_ext_LIBS"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -44919,13 +44936,13 @@
 -#endif
 -
 -#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -42360,1176 +10919,665 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -44934,16 +44951,14 @@
 -choke me
 -#endif
 -
-+char crypt ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -return $ac_func ();
-+return crypt ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -44966,38 +44981,15 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_ext_crypt="-l$ac_lib"
-+break
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  done
-+fi
-+LIBS=$ac_func_search_ext_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
-+$as_echo "$ac_cv_search_ext_crypt" >&6; }
-+if test "$ac_cv_search_ext_crypt" != no; then :
-+  test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS"
-+
-+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
-+
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+   LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
-+fi
-+
-+
-+for ac_func in printf memset memcpy
++for ac_func in syslog
 +do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
++if test "x$ac_cv_func_syslog" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_SYSLOG 1
 +_ACEOF
  
 -	eval "$as_ac_var=no"
@@ -45018,22 +45010,29 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
++echo "LIBREPLACE_NETWORK_CHECKS: START"
 +
-+for ac_func in syslog
++
++$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
++
++LIBREPLACE_NETWORK_OBJS=""
++LIBREPLACE_NETWORK_LIBS=""
++
++for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
 +do :
-+  ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-+if test "x$ac_cv_func_syslog" = x""yes; then :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SYSLOG 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
-+else
-+  as_fn_error "Required function not found" "$LINENO" 5
  fi
- done
+-done
  
++done
  
 -for ac_func in strupr
 -do
@@ -45045,22 +45044,12 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+echo "LIBREPLACE_NETWORK_CHECKS: START"
-+
-+
-+$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
-+
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
-+
-+for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
++for ac_header in netinet/in_systm.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
++if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NETINET_IN_SYSTM_H 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -45068,28 +45057,21 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
++fi
  
 -#undef $ac_func
-+for ac_header in netinet/in_systm.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IN_SYSTM_H 1
-+_ACEOF
++done
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -45104,17 +45086,6 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
-+done
-+
 +for ac_header in netinet/ip.h
 +do :
 +  ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
@@ -45125,7 +45096,14 @@
 +	#ifdef HAVE_NETINET_IN_SYSTM_H
 +	#include <netinet/in_systm.h>
 +	#endif
-+
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
 +"
 +if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
@@ -45524,13 +45502,13 @@
 -      conftest$ac_exeext
 -  if test "${ac_cv_search_backtrace_symbols+set}" = set; then
 -  break
- fi
+-fi
 -done
 -if test "${ac_cv_search_backtrace_symbols+set}" = set; then
 -  :
 -else
 -  ac_cv_search_backtrace_symbols=no
--fi
+ fi
 -rm conftest.$ac_ext
 -LIBS=$ac_func_search_save_LIBS
 -fi
@@ -46338,14 +46316,14 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBUNWIND 1
 -_ACEOF
--
 +if ac_fn_c_try_compile "$LINENO"; then :
  
++		libreplace_cv_HAVE_UNIXSOCKET=yes
+ 
 -	# If we have libunwind, test whether we also have libunwind-ptrace
 -	# which would let us unwind arbitrary processes.
 -	save_LIBS=$LIBS
-+		libreplace_cv_HAVE_UNIXSOCKET=yes
- 
+-
 -for ac_header in libunwind-ptrace.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46359,7 +46337,7 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
- else
+-else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -46391,7 +46369,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46534,7 +46512,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -43538,349 +11586,131 @@
+@@ -43538,349 +11587,197 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -46608,33 +46586,15 @@
 -
 -else
 -   LIBUNWIND_PTRACE=""
--fi
--
--
--	LIBS=$save_LIBS
--
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--	LIBS=$save_LIBS
--
  fi
 +LIBS=$ac_check_lib_ext_save_LIBS
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
 +if test $ac_cv_lib_ext_nsl_s = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBNSL_S 1
 +_ACEOF
  
--# To use libunwind-ptrace, we also need to make some ptrace system calls.
--if test x"$LIBUNWIND_PTRACE" != x"" ; then
+-	LIBS=$save_LIBS
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl_s*)
 +			;;
@@ -46643,6 +46603,27 @@
 +			;;
 +		esac
  
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
++fi
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-	LIBS=$save_LIBS
+ 
+-fi
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ 
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
+ 
 -for ac_header in sys/ptrace.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46650,13 +46631,16 @@
 -  { $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
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
++$as_echo_n "checking for connect in -lnsl... " >&6; }
++if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
+   $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -46665,10 +46649,26 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char connect ();
++int
++main ()
++{
++return connect ();
++  ;
++  return 0;
++}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -46688,16 +46688,32 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_ext_nsl_connect=yes;
++		  ac_cv_lib_ext_nsl=yes
+ else
 -  $as_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 -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  
 -	ac_header_compiler=no
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
++$as_echo "$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
++_ACEOF
  
 -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; }
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -46709,7 +46725,10 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++if test $ac_cv_lib_ext_nsl = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 1
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46731,11 +46750,16 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
 -  ac_header_preproc=no
 -fi
++		case "$LIBREPLACE_NETWORK_LIBS" in
++		    *-lnsl*)
++			;;
++		    *)
++			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++			;;
++		esac
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -46774,18 +46798,15 @@
 -{ $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 "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
-+$as_echo_n "checking for connect in -lnsl... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ 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"'`
@@ -46793,11 +46814,13 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
+ 
 -fi
--
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
+ 
 -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; }
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -46805,6 +46828,12 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -46866,8 +46895,8 @@
 -
 -
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_nsl_connect=yes;
-+		  ac_cv_lib_ext_nsl=yes
++  ac_cv_lib_ext_socket_connect=yes;
++		  ac_cv_lib_ext_socket=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -46877,8 +46906,8 @@
 -$as_echo "no" >&6; }
 -		LIBUNWIND_PTRACE=""
 -
-+  ac_cv_lib_ext_nsl_connect=no;
-+		  ac_cv_lib_ext_nsl=no
++  ac_cv_lib_ext_socket_connect=no;
++		  ac_cv_lib_ext_socket=no
  fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
@@ -46887,9 +46916,9 @@
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
-+    if test $ac_cv_lib_ext_nsl_connect = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
++$as_echo "$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
 +_ACEOF
@@ -46897,16 +46926,16 @@
 +fi
 +LIBS=$ac_check_lib_ext_save_LIBS
  
-+if test $ac_cv_lib_ext_nsl = yes; then :
++if test $ac_cv_lib_ext_socket = yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
++#define HAVE_LIBSOCKET 1
 +_ACEOF
  
 +		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lnsl*)
++		    *-lsocket*)
 +			;;
 +		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
  
@@ -46915,7 +46944,7 @@
  
  
 +ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
++LIBS="-linet $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
  
  
@@ -46925,9 +46954,9 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
++$as_echo_n "checking for connect in -linet... " >&6; }
++if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -46956,7 +46985,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -43888,106 +11718,65 @@
+@@ -43888,106 +11785,88 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47001,148 +47030,6 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_socket_connect=yes;
-+		  ac_cv_lib_ext_socket=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  ac_cv_lib_ext_socket_connect=no;
-+		  ac_cv_lib_ext_socket=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
--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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
-+$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
-+    if test $ac_cv_lib_ext_socket_connect = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CONNECT 1
- _ACEOF
- 
- fi
--done
--
--
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
-+if test $ac_cv_lib_ext_socket = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
- 
-+		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lsocket*)
-+			;;
-+		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
-+			;;
-+		esac
- 
- 
-+fi
- 
- 
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-linet $LIBREPLACE_NETWORK_LIBS  $LIBS"
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
-+$as_echo_n "checking for connect in -linet... " >&6; }
-+if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -43995,101 +11784,88 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+char connect ();
- int
- main ()
- {
--return $ac_func ();
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_inet_connect=yes;
 +		  ac_cv_lib_ext_inet=yes
  else
@@ -47153,35 +47040,23 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
- 
--	eval "$as_ac_var=no"
- fi
++
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
 +$as_echo "$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
 +_ACEOF
- 
--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
++
++fi
 +LIBS=$ac_check_lib_ext_save_LIBS
 +
 +if test $ac_cv_lib_ext_inet = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBINET 1
- _ACEOF
- 
++_ACEOF
++
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-linet*)
 +			;;
@@ -47190,76 +47065,90 @@
 +			;;
 +		esac
 +
-+
+ 
+-	eval "$as_ac_var=no"
  fi
--done
 +			if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
 +		test x"$ac_cv_lib_ext_nsl_connect" = x"yes" ||
 +		test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
 +		test x"$ac_cv_lib_ext_inet_connect" = x"yes"
 +	then
- 
++
 +$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
  
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +	fi
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++
++for ac_func in gethostbyname
++do :
++  ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETHOSTBYNAME 1
+ _ACEOF
  
--for ac_func in __getcwd _getcwd
+ fi
+ done
+ 
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
+ 
+ 
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
++$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in gethostbyname
-+do :
-+  ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+done
-+
-+if test x"$ac_cv_func_gethostbyname" = x"no"; then
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
- 
+-
 -#undef $ac_func
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
-+
-+
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44097,102 +11873,65 @@
+@@ -43995,101 +11874,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47359,14 +47248,14 @@
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
- 
--for ac_func in __xstat __fxstat __lxstat
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +
++
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 +if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
@@ -47398,7 +47287,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44200,105 +11939,65 @@
+@@ -44097,102 +11940,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47448,14 +47337,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  ac_cv_lib_ext_nsl_gethostbyname=no;
 +		  ac_cv_lib_ext_nsl=no
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
+-	eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
++$as_echo "$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
++_ACEOF
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -47467,23 +47363,14 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
-+    if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
++LIBS=$ac_check_lib_ext_save_LIBS
++
++if test $ac_cv_lib_ext_nsl = yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETHOSTBYNAME 1
++#define HAVE_LIBNSL 1
  _ACEOF
  
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_nsl = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
-+_ACEOF
-+
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl*)
 +			;;
@@ -47491,17 +47378,18 @@
 +			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
++
++
+ fi
+-done
  
  
-+fi
- 
- 
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
++
  
  
- 
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+-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
@@ -47538,7 +47426,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44306,107 +12005,87 @@
+@@ -44200,105 +12006,87 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47588,21 +47476,14 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  ac_cv_lib_ext_socket_gethostbyname=no;
 +		  ac_cv_lib_ext_socket=no
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
--	eval "$as_ac_var=no"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
-+$as_echo "$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
-+_ACEOF
- 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -47614,14 +47495,23 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_socket = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
++    if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBSOCKET 1
++#define HAVE_GETHOSTBYNAME 1
  _ACEOF
  
+ fi
+-done
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
++if test $ac_cv_lib_ext_socket = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSOCKET 1
++_ACEOF
+ 
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lsocket*)
 +			;;
@@ -47629,10 +47519,9 @@
 +			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
- fi
--done
+ 
+ 
++fi
 +			if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
 +		test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
 +		test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
@@ -47643,63 +47532,62 @@
 +	fi
 +fi
  
-+for ac_func in if_nametoindex
-+do :
-+  ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-+if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_IF_NAMETOINDEX 1
-+_ACEOF
- 
-+fi
-+done
- 
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
- 
- 
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS  $LIBS"
- 
- 
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
-+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
-+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++for ac_func in if_nametoindex
++do :
++  ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_IF_NAMETOINDEX 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++fi
++done
++
++if test x"$ac_cv_func_if_nametoindex" = x"no"; then
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS  $LIBS"
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
++
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
++$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
++if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44414,2652 +12093,2283 @@
+@@ -44306,2754 +12094,2283 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47779,7 +47667,7 @@
  fi
 -done
 +LIBS=$ac_check_lib_ext_save_LIBS
-+
+ 
 +if test $ac_cv_lib_ext_ipv6 = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBIPV6 1
@@ -47809,52 +47697,58 @@
 +libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS -I$libreplacedir"
  
--for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++for ac_func in socketpair
++do :
++  ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
++if test "x$ac_cv_func_socketpair" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKETPAIR 1
++_ACEOF
+ 
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--else
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in socketpair
-+do :
-+  ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-+if test "x$ac_cv_func_socketpair" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKETPAIR 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
++fi
++done
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
-+fi
-+done
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
- 
--#undef $ac_func
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
 +$as_echo_n "checking for broken inet_ntoa... " >&6; }
 +if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
  
+-#undef $ac_func
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_REPLACE_INET_NTOA=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -47867,13 +47761,14 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_REPLACE_INET_NTOA=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
+ #endif
+-
 -int
 -main ()
 -{
@@ -47881,13 +47776,6 @@
 -  ;
 -  return 0;
 -}
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
 +main() { struct in_addr ip; ip.s_addr = 0x12345678;
 +if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
 +    strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
@@ -47957,7 +47845,7 @@
  done
  
 +if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+
+ 
 +$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
  
 +    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
@@ -47977,6 +47865,13 @@
 +done
  
  
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 +for ac_func in inet_ntop
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
@@ -47984,14 +47879,7 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_INET_NTOP 1
 +_ACEOF
- 
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
++
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -48107,35 +47995,17 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  libreplace_cv_HAVE_GETADDRINFO=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
-+$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
-+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
- 
--	eval "$as_ac_var=no"
-+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-+
-+else
-+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
  fi
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$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
@@ -48143,69 +48013,67 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in ifaddrs.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IFADDRS_H 1
- _ACEOF
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
++$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
++if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
  
- fi
-+
- done
+-fi
+-done
++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
  
  
-+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
-+"
-+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
++$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
  
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-+_ACEOF
  
++$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
  
-+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
  
--for ac_func in getdirentries _write __write _fork __fork
++$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+ 
+-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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
--else
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
++fi
++
++for ac_header in ifaddrs.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
++if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_IFADDRS_H 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+fi
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
-+$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
-+if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
++done
  
 -#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -48219,12 +48087,35 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
+-#endif
++ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
++"
++if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
++_ACEOF
++
++
++$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 +#include <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
- #endif
--
++#endif
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
@@ -48273,25 +48164,13 @@
 -
 -	eval "$as_ac_var=no"
 +  libreplace_cv_HAVE_GETIFADDRS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
-+$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
-+if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -48302,22 +48181,56 @@
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
+ 
+-fi
+-done
++$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
+ 
+ 
++$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
+ 
+ 
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
+ 
++fi
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +##################
 +# look for a method of finding the list of network interfaces
 +iface=no;
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
 +$as_echo_n "checking for iface getifaddrs... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
 +#define HAVE_IFACE_GETIFADDRS 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48328,7 +48241,7 @@
 +#include "$libreplacedir/getifaddrs.c"
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
 +else
@@ -48338,32 +48251,83 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
- fi
--done
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
 +if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
-+
+ 
+-#undef $ac_func
 +else
 +	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
 +fi
  
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
  
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
 +if test $iface = no; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
 +$as_echo_n "checking for iface AIX... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
-+else
-+
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_AIX=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +#define HAVE_IFACE_AIX 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48383,40 +48347,46 @@
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
+ fi
  
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ 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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
 +if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_AIX 1" >>confdefs.h
  
+ fi
+-done
 +fi
-+fi
  
  
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +if test $iface = no; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
 +$as_echo_n "checking for iface ifconf... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+
++  $as_echo_n "(cached) " >&6
++else
+ 
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_IFCONF=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+
+ 
 +#define HAVE_IFACE_IFCONF 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48427,9 +48397,7 @@
 +#include "$libreplacedir/getifaddrs.c"
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_IFCONF=yes
 +else
@@ -48438,23 +48406,34 @@
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
-+
+ 
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
 +if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-+
+ 
 +fi
 +fi
-+
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +if test $iface = no; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifreq" >&5
 +$as_echo_n "checking for iface ifreq... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_IFREQ=cross
@@ -48748,7 +48727,7 @@
 +
 +done
 +
-+for ac_header in limits.h float.h pthread.h libintl.h
++for ac_header in limits.h float.h libintl.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49037,20 +49016,6 @@
 +if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_RPCSVC_YP_PROT_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_MODE_H 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -49084,7 +49049,19 @@
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++done
++
++
++## These fail to compile on IRIX so just check for their presence
++for ac_header in sys/mode.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_MODE_H 1
++_ACEOF
++
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49092,6 +49069,7 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
 +done
 +
 +
@@ -49304,8 +49282,7 @@
 -# include <assert.h>
 -#endif
 +done
- 
--#undef $ac_func
++
 +for ac_header in syscall.h sys/syscall.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -49316,6 +49293,9 @@
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
+-#undef $ac_func
++fi
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -49329,7 +49309,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
++done
  
 -int
 -main ()
@@ -49338,9 +49318,7 @@
 -  ;
 -  return 0;
 -}
-+done
 +
-+
 +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`
@@ -49500,13 +49478,7 @@
    $as_echo_n "(cached) " >&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
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-  samba_cv_linux_getgrouplist_ok=cross
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 +
  else
@@ -49526,10 +49498,6 @@
 +     ac_cv_sizeof_int=0
 +   fi
 +fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
  
 -#include <unistd.h>
 -#include <sys/utsname.h>
@@ -49538,6 +49506,9 @@
 -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 -       int libc_major = __GLIBC__;
 -       int libc_minor = __GLIBC_MINOR__;
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
  
 -       if (libc_major < 2)
 -              exit(1);
@@ -49547,6 +49518,7 @@
 -       exit(0);
 -}
  
++
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
@@ -49994,17 +49966,14 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_lstat64=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- 
--fi
++
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 +if test "${ac_cv_c_bigendian+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_c_bigendian=unknown
 +    # See if we're dealing with a universal compiler.
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -50014,18 +49983,9 @@
 +	     #endif
 +	     typedef int dummy;
  
--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; }
--  if test x$ac_cv_func_lstat64 = xyes ; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LSTAT64 Whether lstat64() is available
- _ACEOF
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
  
--  fi
 +	# Check for potential -arch flags.  It is not universal unless
 +	# there are at least two -arch flags with different values.
 +	ac_arch=
@@ -50056,11 +50016,18 @@
 +#include <sys/types.h>
 +	     #include <sys/param.h>
  
--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; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-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; }
+-  if test x$ac_cv_func_lstat64 = xyes ; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LSTAT64 Whether lstat64() is available
+-_ACEOF
+-
+-  fi
+-fi
 +int
 +main ()
 +{
@@ -50069,7 +50036,12 @@
 +		     && LITTLE_ENDIAN)
 +	      bogus endian macros
 +	     #endif
-+
+ 
+-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; }
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 +  ;
 +  return 0;
 +}
@@ -50580,8 +50552,9 @@
 +cat >>confdefs.h <<_ACEOF
 +#define RETSIGTYPE $ac_cv_type_signal
 +_ACEOF
+ 
+-	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
 +
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 +if test "${ac_cv_type_uid_t+set}" = set; then :
@@ -50590,8 +50563,7 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
- 
--	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
++
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "uid_t" >/dev/null 2>&1; then :
@@ -50904,11 +50876,11 @@
 +fi
 +
 +
++
++        if test "x$CUPS_CONFIG" != x; then
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+        if test "x$CUPS_CONFIG" != x; then
-+
 +		ac_save_CFLAGS=$CFLAGS
 +		ac_save_LDFLAGS=$LDFLAGS
 +		ac_save_PRINT_LIBS=$PRINT_LIBS
@@ -51017,9 +50989,7 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBCUPS 1
 +_ACEOF
- 
--	ac_cv_member_struct_stat_st_umtime=no
--fi
++
 +		case "$PRINT_LIBS" in
 +		    *-lcups*)
 +			;;
@@ -51028,14 +50998,11 @@
 +			;;
 +		esac
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	ac_cv_member_struct_stat_st_umtime=no
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_umtime" >&5
--$as_echo "$ac_cv_member_struct_stat_st_umtime" >&6; }
--if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then
 +		else
 +			{ $as_echo "$as_me:${as_lineno-$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;}
@@ -51044,13 +51011,18 @@
 +			PRINT_LIBS=$ac_save_PRINT_LIBS
 +		fi
  
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++	elif test x"$enable_cups" = x"yes"; then
++		as_fn_error "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
++        fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_umtime" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_umtime" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then
+-
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_STAT_ST_UMTIME 1
 -_ACEOF
-+	elif test x"$enable_cups" = x"yes"; then
-+		as_fn_error "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
-+        fi
-+fi
  
 -# Tru64
 -	samba_cv_stat_hires=yes
@@ -51511,20 +51483,20 @@
 +ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sigval_ptr" "ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" "#include <signal.h>
 +"
 +if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then :
- 
--fi
++
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
 +_ACEOF
  
+-fi
  
 +fi
  
++fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking whether there is DOS flags support in the stat struct" >&5
 -$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
 -if test "${samba_cv_stat_dos_flags+set}" = set; then
-+fi
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
 +$as_echo_n "checking for struct timespec type... " >&6; }
 +if test "${samba_cv_struct_timespec+set}" = set; then :
@@ -52034,7 +52006,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47067,100 +14377,41 @@
+@@ -47061,100 +14378,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52155,7 +52127,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47169,111 +14420,106 @@
+@@ -47163,111 +14421,106 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52336,7 +52308,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47281,100 +14527,41 @@
+@@ -47275,100 +14528,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52457,7 +52429,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47383,112 +14570,68 @@
+@@ -47377,112 +14571,68 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52558,11 +52530,11 @@
  
  fi
 -done
--
  
  
  
  
+-
 -for ac_func in set_auth_parameters
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52605,7 +52577,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47496,100 +14639,54 @@
+@@ -47490,100 +14640,54 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52734,7 +52706,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47598,111 +14695,43 @@
+@@ -47592,111 +14696,43 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52820,10 +52792,10 @@
  
  fi
 -done
+-
  
  
 -
--
 -for ac_func in set_auth_parameters
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52864,7 +52836,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47710,316 +14739,299 @@
+@@ -47704,316 +14740,299 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53044,7 +53016,18 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++fi
++done
++
++for ac_func in strchr chflags
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -53070,18 +53053,6 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+done
-+
-+for ac_func in strchr chflags
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
  
 -	ac_cv_lib_sec_set_auth_parameters=no
  fi
@@ -53402,7 +53373,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48028,112 +15040,179 @@
+@@ -48022,112 +15041,179 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53651,7 +53622,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48141,100 +15220,66 @@
+@@ -48135,100 +15221,66 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53794,7 +53765,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48243,212 +15288,191 @@
+@@ -48237,212 +15289,191 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53851,34 +53822,20 @@
 -{ $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
--
--		LIBS="-lsecurity $LIBS"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
 +{ $as_echo "$as_me:${as_lineno-$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 :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBEXC 1
- _ACEOF
++_ACEOF
  
--
--
--else
--
--
--			# getspnam was not found in libsecurity
--			# nothing to do here by default
--			true
--
+-		LIBS="-lsecurity $LIBS"
 +  LIBS="-lexc $LIBS"
  
- fi
++fi
  
--	  ;;
--        esac
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
 +
 +# check for sysctlbyname for BSD systems
 +for ac_func in sysctlbyname
@@ -53887,14 +53844,78 @@
 +if test "x$ac_cv_func_sysctlbyname" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYSCTLBYNAME 1
+ _ACEOF
+ 
++fi
++done
+ 
+ 
+-else
++#############################
++# check if building with gpfs
++for ac_header in gpfs_gpl.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
++if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GPFS_GPL_H 1
 +_ACEOF
  
++fi
+ 
+-			# getspnam was not found in libsecurity
+-			# nothing to do here by default
+-			true
++done
++
++if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+ 
++$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+ 
++    default_shared_modules="$default_shared_modules vfs_gpfs"
  fi
- done
  
+-	  ;;
+-        esac
+-
++#############################################
++# check if building on Isilon OneFS
++printf "%s" "checking for Isilon OneFS... "
++save_LIBS="$LIBS"
++LIBS="$LIBS -lisi_version"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <isi_version/isi_version.h>
++int
++main ()
++{
++get_isilon_copyright()
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  samba_cv_HAVE_ONEFS=yes
++else
++  samba_cv_HAVE_ONEFS=no
+ fi
+-done
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++echo $samba_cv_HAVE_ONEFS
++if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
  
--
--
++$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
+ 
++    default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
++    default_static_modules="$default_static_modules"
++    ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
++    # Need to also add general libs for oplocks support
++    save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
++fi
+ 
++LIBS="$save_LIBS"
+ 
 -for ac_func in getspnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53905,26 +53926,31 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+#############################
-+# check if building with gpfs
-+for ac_header in gpfs_gpl.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GPFS_GPL_H 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
++# 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:${as_lineno-$LINENO}: checking for libunwind" >&5
++$as_echo_n "checking for libunwind... " >&6; }
++save_LIBS=$LIBS
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++UNWIND_ARCH="unknown"
++if test x"$UNAME_I" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_I"
++elif test x"$UNAME_M" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_M"
++elif test x"$UNAME_P" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_P"
 +fi
  
 -#ifdef __STDC__
@@ -53932,10 +53958,26 @@
 -#else
 -# include <assert.h>
 -#endif
-+done
++case "$UNWIND_ARCH" in
++	unknown)
++		# This probably won't link without
++		# the platform-specific libunwind.
++		LIBS="$LIBS -lunwind"
++		;;
++	i386|i586|i686)
++		# Add the platform-specific libunwind module.
++		LIBS="$LIBS -lunwind -lunwind-x86"
++		;;
++	*)
++		# Add the platform-specific libunwind module.
++		# based on uname -i, uname -m or uname -p
++		LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
++		;;
++esac
  
 -#undef $ac_func
-+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -53949,25 +53991,20 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
-+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
-+
-+    default_shared_modules="$default_shared_modules vfs_gpfs"
-+fi
++#ifdef HAVE_LIBUNWIND_H
++#include <libunwind.h>
+ #endif
  
-+#############################################
-+# check if building on Isilon OneFS
-+printf "%s" "checking for Isilon OneFS... "
-+save_LIBS="$LIBS"
-+LIBS="$LIBS -lisi_version"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <isi_version/isi_version.h>
  int
  main ()
  {
 -return $ac_func ();
-+get_isilon_copyright()
++
++	unw_context_t ctx; unw_cursor_t cur;
++	char buf[256]; unw_word_t off;
++	unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
++	unw_get_proc_name(&cur, buf, sizeof(buf), &off);
++
    ;
    return 0;
  }
@@ -53994,48 +54031,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  samba_cv_HAVE_ONEFS=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  samba_cv_HAVE_ONEFS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+echo $samba_cv_HAVE_ONEFS
-+if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
- 
+-
 -	eval "$as_ac_var=no"
-+$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
-+
-+    default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
-+    default_static_modules="$default_static_modules"
-+    ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
-+    # Need to also add general libs for oplocks support
-+    save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
- fi
+-fi
++if ac_fn_c_try_link "$LINENO"; then :
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+LIBS="$save_LIBS"
-+
-+# 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:${as_lineno-$LINENO}: checking for libunwind" >&5
-+$as_echo_n "checking for libunwind... " >&6; }
-+save_LIBS=$LIBS
-+
-+UNWIND_ARCH="unknown"
-+if test x"$UNAME_I" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_I"
-+elif test x"$UNAME_M" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_M"
-+elif test x"$UNAME_P" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_P"
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54046,56 +54053,15 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
 -        # getspnam was found in libc or existing $LIBS
-+case "$UNWIND_ARCH" in
-+	unknown)
-+		# This probably won't link without
-+		# the platform-specific libunwind.
-+		LIBS="$LIBS -lunwind"
-+		;;
-+	i386|i586|i686)
-+		# Add the platform-specific libunwind module.
-+		LIBS="$LIBS -lunwind -lunwind-x86"
-+		;;
-+	*)
-+		# Add the platform-specific libunwind module.
-+		# based on uname -i, uname -m or uname -p
-+		LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-+		;;
-+esac
++$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
  
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETSPNAM 1
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
-+#endif
-+
-+int
-+main ()
-+{
-+
-+	unw_context_t ctx; unw_cursor_t cur;
-+	char buf[256]; unw_word_t off;
-+	unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-+	unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
-+$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
- 
- 
--else
 +	# If we have libunwind, test whether we also have libunwind-ptrace
 +	# which would let us unwind arbitrary processes.
 +	save_LIBS=$LIBS
@@ -54105,18 +54071,22 @@
 +if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBUNWIND_PTRACE_H 1
-+_ACEOF
+ _ACEOF
  
++fi
+ 
++done
+ 
+-else
+-
 -        # getspnam was not found, try adding libsec
 -	case " $LIBS " in
 -          *\ -lsec\ *)
-+fi
- 
+-
 -		    # getspnam was not found and we already had libsec
 -		    # nothing to do here by default
 -		    true
-+done
- 
+-
 -	    ;;
 -          *)
 -	    # getspnam was not found, try adding libsec
@@ -54140,7 +54110,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48457,541 +15481,649 @@
+@@ -48451,969 +15482,646 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54340,28 +54310,17 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
-+
-+
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
 -fi
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		LIBUNWIND_PTRACE=""
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54369,74 +54328,39 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+
-+
-+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`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
 -        # bigcrypt was found in libc or existing $LIBS
 -
-+fi
-+done
++if ac_fn_c_try_link "$LINENO"; then :
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
-+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`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
-+fi
-+done
++$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
  
-+for ac_func in __getcwd _getcwd
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
  
--else
-+fi
-+done
+ else
  
 -        # bigcrypt was not found, try adding libsecurity
 -	case " $LIBS " in
 -          *\ -lsecurity\ *)
-+for ac_func in __xstat __fxstat __lxstat
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++		LIBUNWIND_PTRACE=""
  
 -		    # bigcrypt was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
 +fi
-+done
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
  
 -	    ;;
 -          *)
@@ -54450,15 +54374,7 @@
 -LIBS="-lsecurity  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -54477,10 +54393,8 @@
 -  ;
 -  return 0;
 -}
-+fi
-+done
 +
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54519,7 +54433,7 @@
  fi
 +done
 +
-+for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54540,7 +54454,7 @@
 +done
  
 -		LIBS="-lsecurity $LIBS"
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++for ac_func in __getcwd _getcwd
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54555,7 +54469,7 @@
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
-+for ac_func in getdirentries _write __write _fork __fork
++for ac_func in __xstat __fxstat __lxstat
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54568,7 +54482,7 @@
 +fi
 +done
  
-+for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++for ac_func in _stat _lstat _fstat __stat __lstat __fstat
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54582,7 +54496,7 @@
 +fi
 +done
  
-+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54598,7 +54512,7 @@
 +fi
 +done
  
-+for ac_func in pread _pread __pread pread64 _pread64 __pread64
++for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54613,7 +54527,7 @@
  
 -	  ;;
 -        esac
-+for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++for ac_func in getdents __getdents _lseek __lseek _read __read
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54626,7 +54540,7 @@
  fi
  done
  
-+for ac_func in open64 _open64 __open64 creat64
++for ac_func in getdirentries _write __write _fork __fork
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54650,12 +54564,14 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in prctl
++for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
 +do :
-+  ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
-+if test "x$ac_cv_func_prctl" = x""yes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_PRCTL 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -54663,23 +54579,30 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+done
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++fi
++done
  
 -#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++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`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -54693,18 +54616,25 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
-+#ifdef HAVE_SYS_PRCTL_H
-+#include <sys/prctl.h>
- #endif
+-#endif
++fi
++done
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return $ac_func ();
-+int i; i = prtcl(0);
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++for ac_func in pread _pread __pread pread64 _pread64 __pread64
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -54728,66 +54658,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+#
-+#
-+#
-+case "$host_os" in
-+    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+       # glibc <= 2.3.2 has a broken getgrouplist
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good getgrouplist" >&5
-+$as_echo_n "checking for good getgrouplist... " >&6; }
-+if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+main() {
-+       /* glibc up to 2.3 has a broken getgrouplist */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
-+
-+       if (libc_major < 2)
-+              exit(1);
-+       if ((libc_major == 2) && (libc_minor <= 3))
-+              exit(1);
-+#endif
-+       exit(0);
-+}
  
 -	eval "$as_ac_var=no"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_linux_getgrouplist_ok=yes
-+else
-+  samba_cv_linux_getgrouplist_ok=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
++done
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54795,77 +54677,55 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_linux_getgrouplist_ok" >&5
-+$as_echo "$samba_cv_linux_getgrouplist_ok" >&6; }
-+       if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETGROUPLIST 1" >>confdefs.h
-+
-+       fi
-+       ;;
-+    *)
-+       for ac_func in getgrouplist
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
 +do :
-+  ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
-+if test "x$ac_cv_func_getgrouplist" = x""yes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETGROUPLIST 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
 -        # bigcrypt was found in libc or existing $LIBS
+-
 +fi
 +done
  
-+       ;;
-+esac
- 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
--_ACEOF
-+#
-+# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
-+#
++for ac_func in open64 _open64 __open64 creat64
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
-+if test x$ac_cv_func_stat64 = xno ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++fi
++done
  
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/stat.h>
++for ac_func in prctl
++do :
++  ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
++if test "x$ac_cv_func_prctl" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_PRCTL 1
++_ACEOF
  
 -else
-+int
-+main ()
-+{
-+struct stat64 st64; exit(stat64(".",&st64));
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_stat64=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
-+$as_echo "$ac_cv_func_stat64" >&6; }
-+  if test x$ac_cv_func_stat64 = xyes ; then
- 
+-
 -        # bigcrypt was not found, try adding libsec
 -	case " $LIBS " in
 -          *\ -lsec\ *)
-+$as_echo "#define HAVE_STAT64 1" >>confdefs.h
++fi
++done
  
 -		    # bigcrypt was not found and we already had libsec
 -		    # nothing to do here by default
 -		    true
-+  fi
-+fi
  
 -	    ;;
 -          *)
@@ -54879,44 +54739,10 @@
 -LIBS="-lsec  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+if test x$ac_cv_func_lstat64 = xno ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/stat.h>
-+
-+int
-+main ()
-+{
-+struct stat64 st64; exit(lstat64(".",&st64));
-+  ;
-+  return 0;
-+}
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_lstat64=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat64" >&5
-+$as_echo "$ac_cv_func_lstat64" >&6; }
-+  if test x$ac_cv_func_lstat64 = xyes ; then
-+    $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>confdefs.h
-+
-+  fi
-+fi
-+
-+if test x$ac_cv_func_fstat64 = xno ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -54924,17 +54750,16 @@
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
++#ifdef HAVE_SYS_PRCTL_H
++#include <sys/prctl.h>
  #endif
 -char bigcrypt ();
-+#include <sys/stat.h>
 +
  int
  main ()
  {
 -return bigcrypt ();
-+struct stat64 st64; exit(fstat64(0,&st64));
++int i; i = prtcl(0);
    ;
    return 0;
  }
@@ -54964,200 +54789,126 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_fstat64=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fstat64" >&5
-+$as_echo "$ac_cv_func_fstat64" >&6; }
-+  if test x$ac_cv_func_fstat64 = xyes ; then
-+
-+$as_echo "#define HAVE_FSTAT64 1" >>confdefs.h
-+
-+  fi
-+fi
-+
-+#################################################
-+# Check whether struct stat has timestamps with sub-second resolution.
-+#
-+
-+samba_cv_stat_hires=no
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+_ACEOF
-+
-+# Linux, Solaris
-+	samba_cv_stat_hires=yes
-+fi
-+
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-+_ACEOF
-+
-+# BSD, if defined _POSIX_SOURCE
-+	samba_cv_stat_hires=yes
-+fi
-+
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-+_ACEOF
-+
-+# BSD, if not defined _POSIX_SOURCE
-+	samba_cv_stat_hires=yes
-+fi
-+
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_MTIME_N 1
-+_ACEOF
-+
-+# AIX
-+	samba_cv_stat_hires=yes
-+fi
-+
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_umtime" "ac_cv_member_struct_stat_st_umtime" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_UMTIME 1
-+_ACEOF
-+
-+# Tru64
-+	samba_cv_stat_hires=yes
-+fi
-+
-+
-+if test x"$samba_cv_stat_hires" = x"yes" ; then
-+
-+$as_echo "#define HAVE_STAT_HIRES_TIMESTAMPS 1" >>confdefs.h
++if ac_fn_c_try_compile "$LINENO"; then :
  
 -	ac_cv_lib_sec_bigcrypt=no
- fi
+-fi
++$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
  
 -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
-+# recent FreeBSD, NetBSD have creation timestamps called birthtime:
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
-+_ACEOF
-+
-+
  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
- 
+-
 -		LIBS="-lsec $LIBS"
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
- 
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-+_ACEOF
- 
+-
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
- _ACEOF
+-_ACEOF
+-
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
++#
++#
++#
++case "$host_os" in
++    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++       # glibc <= 2.3.2 has a broken getgrouplist
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good getgrouplist" >&5
++$as_echo_n "checking for good getgrouplist... " >&6; }
++if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "$cross_compiling" = yes; then :
++  samba_cv_linux_getgrouplist_ok=cross
+ else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
-+fi
++#include <unistd.h>
++#include <sys/utsname.h>
++main() {
++       /* glibc up to 2.3 has a broken getgrouplist */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++       int libc_major = __GLIBC__;
++       int libc_minor = __GLIBC_MINOR__;
  
--else
-+fi
- 
- 
 -			# bigcrypt was not found in libsec
 -			# nothing to do here by default
 -			true
++       if (libc_major < 2)
++              exit(1);
++       if ((libc_major == 2) && (libc_minor <= 3))
++              exit(1);
++#endif
++       exit(0);
++}
  
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether there is DOS flags support in the stat struct" >&5
-+$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
-+if test "${samba_cv_stat_dos_flags+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_linux_getgrouplist_ok=yes
 +else
++  samba_cv_linux_getgrouplist_ok=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
--fi
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/stat.h>
-+int
-+main ()
-+{
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_linux_getgrouplist_ok" >&5
++$as_echo "$samba_cv_linux_getgrouplist_ok" >&6; }
++       if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
  
 -	  ;;
 -        esac
-+		int a = UF_DOS_ARCHIVE;
-+		int h = UF_DOS_HIDDEN;
-+		int r = UF_DOS_RO;
-+		int s = UF_DOS_SYSTEM;
-+		int i = UF_DOS_NOINDEX;
-+		int f = UF_DOS_FLAGS;
++$as_echo "#define HAVE_GETGROUPLIST 1" >>confdefs.h
++
++       fi
++       ;;
++    *)
++       for ac_func in getgrouplist
++do :
++  ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
++if test "x$ac_cv_func_getgrouplist" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETGROUPLIST 1
++_ACEOF
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  samba_cv_stat_dos_flags=yes
-+else
-+  samba_cv_stat_dos_flags=no
  fi
--done
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_stat_dos_flags" >&5
-+$as_echo "$samba_cv_stat_dos_flags" >&6; }
++       ;;
++esac
  
-+if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
++#
++# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
++#
  
-+$as_echo "#define HAVE_STAT_DOS_FLAGS 1" >>confdefs.h
- 
-+fi
- 
+-
+-
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+#####################################
-+# needed for SRV lookups
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
-+$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
-+if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++if test x$ac_cv_func_stat64 = xno ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -55176,26 +54927,28 @@
 -
 -#undef $ac_func
  
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -48999,100 +16131,43 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
--
-+char dn_expand ();
++#if defined(HAVE_UNISTD_H)
++#include <unistd.h>
+ #endif
++#include <sys/stat.h>
+ 
  int
  main ()
  {
 -return $ac_func ();
-+return dn_expand ();
++struct stat64 st64; exit(stat64(".",&st64));
    ;
    return 0;
  }
@@ -55222,22 +54975,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_resolv_dn_expand=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_resolv_dn_expand=no
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_func_stat64=yes
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -55246,10 +54995,7 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$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 :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
@@ -55258,57 +55004,94 @@
 -
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETPRPWNAM 1
-+#define HAVE_LIBRESOLV 1
- _ACEOF
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
++$as_echo "$ac_cv_func_stat64" >&6; }
++  if test x$ac_cv_func_stat64 = xyes ; then
  
-+  LIBS="-lresolv $LIBS"
++$as_echo "#define HAVE_STAT64 1" >>confdefs.h
  
+-else
++  fi
 +fi
  
--else
--
 -        # getprpwnam was not found, try adding libsecurity
 -	case " $LIBS " in
 -          *\ -lsecurity\ *)
--
++if test x$ac_cv_func_lstat64 = xno ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -		    # getprpwnam was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
--
++#if defined(HAVE_UNISTD_H)
++#include <unistd.h>
++#endif
++#include <sys/stat.h>
+ 
 -	    ;;
 -          *)
 -	    # 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; }
 -if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dn_expand in -lresolv" >&5
-+$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
-+if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lsecurity  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++int
++main ()
++{
++struct stat64 st64; exit(lstat64(".",&st64));
++  ;
++  return 0;
++}
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lresolv  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_func_lstat64=yes
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat64" >&5
++$as_echo "$ac_cv_func_lstat64" >&6; }
++  if test x$ac_cv_func_lstat64 = xyes ; then
++    $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>confdefs.h
++
++  fi
++fi
++
++if test x$ac_cv_func_fstat64 = xno ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- /* Override any GCC internal prototype to avoid an error.
-@@ -49101,111 +16176,44 @@
- #ifdef __cplusplus
- extern "C"
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
++#if defined(HAVE_UNISTD_H)
++#include <unistd.h>
  #endif
 -char getprpwnam ();
-+char _dn_expand ();
++#include <sys/stat.h>
++
  int
  main ()
  {
 -return getprpwnam ();
-+return _dn_expand ();
++struct stat64 st64; exit(fstat64(0,&st64));
    ;
    return 0;
  }
@@ -55335,104 +55118,142 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_security_getprpwnam=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_resolv__dn_expand=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_security_getprpwnam=no
-+  ac_cv_lib_resolv__dn_expand=no
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_func_fstat64=yes
  fi
--
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fstat64" >&5
++$as_echo "$ac_cv_func_fstat64" >&6; }
++  if test x$ac_cv_func_fstat64 = xyes ; then
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+-LIBS=$ac_check_lib_save_LIBS
++$as_echo "#define HAVE_FSTAT64 1" >>confdefs.h
++
++  fi
  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
--
+ 
 -		LIBS="-lsecurity $LIBS"
--
--
++#################################################
++# Check whether struct stat has timestamps with sub-second resolution.
++#
+ 
++samba_cv_stat_hires=no
++ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETPRPWNAM 1
-+{ $as_echo "$as_me:${as_lineno-$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 :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBRESOLV 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
  _ACEOF
  
--
--
++# Linux, Solaris
++	samba_cv_stat_hires=yes
++fi
+ 
++ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
+ 
 -else
--
--
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
++_ACEOF
+ 
++# BSD, if defined _POSIX_SOURCE
++	samba_cv_stat_hires=yes
++fi
+ 
 -			# getprpwnam was not found in libsecurity
 -			# nothing to do here by default
 -			true
--
--
--fi
--
++ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then :
+ 
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
++_ACEOF
+ 
++# BSD, if not defined _POSIX_SOURCE
++	samba_cv_stat_hires=yes
+ fi
+ 
 -	  ;;
 -        esac
-+  LIBS="-lresolv $LIBS"
++ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_MTIME_N 1
++_ACEOF
  
++# AIX
++	samba_cv_stat_hires=yes
  fi
 -done
  
--
--
--
++ac_fn_c_check_member "$LINENO" "struct stat" "st_umtime" "ac_cv_member_struct_stat_st_umtime" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then :
+ 
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_UMTIME 1
++_ACEOF
+ 
++# Tru64
++	samba_cv_stat_hires=yes
++fi
+ 
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
-+$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
-+if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++if test x"$samba_cv_stat_hires" = x"yes" ; then
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++$as_echo "#define HAVE_STAT_HIRES_TIMESTAMPS 1" >>confdefs.h
+ 
 -#undef $ac_func
++fi
  
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -49213,100 +16221,79 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -55440,16 +55261,19 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
-+char __dn_expand ();
- int
- main ()
- {
++# recent FreeBSD, NetBSD have creation timestamps called birthtime:
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
+ 
+-int
+-main ()
+-{
 -return $ac_func ();
-+return __dn_expand ();
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -55473,22 +55297,16 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_resolv___dn_expand=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_resolv___dn_expand=no
- fi
--
+-fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -55497,92 +55315,83 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$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 :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBRESOLV 1
- _ACEOF
+-_ACEOF
  
 -        # getprpwnam was found in libc or existing $LIBS
-+  LIBS="-lresolv $LIBS"
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
++_ACEOF
  
-+fi
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETPRPWNAM 1
-+
-+#
-+# Check for the functions putprpwnam, set_auth_parameters,
-+# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
-+# Needed for OSF1 and HPUX.
-+#
-+
-+
-+  for ac_func in putprpwnam
-+do :
-+  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-+if test "x$ac_cv_func_putprpwnam" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_PUTPRPWNAM 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
  _ACEOF
  
-+        # putprpwnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-+
  
++fi
  
- else
+-else
++fi
  
 -        # getprpwnam was not found, try adding libsec
-+        # putprpwnam was not found, try adding libsecurity
- 	case " $LIBS " in
+-	case " $LIBS " in
 -          *\ -lsec\ *)
-+          *\ -lsecurity\ *)
  
 -		    # getprpwnam was not found and we already had libsec
-+		    # putprpwnam was not found and we already had libsecurity
- 		    # nothing to do here by default
- 		    true
+-		    # nothing to do here by default
+-		    true
  
- 	    ;;
-           *)
+-	    ;;
+-          *)
 -	    # 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; }
 -if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then
-+	    # putprpwnam was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsecurity" >&5
-+$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_putprpwnam+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether there is DOS flags support in the stat struct" >&5
++$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
++if test "${samba_cv_stat_dos_flags+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
+-  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lsec  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lsecurity  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
  
- /* Override any GCC internal prototype to avoid an error.
-@@ -49315,66 +16302,39 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char getprpwnam ();
-+char putprpwnam ();
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/stat.h>
  int
  main ()
  {
 -return getprpwnam ();
-+return putprpwnam ();
++
++		int a = UF_DOS_ARCHIVE;
++		int h = UF_DOS_HIDDEN;
++		int r = UF_DOS_RO;
++		int s = UF_DOS_SYSTEM;
++		int i = UF_DOS_NOINDEX;
++		int f = UF_DOS_FLAGS;
++
    ;
    return 0;
  }
@@ -55609,68 +55418,80 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_sec_getprpwnam=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_putprpwnam=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_stat_dos_flags=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_sec_getprpwnam=no
-+  ac_cv_lib_security_putprpwnam=no
++  samba_cv_stat_dos_flags=no
  fi
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+-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
-+{ $as_echo "$as_me:${as_lineno-$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 :
- 
+-
 -		LIBS="-lsec $LIBS"
-+		LIBS="-lsecurity $LIBS"
- 
- 
+-
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETPRPWNAM 1
 -_ACEOF
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
- 
- 
- 
- else
- 
- 
+-
+-
+-
+-else
+-
+-
 -			# getprpwnam was not found in libsec
-+			# putprpwnam was not found in libsecurity
- 			# nothing to do here by default
- 			true
+-			# nothing to do here by default
+-			true
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_stat_dos_flags" >&5
++$as_echo "$samba_cv_stat_dos_flags" >&6; }
  
-@@ -49389,233 +16349,43 @@
+-fi
++if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
  
+-	  ;;
+-        esac
++$as_echo "#define HAVE_STAT_DOS_FLAGS 1" >>confdefs.h
  
+ fi
+-done
  
 -
+-
+-
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++#####################################
++# needed for SRV lookups
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
++$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -55687,13 +55508,13 @@
 -#endif
 -
 -#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -49421,85 +16129,43 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -55702,14 +55523,16 @@
 -choke me
 -#endif
 -
--int
--main ()
--{
++char dn_expand ();
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++return dn_expand ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -55732,17 +55555,23 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_resolv_dn_expand=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
++  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
--fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -55750,20 +55579,20 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+  for ac_func in putprpwnam
-+do :
-+  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-+if test "x$ac_cv_func_putprpwnam" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$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 :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_PUTPRPWNAM 1
++#define HAVE_LIBRESOLV 1
  _ACEOF
  
 -fi
 -done
--
-+        # putprpwnam was found in libc or existing $LIBS
++  LIBS="-lresolv $LIBS"
  
++fi
+ 
 -############################################
 -# Check if we have libattr
 -case "$host_os" in
@@ -55771,31 +55600,38 @@
 -	{ $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
 -$as_echo_n "checking for library containing getproplist... " >&6; }
 -if test "${ac_cv_search_getproplist+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dn_expand in -lresolv" >&5
++$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_func_search_save_LIBS=$LIBS
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+@@ -49508,108 +16174,44 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char getproplist ();
--int
--main ()
--{
++char _dn_expand ();
+ int
+ main ()
+ {
 -return getproplist ();
--  ;
--  return 0;
--}
--_ACEOF
++return _dn_expand ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -for ac_lib in '' proplist; do
 -  if test -z "$ac_lib"; then
 -    ac_res="none required"
@@ -55828,11 +55664,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
- 
- 
+-
+-
 -fi
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext
@@ -55842,42 +55677,47 @@
 -done
 -if test "${ac_cv_search_getproplist+set}" = set; then
 -  :
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_resolv__dn_expand=yes
  else
 -  ac_cv_search_getproplist=no
 -fi
 -rm conftest.$ac_ext
 -LIBS=$ac_func_search_save_LIBS
--fi
++  ac_cv_lib_resolv__dn_expand=no
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
 -$as_echo "$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"
 -
--fi
--
--
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$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 :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBRESOLV 1
++_ACEOF
  
-+        # putprpwnam was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
++  LIBS="-lresolv $LIBS"
  
-+		    # putprpwnam was not found and we already had libsec
-+		    # nothing to do here by default
-+		    true
++fi
  
+-
+-
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+	    ;;
-+          *)
-+	    # putprpwnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
-+$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
++$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -55886,7 +55726,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $LIBS"
++LIBS="-lresolv  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
@@ -55908,7 +55748,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49623,204 +16393,91 @@
+@@ -49617,103 +16219,80 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55920,12 +55760,12 @@
 -choke me
 -#endif
 -
-+char putprpwnam ();
++char __dn_expand ();
  int
  main ()
  {
 -return $ac_func ();
-+return putprpwnam ();
++return __dn_expand ();
    ;
    return 0;
  }
@@ -55953,13 +55793,13 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_putprpwnam=yes
++  ac_cv_lib_resolv___dn_expand=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_sec_putprpwnam=no
++  ac_cv_lib_resolv___dn_expand=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -55976,18 +55816,38 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$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 :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$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 :
++#define HAVE_LIBRESOLV 1
+ _ACEOF
  
--fi
++  LIBS="-lresolv $LIBS"
++
+ fi
 -done
-+		LIBS="-lsec $LIBS"
  
  
++#
++# Check for the functions putprpwnam, set_auth_parameters,
++# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
++# Needed for OSF1 and HPUX.
++#
++
++
++  for ac_func in putprpwnam
++do :
++  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
++if test "x$ac_cv_func_putprpwnam" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_PUTPRPWNAM 1
++_ACEOF
++
++        # putprpwnam was found in libc or existing $LIBS
++
++
 +$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
  
@@ -56009,26 +55869,44 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++        # putprpwnam was not found, try adding libsecurity
++	case " $LIBS " in
++          *\ -lsecurity\ *)
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++		    # putprpwnam was not found and we already had libsecurity
++		    # nothing to do here by default
++		    true
+ 
 -#undef $ac_func
++	    ;;
++          *)
++	    # putprpwnam was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsecurity" >&5
++$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_putprpwnam+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsecurity  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -49721,183 +16300,89 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -56036,15 +55914,17 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
- 
--int
--main ()
--{
+-
++char putprpwnam ();
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++return putprpwnam ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -56067,23 +55947,22 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_security_putprpwnam=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+			# putprpwnam was not found in libsec
-+			# nothing to do here by default
-+			true
-+
- 
+-
 -	eval "$as_ac_var=no"
++  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
-+	  ;;
-+        esac
-+
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -56092,27 +55971,20 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+done
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
++		LIBS="-lsecurity $LIBS"
 +
 +
-+
-+  for ac_func in set_auth_parameters
-+do :
-+  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
-+if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SET_AUTH_PARAMETERS 1
- _ACEOF
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
 -fi
 -done
-+        # set_auth_parameters was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-+
  
  
 -for ac_func in sizeof_proplist_entry
@@ -56137,39 +56009,24 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # set_auth_parameters was not found, try adding libsecurity
-+	case " $LIBS " in
-+          *\ -lsecurity\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # set_auth_parameters was not found and we already had libsecurity
-+		    # nothing to do here by default
-+		    true
++			# putprpwnam was not found in libsecurity
++			# nothing to do here by default
++			true
  
 -#undef $ac_func
-+	    ;;
-+          *)
-+	    # set_auth_parameters was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
-+$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -49828,82 +16485,89 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -56177,17 +56034,16 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
-+char set_auth_parameters ();
- int
- main ()
- {
++fi
+ 
+-int
+-main ()
+-{
 -return $ac_func ();
-+return set_auth_parameters ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -56210,46 +56066,20 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_set_auth_parameters=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_security_set_auth_parameters=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
-+
-+		LIBS="-lsecurity $LIBS"
-+
-+
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
-+			# set_auth_parameters was not found in libsecurity
-+			# nothing to do here by default
-+			true
-+
++	  ;;
++        esac
  
 -	eval "$as_ac_var=no"
  fi
++done
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+	  ;;
-+        esac
-+
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -56257,22 +56087,20 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+done
 +
 +
-+
-+  for ac_func in set_auth_parameters
++  for ac_func in putprpwnam
 +do :
-+  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
-+if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
++if test "x$ac_cv_func_putprpwnam" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SET_AUTH_PARAMETERS 1
++#define HAVE_PUTPRPWNAM 1
  _ACEOF
  
 -fi
 -done
-+        # set_auth_parameters was found in libc or existing $LIBS
++        # putprpwnam was found in libc or existing $LIBS
  
 -  ;;
 -  *)
@@ -56280,26 +56108,26 @@
 -$as_echo_n "checking for library containing getxattr... " >&6; }
 -if test "${ac_cv_search_getxattr+set}" = set; then
 +
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
 +
 +
 +
 +else
 +
-+        # set_auth_parameters was not found, try adding libsec
++        # putprpwnam was not found, try adding libsec
 +	case " $LIBS " in
 +          *\ -lsec\ *)
 +
-+		    # set_auth_parameters was not found and we already had libsec
++		    # putprpwnam was not found and we already had libsec
 +		    # nothing to do here by default
 +		    true
 +
 +	    ;;
 +          *)
-+	    # set_auth_parameters was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsec" >&5
-+$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then :
++	    # putprpwnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
++$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_func_search_save_LIBS=$LIBS
@@ -56314,17 +56142,17 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49912,109 +16576,92 @@
+@@ -49906,109 +16391,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char getxattr ();
-+char set_auth_parameters ();
++char putprpwnam ();
  int
  main ()
  {
 -return getxattr ();
-+return set_auth_parameters ();
++return putprpwnam ();
    ;
    return 0;
  }
@@ -56359,24 +56187,24 @@
 -       }; then
 -  ac_cv_search_getxattr=$ac_res
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_set_auth_parameters=yes
++  ac_cv_lib_sec_putprpwnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_sec_set_auth_parameters=no
++  ac_cv_lib_sec_putprpwnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
 +		LIBS="-lsec $LIBS"
 +
 +
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
  
 -fi
@@ -56397,7 +56225,7 @@
 -LIBS=$ac_func_search_save_LIBS
 +
 +
-+			# set_auth_parameters was not found in libsec
++			# putprpwnam was not found in libsec
 +			# nothing to do here by default
 +			true
 +
@@ -56416,24 +56244,23 @@
 +done
 +
 +
- 
-+# UnixWare 7.x has its getspnam in -lgen
 +
-+  for ac_func in getspnam
++
++  for ac_func in set_auth_parameters
 +do :
-+  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
-+if test "x$ac_cv_func_getspnam" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
++if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETSPNAM 1
++#define HAVE_SET_AUTH_PARAMETERS 1
 +_ACEOF
  
-+        # getspnam was found in libc or existing $LIBS
++        # set_auth_parameters was found in libc or existing $LIBS
  
  
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
-+
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
  
  
+ 
 -for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56456,36 +56283,36 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # getspnam was not found, try adding libgen
++        # set_auth_parameters was not found, try adding libsecurity
 +	case " $LIBS " in
-+          *\ -lgen\ *)
++          *\ -lsecurity\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getspnam was not found and we already had libgen
++		    # set_auth_parameters was not found and we already had libsecurity
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # getspnam was not found, try adding libgen
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5
-+$as_echo_n "checking for getspnam in -lgen... " >&6; }
-+if test "${ac_cv_lib_gen_getspnam+set}" = set; then :
++	    # set_auth_parameters was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
++$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgen  $LIBS"
++LIBS="-lsecurity  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50022,65 +16669,47 @@
+@@ -50016,105 +16483,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56497,12 +56324,12 @@
 -choke me
 -#endif
 -
-+char getspnam ();
++char set_auth_parameters ();
  int
  main ()
  {
 -return $ac_func ();
-+return getspnam ();
++return set_auth_parameters ();
    ;
    return 0;
  }
@@ -56530,33 +56357,33 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_gen_getspnam=yes
++  ac_cv_lib_security_set_auth_parameters=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_gen_getspnam=no
++  ac_cv_lib_security_set_auth_parameters=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
  fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
-+		LIBS="-lgen $LIBS"
++		LIBS="-lsecurity $LIBS"
 +
 +
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
 +
 +
 +
 +else
 +
 +
-+			# getspnam was not found in libgen
++			# set_auth_parameters was not found in libsecurity
 +			# nothing to do here by default
 +			true
 +
@@ -56581,25 +56408,24 @@
  
  fi
  done
-@@ -50088,39 +16717,43 @@
  
  
  
-+  for ac_func in getspnam
++  for ac_func in set_auth_parameters
 +do :
-+  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
-+if test "x$ac_cv_func_getspnam" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
++if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETSPNAM 1
++#define HAVE_SET_AUTH_PARAMETERS 1
 +_ACEOF
 +
-+        # getspnam was found in libc or existing $LIBS
++        # set_auth_parameters was found in libc or existing $LIBS
 +
-+
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
  
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
  
  
+ 
 -for ac_func in getea fgetea lgetea listea flistea llistea
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56622,36 +56448,36 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # getspnam was not found, try adding libsecurity
++        # set_auth_parameters was not found, try adding libsec
 +	case " $LIBS " in
-+          *\ -lsecurity\ *)
++          *\ -lsec\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getspnam was not found and we already had libsecurity
++		    # set_auth_parameters was not found and we already had libsec
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # getspnam was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsecurity" >&5
-+$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_getspnam+set}" = set; then :
++	    # set_auth_parameters was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsec" >&5
++$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity  $LIBS"
++LIBS="-lsec  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50128,105 +16761,90 @@
+@@ -50122,105 +16574,92 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56663,12 +56489,12 @@
 -choke me
 -#endif
 -
-+char getspnam ();
++char set_auth_parameters ();
  int
  main ()
  {
 -return $ac_func ();
-+return getspnam ();
++return set_auth_parameters ();
    ;
    return 0;
  }
@@ -56696,33 +56522,33 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_getspnam=yes
++  ac_cv_lib_sec_set_auth_parameters=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_security_getspnam=no
++  ac_cv_lib_sec_set_auth_parameters=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
  fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
-+		LIBS="-lsecurity $LIBS"
++		LIBS="-lsec $LIBS"
 +
 +
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
 +
 +
 +
 +else
 +
 +
-+			# getspnam was not found in libsecurity
++			# set_auth_parameters was not found in libsec
 +			# nothing to do here by default
 +			true
 +
@@ -56750,6 +56576,8 @@
  
  
  
++# UnixWare 7.x has its getspnam in -lgen
++
 +  for ac_func in getspnam
 +do :
 +  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
@@ -56757,10 +56585,10 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETSPNAM 1
 +_ACEOF
- 
++
 +        # getspnam was found in libc or existing $LIBS
 +
-+
+ 
 +$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
  
  
@@ -56787,36 +56615,36 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # getspnam was not found, try adding libsec
++        # getspnam was not found, try adding libgen
 +	case " $LIBS " in
-+          *\ -lsec\ *)
++          *\ -lgen\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getspnam was not found and we already had libsec
++		    # getspnam was not found and we already had libgen
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # getspnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
-+$as_echo_n "checking for getspnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
++	    # getspnam was not found, try adding libgen
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5
++$as_echo_n "checking for getspnam in -lgen... " >&6; }
++if test "${ac_cv_lib_gen_getspnam+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $LIBS"
++LIBS="-lgen  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50234,103 +16852,91 @@
+@@ -50228,103 +16667,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56861,21 +56689,21 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_getspnam=yes
++  ac_cv_lib_gen_getspnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_sec_getspnam=no
++  ac_cv_lib_gen_getspnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
-+		LIBS="-lsec $LIBS"
++		LIBS="-lgen $LIBS"
 +
 +
 +$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
@@ -56885,7 +56713,7 @@
 +else
 +
 +
-+			# getspnam was not found in libsec
++			# getspnam was not found in libgen
 +			# nothing to do here by default
 +			true
 +
@@ -56912,21 +56740,21 @@
 +
 +
 +
-+  for ac_func in bigcrypt
++  for ac_func in getspnam
 +do :
-+  ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
-+if test "x$ac_cv_func_bigcrypt" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
++if test "x$ac_cv_func_getspnam" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIGCRYPT 1
++#define HAVE_GETSPNAM 1
  _ACEOF
  
 -fi
 -done
-+        # bigcrypt was found in libc or existing $LIBS
++        # getspnam was found in libc or existing $LIBS
  
  
-+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
  
  
  
@@ -56952,7 +56780,7 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # bigcrypt was not found, try adding libsecurity
++        # getspnam was not found, try adding libsecurity
 +	case " $LIBS " in
 +          *\ -lsecurity\ *)
  
@@ -56961,17 +56789,17 @@
 -#else
 -# include <assert.h>
 -#endif
-+		    # bigcrypt was not found and we already had libsecurity
++		    # getspnam was not found and we already had libsecurity
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # bigcrypt was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsecurity" >&5
-+$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_bigcrypt+set}" = set; then :
++	    # getspnam was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsecurity" >&5
++$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_getspnam+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
@@ -56981,7 +56809,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50338,102 +16944,90 @@
+@@ -50332,102 +16759,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56993,12 +56821,12 @@
 -choke me
 -#endif
 -
-+char bigcrypt ();
++char getspnam ();
  int
  main ()
  {
 -return $ac_func ();
-+return bigcrypt ();
++return getspnam ();
    ;
    return 0;
  }
@@ -57026,31 +56854,31 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_bigcrypt=yes
++  ac_cv_lib_security_getspnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_security_bigcrypt=no
++  ac_cv_lib_security_getspnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
 +		LIBS="-lsecurity $LIBS"
 +
 +
-+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
 +
 +
 +
 +else
 +
 +
-+			# bigcrypt was not found in libsecurity
++			# getspnam was not found in libsecurity
 +			# nothing to do here by default
 +			true
 +
@@ -57076,22 +56904,22 @@
 +
 +
 +
-+  for ac_func in bigcrypt
++  for ac_func in getspnam
 +do :
-+  ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
-+if test "x$ac_cv_func_bigcrypt" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
++if test "x$ac_cv_func_getspnam" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIGCRYPT 1
++#define HAVE_GETSPNAM 1
  _ACEOF
  
 -fi
 -done
-+        # bigcrypt was found in libc or existing $LIBS
-+
++        # getspnam was found in libc or existing $LIBS
  
-+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
  
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++
  
  
 -for ac_func in setxattr lsetxattr fsetxattr
@@ -57116,7 +56944,7 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # bigcrypt was not found, try adding libsec
++        # getspnam was not found, try adding libsec
 +	case " $LIBS " in
 +          *\ -lsec\ *)
  
@@ -57125,17 +56953,17 @@
 -#else
 -# include <assert.h>
 -#endif
-+		    # bigcrypt was not found and we already had libsec
++		    # getspnam was not found and we already had libsec
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # bigcrypt was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsec" >&5
-+$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then :
++	    # getspnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
++$as_echo_n "checking for getspnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
@@ -57145,7 +56973,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50441,207 +17035,91 @@
+@@ -50435,103 +16850,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57157,12 +56985,12 @@
 -choke me
 -#endif
 -
-+char bigcrypt ();
++char getspnam ();
  int
  main ()
  {
 -return $ac_func ();
-+return bigcrypt ();
++return getspnam ();
    ;
    return 0;
  }
@@ -57190,21 +57018,44 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_bigcrypt=yes
++  ac_cv_lib_sec_getspnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_lib_sec_getspnam=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$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 :
++
++		LIBS="-lsec $LIBS"
++
++
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++
++
++
++else
++
++
++			# getspnam was not found in libsec
++			# nothing to do here by default
++			true
++
+ 
 -	eval "$as_ac_var=no"
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
++	  ;;
++        esac
++
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -57213,21 +57064,38 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++done
++
++
++
++
++  for ac_func in bigcrypt
++do :
++  ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
++if test "x$ac_cv_func_bigcrypt" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$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 :
++#define HAVE_BIGCRYPT 1
+ _ACEOF
  
 -fi
 -done
-+		LIBS="-lsec $LIBS"
++        # bigcrypt was found in libc or existing $LIBS
++
++
++$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++
  
  
-+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++else
  
++        # bigcrypt was not found, try adding libsecurity
++	case " $LIBS " in
++          *\ -lsecurity\ *)
  
++		    # bigcrypt was not found and we already had libsecurity
++		    # nothing to do here by default
++		    true
  
 -for ac_func in attr_get attr_list attr_set attr_remove
 -do
@@ -57235,40 +57103,46 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
++	    ;;
++          *)
++	    # bigcrypt was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsecurity" >&5
++$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_bigcrypt+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsecurity  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+			# bigcrypt was not found in libsec
-+			# nothing to do here by default
-+			true
- 
+-
 -#undef $ac_func
  
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -50539,103 +16942,90 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -57276,16 +57150,17 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
- 
--int
--main ()
--{
+-
++char bigcrypt ();
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++return bigcrypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -57308,20 +57183,46 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_security_bigcrypt=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	  ;;
-+        esac
++  ac_cv_lib_security_bigcrypt=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$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 :
++
++		LIBS="-lsecurity $LIBS"
++
++
++$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++
++
++
++else
++
++
++			# bigcrypt was not found in libsecurity
++			# nothing to do here by default
++			true
++
  
 -	eval "$as_ac_var=no"
  fi
-+done
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++	  ;;
++        esac
++
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -57329,24 +57230,25 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++done
 +
 +
 +
-+  for ac_func in getprpwnam
++  for ac_func in bigcrypt
 +do :
-+  ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
-+if test "x$ac_cv_func_getprpwnam" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
++if test "x$ac_cv_func_bigcrypt" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETPRPWNAM 1
++#define HAVE_BIGCRYPT 1
  _ACEOF
  
 -fi
 -done
-+        # getprpwnam was found in libc or existing $LIBS
++        # bigcrypt was found in libc or existing $LIBS
  
  
-+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
++$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
  
  
  
@@ -57372,36 +57274,36 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # getprpwnam was not found, try adding libsecurity
++        # bigcrypt was not found, try adding libsec
 +	case " $LIBS " in
-+          *\ -lsecurity\ *)
++          *\ -lsec\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getprpwnam was not found and we already had libsecurity
++		    # bigcrypt was not found and we already had libsec
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # getprpwnam was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsecurity" >&5
-+$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_getprpwnam+set}" = set; then :
++	    # bigcrypt was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsec" >&5
++$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity  $LIBS"
++LIBS="-lsec  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50649,107 +17127,90 @@
+@@ -50643,107 +17033,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57413,12 +57315,12 @@
 -choke me
 -#endif
 -
-+char getprpwnam ();
++char bigcrypt ();
  int
  main ()
  {
 -return $ac_func ();
-+return getprpwnam ();
++return bigcrypt ();
    ;
    return 0;
  }
@@ -57446,31 +57348,31 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_getprpwnam=yes
++  ac_cv_lib_sec_bigcrypt=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_security_getprpwnam=no
++  ac_cv_lib_sec_bigcrypt=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
 +
-+		LIBS="-lsecurity $LIBS"
++		LIBS="-lsec $LIBS"
 +
 +
-+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
++$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
 +
 +
 +
 +else
 +
 +
-+			# getprpwnam was not found in libsecurity
++			# bigcrypt was not found in libsec
 +			# nothing to do here by default
 +			true
 +
@@ -57496,6 +57398,7 @@
 +
 +
 +
++
 +  for ac_func in getprpwnam
 +do :
 +  ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
@@ -57542,36 +57445,36 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # getprpwnam was not found, try adding libsec
++        # getprpwnam was not found, try adding libsecurity
 +	case " $LIBS " in
-+          *\ -lsec\ *)
++          *\ -lsecurity\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getprpwnam was not found and we already had libsec
++		    # getprpwnam was not found and we already had libsecurity
 +		    # nothing to do here by default
 +		    true
  
 -#undef $ac_func
 +	    ;;
 +          *)
-+	    # getprpwnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsec" >&5
-+$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then :
++	    # getprpwnam was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsecurity" >&5
++$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_getprpwnam+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $LIBS"
++LIBS="-lsecurity  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50757,190 +17218,77 @@
+@@ -50751,190 +17125,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57616,7 +57519,7 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_getprpwnam=yes
++  ac_cv_lib_security_getprpwnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -57627,7 +57530,7 @@
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+  ac_cv_lib_sec_getprpwnam=no
++  ac_cv_lib_security_getprpwnam=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -57648,9 +57551,9 @@
 -
 -  ;;
 -esac
-+{ $as_echo "$as_me:${as_lineno-$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 :
++{ $as_echo "$as_me:${as_lineno-$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 :
  
 -########################################################
 -# Do xattr functions take additional options like on Darwin?
@@ -57660,7 +57563,7 @@
 -if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+		LIBS="-lsec $LIBS"
++		LIBS="-lsecurity $LIBS"
  
 -		old_LIBS=$LIBS
 -		LIBS="$LIBS $ACL_LIBS"
@@ -57716,7 +57619,7 @@
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+			# getprpwnam was not found in libsec
++			# getprpwnam was not found in libsecurity
 +			# nothing to do here by default
 +			true
 +
@@ -57742,23 +57645,186 @@
  
 -cat >>confdefs.h <<\_ACEOF
 -#define BROKEN_EXTATTR 1
--_ACEOF
++
++  for ac_func in getprpwnam
++do :
++  ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
++if test "x$ac_cv_func_getprpwnam" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETPRPWNAM 1
+ _ACEOF
  
 -    ;;
 -  *)
++        # getprpwnam was found in libc or existing $LIBS
++
++
++$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
+ 
+ 
+ 
+-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; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++        # getprpwnam was not found, try adding libsec
++	case " $LIBS " in
++          *\ -lsec\ *)
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++		    # getprpwnam was not found and we already had libsec
++		    # nothing to do here by default
++		    true
+ 
+-#undef $ac_func
++	    ;;
++          *)
++	    # getprpwnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsec" >&5
++$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsec  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -50942,102 +17216,77 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
++char getprpwnam ();
+ int
+ main ()
+ {
+-return $ac_func ();
++return getprpwnam ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_sec_getprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_sec_getprpwnam=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$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 :
++
++		LIBS="-lsec $LIBS"
++
++
++$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
++
++
++
++else
++
++
++			# getprpwnam was not found in libsec
++			# nothing to do here by default
++			true
++
+ 
+-	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
++	  ;;
++        esac
++
+ 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
++done
++
++
++
 +for ac_func in strsignal
 +do :
 +  ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
 +if test "x$ac_cv_func_strsignal" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_STRSIGNAL 1
-+_ACEOF
+ _ACEOF
  
-+fi
-+done
+ fi
+ done
  
  
--for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
+-
+-
+-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
@@ -57800,7 +57866,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50948,62 +17296,53 @@
+@@ -51045,62 +17294,53 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57899,7 +57965,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51011,39 +17350,40 @@
+@@ -51108,39 +17348,40 @@
  fi
  done
  
@@ -57927,7 +57993,7 @@
 +fi
 +done
  
--for ac_func in extattr_get_fd extattr_get_file extattr_get_link
+-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
@@ -57967,7 +58033,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -51051,62 +17391,53 @@
+@@ -51148,62 +17389,118 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58011,9 +58077,6 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 +for ac_lib in '' attr; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -58031,89 +58094,37 @@
 +fi
 +done
 +if test "${ac_cv_search_getxattr+set}" = set; then :
- 
--	eval "$as_ac_var=no"
-+else
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_search_getxattr=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getxattr" >&5
 +$as_echo "$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"
- 
--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
 +
++fi
++
 +	for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 +eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -51114,102 +17445,64 @@
- fi
- done
- 
--
--
--
--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; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+	for ac_func in getea fgetea lgetea listea flistea llistea
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++_ACEOF
++
 +fi
 +done
- 
--#undef $ac_func
-+	for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
++
++	for ac_func in getea fgetea lgetea listea flistea llistea
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -58122,31 +58133,11 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++
 +fi
 +done
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
-+	for ac_func in flistxattr removexattr lremovexattr fremovexattr
++
++	for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -58154,38 +58145,13 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++_ACEOF
  
 -	eval "$as_ac_var=no"
  fi
 +done
 +
-+	for ac_func in setxattr lsetxattr fsetxattr
++	for ac_func in flistxattr removexattr lremovexattr fremovexattr
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -58208,6 +58174,19 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
++	for ac_func in setxattr lsetxattr fsetxattr
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
 +	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`
@@ -58217,7 +58196,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51217,102 +17510,141 @@
+@@ -51211,102 +17508,141 @@
  fi
  done
  
@@ -58361,12 +58340,16 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $smb_attr_cv_xattr_add_opt" >&5
 +$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
 +	if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
-+
+ 
+-	eval "$as_ac_var=no"
 +$as_echo "#define XATTR_ADD_OPT 1" >>confdefs.h
 +
 +	fi
-+fi
-+
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +# Check if we have extattr
 +case "$host_os" in
 +  *freebsd4* | *dragonfly* )
@@ -58384,9 +58367,15 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
--	eval "$as_ac_var=no"
++
  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
 +done
 +
 +    for ac_func in extattr_get_fd extattr_get_file extattr_get_link
@@ -58398,18 +58387,8 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
--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
++
++fi
 +done
 +
 +    for ac_func in extattr_list_fd extattr_list_file extattr_list_link
@@ -58434,7 +58413,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51324,7 +17656,7 @@
+@@ -51318,7 +17654,7 @@
  esac
  
  # Check whether --enable-static was given.
@@ -58443,7 +58422,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
  case $enableval in
  yes) enable_static=yes ;;
-@@ -51346,7 +17678,7 @@
+@@ -51340,7 +17676,7 @@
  fi
  
  # Check whether --enable-shared was given.
@@ -58452,7 +58431,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
  case $enableval in
  yes) enable_shared=yes ;;
-@@ -51373,16 +17705,16 @@
+@@ -51367,16 +17703,16 @@
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
  # Check whether --enable-pie was given.
@@ -58472,7 +58451,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51391,11 +17723,11 @@
+@@ -51385,11 +17721,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -58487,7 +58466,7 @@
  		then
  			samba_cv_fpie=yes
  		else
-@@ -51404,7 +17736,7 @@
+@@ -51398,7 +17734,7 @@
  		rm -f conftest*
  
  fi
@@ -58496,7 +58475,7 @@
  $as_echo "$samba_cv_fpie" >&6; }
  	if test x"${samba_cv_fpie}" = x"yes"
  	then
-@@ -51416,16 +17748,16 @@
+@@ -51410,16 +17746,16 @@
  # Set defaults
  RELRO_LDFLAGS=""
  # Check whether --enable-relro was given.
@@ -58516,7 +58495,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51434,11 +17766,11 @@
+@@ -51428,11 +17764,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58531,7 +58510,7 @@
  		then
  			samba_cv_relro=yes
  		else
-@@ -51447,7 +17779,7 @@
+@@ -51441,7 +17777,7 @@
  		rm -f conftest*
  
  fi
@@ -58540,7 +58519,7 @@
  $as_echo "$samba_cv_relro" >&6; }
  	if test x"${samba_cv_relro}" = x"yes"
  	then
-@@ -51476,7 +17808,7 @@
+@@ -51470,7 +17806,7 @@
  # You need to specify how to create a shared library and
    # how to compile C code to produce PIC object files
  
@@ -58549,7 +58528,7 @@
  $as_echo_n "checking ability to build shared libraries... " >&6; }
  
    # and these are for particular systems
-@@ -51484,14 +17816,10 @@
+@@ -51478,14 +17814,10 @@
  		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
  			case "$host_os" in
  				*linux*)
@@ -58566,7 +58545,7 @@
   ;;
  			esac
  			BLDSHARED="true"
-@@ -51502,15 +17830,11 @@
+@@ -51496,15 +17828,11 @@
  			DYNEXP="-Wl,--export-dynamic"
  			PICFLAG="-fPIC"
  			SONAMEFLAG="-Wl,-soname="
@@ -58584,7 +58563,7 @@
  
  			BLDSHARED="true"
  			LDSHFLAGS="-G"
-@@ -51528,33 +17852,23 @@
+@@ -51522,33 +17850,23 @@
  				LDSHFLAGS="-G \${CFLAGS}"
  			fi
  
@@ -58623,7 +58602,7 @@
  
  			;;
  		*netbsd* | *freebsd* | *dragonfly* )
-@@ -51564,14 +17878,10 @@
+@@ -51558,14 +17876,10 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC -DPIC"
  
@@ -58640,7 +58619,7 @@
  
  			;;
  		*openbsd*)  BLDSHARED="true"
-@@ -51580,26 +17890,18 @@
+@@ -51574,26 +17888,18 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
  
@@ -58671,7 +58650,7 @@
  
  			;;
  			esac
-@@ -51613,15 +17915,11 @@
+@@ -51607,15 +17913,11 @@
  				PICFLAG="-KPIC"
  			fi
  
@@ -58689,7 +58668,7 @@
  
  			BLDSHARED="true"
  			# use expfull to export underscored symbols
-@@ -51637,25 +17935,17 @@
+@@ -51631,25 +17933,17 @@
  			fi
  
  
@@ -58719,7 +58698,7 @@
  
  			# Use special PIC flags for the native HP-UX compiler.
  				BLDSHARED="true"
-@@ -51677,74 +17967,52 @@
+@@ -51671,74 +17965,52 @@
  				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
  			fi
  
@@ -58807,7 +58786,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ROFF"; then
-@@ -51755,91 +18023,71 @@
+@@ -51749,91 +18021,71 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -58914,7 +58893,7 @@
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -51853,16 +18101,12 @@
+@@ -51847,16 +18099,12 @@
                          # actually support the PIE stuff.
                          PIE_LDFLAGS=
                          PIE_CFLAGS=
@@ -58933,7 +58912,7 @@
  
  			;;
    esac
-@@ -51879,19 +18123,15 @@
+@@ -51873,19 +18121,15 @@
  	LDFLAGS="$LDFLAGS -L./bin"
  fi
  
@@ -58956,7 +58935,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -51902,42 +18142,17 @@
+@@ -51896,42 +18140,17 @@
    return 0;
  }
  _ACEOF
@@ -59004,7 +58983,7 @@
  	LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
  	test x"$ld_as_needed_flag_found" = xyes && break
  done
-@@ -51950,14 +18165,10 @@
+@@ -51944,14 +18163,10 @@
  
  for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
  	saved_ldflags="$LDFLAGS"
@@ -59021,7 +59000,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -51968,94 +18179,69 @@
+@@ -51962,94 +18177,69 @@
    return 0;
  }
  _ACEOF
@@ -59141,7 +59120,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -52071,7 +18257,7 @@
+@@ -52065,7 +18255,7 @@
  
  
  fi
@@ -59150,7 +59129,7 @@
  $as_echo "$ac_cv_shlib_works" >&6; }
  if test $ac_cv_shlib_works = no; then
     BLDSHARED=false
-@@ -52088,9 +18274,9 @@
+@@ -52082,9 +18272,9 @@
  	merged_build_possible=no
  fi
  
@@ -59162,7 +59141,7 @@
  $as_echo "$PICFLAG" >&6; }
  
  
-@@ -52162,10 +18348,10 @@
+@@ -52156,10 +18346,10 @@
  USESHARED=false
  
  
@@ -59175,7 +59154,7 @@
    enableval=$enable_shared_libs; enable_shared_libs=$enableval
  else
    enable_shared_libs=yes
-@@ -52176,11 +18362,11 @@
+@@ -52170,11 +18360,11 @@
  	USESHARED=$BLDSHARED
  fi
  
@@ -59189,7 +59168,7 @@
  $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
  fi
  
-@@ -52208,14 +18394,13 @@
+@@ -52202,14 +18392,13 @@
  
  
  # Check whether --with-static-libs was given.
@@ -59206,7 +59185,7 @@
  fi
  
  
-@@ -52237,7 +18422,7 @@
+@@ -52231,7 +18420,7 @@
  #  be extracted from their respective source directories
  #
  # Check whether --enable-external_libtalloc was given.
@@ -59215,7 +59194,7 @@
    enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -52252,9 +18437,9 @@
+@@ -52246,9 +18435,9 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -59227,7 +59206,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -52267,14 +18452,14 @@
+@@ -52261,14 +18450,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59245,7 +59224,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52282,10 +18467,10 @@
+@@ -52276,10 +18465,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -59258,7 +59237,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52295,9 +18480,9 @@
+@@ -52289,9 +18478,9 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -59270,7 +59249,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -52310,14 +18495,14 @@
+@@ -52304,14 +18493,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59288,7 +59267,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52325,10 +18510,10 @@
+@@ -52319,10 +18508,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -59301,7 +59280,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52337,7 +18522,7 @@
+@@ -52331,7 +18520,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -59310,7 +59289,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -52350,13 +18535,13 @@
+@@ -52344,13 +18533,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -59327,7 +59306,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -52364,7 +18549,7 @@
+@@ -52358,7 +18547,7 @@
  fi
  
  pkg_failed=no
@@ -59336,7 +59315,7 @@
  $as_echo_n "checking for LIBTALLOC... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -52372,11 +18557,11 @@
+@@ -52366,11 +18555,11 @@
          pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -59351,7 +59330,7 @@
    pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -52390,11 +18575,11 @@
+@@ -52384,11 +18573,11 @@
          pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -59366,7 +59345,7 @@
    pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -52421,768 +18606,112 @@
+@@ -52415,21 +18604,17 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBTALLOC_PKG_ERRORS" >&5
  
@@ -59377,12 +59356,13 @@
 -			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
 -$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
 -   { (exit 1); exit 1; }; }
--		  else
--			enable_external_libtalloc=no
--		  fi
--
--elif test $pkg_failed = untried; then
--	if test x$enable_external_libtalloc = xyes; then
++			as_fn_error "Unable to find libtalloc" "$LINENO" 5
+ 		  else
+ 			enable_external_libtalloc=no
+ 		  fi
+ 
+ elif test $pkg_failed = untried; then
+ 	if test x$enable_external_libtalloc = xyes; then
 -			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
 -$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
 -   { (exit 1); exit 1; }; }
@@ -59390,22 +59370,19 @@
  		  else
  			enable_external_libtalloc=no
  		  fi
- 
--else
--	LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
--	LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
+@@ -52437,7 +18622,7 @@
+ else
+ 	LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
+ 	LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
 -        { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--	 enable_external_libtalloc=yes
--fi
--fi
--
--if test "x$enable_external_libtalloc" = xno
--then
--	tallocdir=""
--tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
--for d in $tallocpaths; do
--	if test -f "$srcdir/$d/talloc.c"; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	 enable_external_libtalloc=yes
+ fi
+@@ -52449,734 +18634,82 @@
+ tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
+ for d in $tallocpaths; do
+ 	if test -f "$srcdir/$d/talloc.c"; then
 -		tallocdir="$d"
 -
 -		break;
@@ -59844,13 +59821,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
 -test_array [0] = 0
-+elif test $pkg_failed = untried; then
-+	if test x$enable_external_libtalloc = xyes; then
-+			as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+		  else
-+			enable_external_libtalloc=no
-+		  fi
- 
+-
 -  ;
 -  return 0;
 -}
@@ -59874,29 +59845,16 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid; break
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
-+	LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	 enable_external_libtalloc=yes
-+fi
-+fi
- 
+-
 -	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`
-+if test "x$enable_external_libtalloc" = xno
-+then
-+	tallocdir=""
-+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
-+for d in $tallocpaths; do
-+	if test -f "$srcdir/$d/talloc.c"; then
 +		tallocdir="$d"
 +
 +		break;
@@ -60206,7 +60164,7 @@
  $as_echo "$ac_cv_sizeof_void_p" >&6; }
  
  
-@@ -53194,17 +18723,15 @@
+@@ -53188,17 +18721,15 @@
  
  
  if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
@@ -60229,7 +60187,7 @@
  fi
  
  if test x"$VERSIONSCRIPT" != "x"; then
-@@ -53239,16 +18766,16 @@
+@@ -53233,16 +18764,16 @@
  
  
  
@@ -60249,7 +60207,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53274,7 +18801,7 @@
+@@ -53268,7 +18799,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
  		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -60258,7 +60216,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
  			enable_static=yes
-@@ -53287,12 +18814,12 @@
+@@ -53281,12 +18812,12 @@
  		enable_static=yes
  		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
  		LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -60273,7 +60231,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -53318,7 +18845,7 @@
+@@ -53312,7 +18843,7 @@
  
  
  # Check whether --enable-external_libtdb was given.
@@ -60282,7 +60240,7 @@
    enableval=$enable_external_libtdb;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -53329,7 +18856,7 @@
+@@ -53323,7 +18854,7 @@
  then
  
  pkg_failed=no
@@ -60291,37 +60249,37 @@
  $as_echo_n "checking for LIBTDB... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -53337,11 +18864,11 @@
+@@ -53331,11 +18862,11 @@
          pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tdb >= 1.1.7") 2>&5
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.1") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
-   pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.1.7" 2>/dev/null`
+   pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.2.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53355,11 +18882,11 @@
+@@ -53349,11 +18880,11 @@
          pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tdb >= 1.1.7") 2>&5
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.1") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
-   pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.1.7" 2>/dev/null`
+   pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.2.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53386,13 +18913,11 @@
+@@ -53380,13 +18911,11 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBTDB_PKG_ERRORS" >&5
  
@@ -60337,7 +60295,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53400,9 +18925,7 @@
+@@ -53394,9 +18923,7 @@
  elif test $pkg_failed = untried; then
  
  		if test x$enable_external_libtdb = xyes; then
@@ -60348,7 +60306,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53410,7 +18933,7 @@
+@@ -53404,7 +18931,7 @@
  else
  	LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
  	LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
@@ -60357,7 +60315,7 @@
  $as_echo "yes" >&6; }
  	 enable_external_libtdb=yes
  fi
-@@ -53429,9 +18952,7 @@
+@@ -53423,9 +18950,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -60368,7 +60326,7 @@
  fi
  TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
  TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -53444,104 +18965,12 @@
+@@ -53438,104 +18963,12 @@
  TDB_CFLAGS="-I$tdbdir/include"
  
  
@@ -60478,7 +60436,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -53549,151 +18978,12 @@
+@@ -53543,151 +18976,12 @@
  fi
  done
  
@@ -60635,7 +60593,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -53704,17 +18994,13 @@
+@@ -53698,17 +18992,13 @@
  
  
  
@@ -60656,7 +60614,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -53725,56 +19011,29 @@
+@@ -53719,56 +19009,29 @@
    return 0;
  }
  _ACEOF
@@ -60720,7 +60678,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -53785,41 +19044,18 @@
+@@ -53779,41 +19042,18 @@
    return 0;
  }
  _ACEOF
@@ -60766,7 +60724,7 @@
  
   fi
  
-@@ -53856,16 +19092,16 @@
+@@ -53850,16 +19090,16 @@
  
  
  
@@ -60786,7 +60744,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53891,7 +19127,7 @@
+@@ -53885,7 +19125,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
  		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -60795,7 +60753,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
  			enable_static=yes
-@@ -53904,12 +19140,12 @@
+@@ -53898,12 +19138,12 @@
  		enable_static=yes
  		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
  		LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -60810,7 +60768,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -53965,16 +19201,16 @@
+@@ -53959,16 +19199,16 @@
  
  
  
@@ -60830,7 +60788,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54000,7 +19236,7 @@
+@@ -53994,7 +19234,7 @@
  	if eval $BLDSHARED = true; then
  		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
  		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -60839,7 +60797,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54013,12 +19249,12 @@
+@@ -54007,12 +19247,12 @@
  		enable_static=yes
  		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
  		LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -60854,7 +60812,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54056,16 +19292,16 @@
+@@ -54050,16 +19290,16 @@
  
  
  
@@ -60874,7 +60832,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54091,7 +19327,7 @@
+@@ -54085,7 +19325,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -60883,7 +60841,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54104,12 +19340,12 @@
+@@ -54098,12 +19338,12 @@
  		enable_static=yes
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
  		LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -60898,7 +60856,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54147,16 +19383,16 @@
+@@ -54141,16 +19381,16 @@
  
  
  
@@ -60918,7 +60876,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54182,7 +19418,7 @@
+@@ -54176,7 +19416,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -60927,7 +60885,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54195,12 +19431,12 @@
+@@ -54189,12 +19429,12 @@
  		enable_static=yes
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
  		LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -60942,7 +60900,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54238,19 +19474,19 @@
+@@ -54232,19 +19472,19 @@
  
  
  
@@ -60965,7 +60923,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54259,7 +19495,7 @@
+@@ -54253,7 +19493,7 @@
  else
  
  # if unspecified, default is not to build
@@ -60974,7 +60932,7 @@
  $as_echo "no" >&6; }
  build_lib=no
  
-@@ -54275,7 +19511,7 @@
+@@ -54269,7 +19509,7 @@
  	if eval $BLDSHARED = true; then
  		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
  		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -60983,7 +60941,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54288,12 +19524,12 @@
+@@ -54282,12 +19522,12 @@
  		enable_static=yes
  		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
  		LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -60998,7 +60956,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54310,165 +19546,39 @@
+@@ -54304,165 +19544,39 @@
  
  ################
  
@@ -61160,13 +61118,13 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 +$as_echo "#define HAVE_LONGLONG 1" >>confdefs.h
  
+-fi
 +    ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
 +if test "x$ac_cv_type_intptr_t" = x""yes; then :
  
--fi
--
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -61176,7 +61134,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54478,102 +19588,9 @@
+@@ -54472,102 +19586,9 @@
  fi
  
  else
@@ -61267,11 +61225,11 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--
--fi
 +    ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
 +if test "x$ac_cv_type_intptr_t" = x""yes; then :
  
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -61281,7 +61239,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54588,17 +19605,13 @@
+@@ -54582,17 +19603,13 @@
  # Check if the compiler supports the LL prefix on long long integers.
  # AIX needs this.
  
@@ -61302,7 +61260,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -54609,190 +19622,97 @@
+@@ -54603,260 +19620,134 @@
    return 0;
  }
  _ACEOF
@@ -61521,10 +61479,12 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54802,67 +19722,34 @@
- #include <sys/stat.h>
- main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
- _ACEOF
+-#include <unistd.h>
+-#endif
+-#include <stdio.h>
+-#include <sys/stat.h>
+-main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -61547,6 +61507,12 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
++#include <unistd.h>
++#endif
++#include <stdio.h>
++#include <sys/stat.h>
++main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
    samba_cv_HAVE_OFF64_T=yes
  else
@@ -61599,7 +61565,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54872,67 +19759,34 @@
+@@ -54866,67 +19757,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -61677,7 +61643,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54942,67 +19796,34 @@
+@@ -54936,67 +19794,34 @@
  #include <sys/stat.h>
  main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
  _ACEOF
@@ -61755,7 +61721,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55012,67 +19833,34 @@
+@@ -55006,67 +19831,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -61833,7 +61799,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55082,64 +19870,31 @@
+@@ -55076,64 +19868,31 @@
  #include <sys/stat.h>
  main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
  _ACEOF
@@ -61907,7 +61873,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55155,55 +19910,28 @@
+@@ -55149,55 +19908,28 @@
    return 0;
  }
  _ACEOF
@@ -61970,7 +61936,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55219,58 +19947,31 @@
+@@ -55213,58 +19945,31 @@
    return 0;
  }
  _ACEOF
@@ -62037,7 +62003,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55279,67 +19980,34 @@
+@@ -55273,67 +19978,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = major(dev); return 0; }
  _ACEOF
@@ -62115,7 +62081,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55348,67 +20016,34 @@
+@@ -55342,67 +20014,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = minor(dev); return 0; }
  _ACEOF
@@ -62193,7 +62159,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55417,129 +20052,63 @@
+@@ -55411,129 +20050,63 @@
  #include <sys/types.h>
  main() { dev_t dev = makedev(1,2); return 0; }
  _ACEOF
@@ -62342,7 +62308,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -55552,55 +20121,28 @@
+@@ -55546,55 +20119,28 @@
    return 0;
  }
  _ACEOF
@@ -62405,7 +62371,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -55611,55 +20153,28 @@
+@@ -55605,55 +20151,28 @@
    return 0;
  }
  _ACEOF
@@ -62468,7 +62434,7 @@
  /* end confdefs.h.  */
  
  #include <sys/time.h>
-@@ -55672,46 +20187,19 @@
+@@ -55666,46 +20185,19 @@
    return 0;
  }
  _ACEOF
@@ -62521,7 +62487,7 @@
  
  fi
  
-@@ -55723,120 +20211,24 @@
+@@ -55717,120 +20209,24 @@
      # which rely on signals.
  
  
@@ -62650,7 +62616,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -55860,58 +20252,27 @@
+@@ -55854,58 +20250,27 @@
    return 0;
  }
  _ACEOF
@@ -62690,21 +62656,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -
- 
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  
  fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  
--
+ 
 -    { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
  $as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
@@ -62717,7 +62683,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -55935,58 +20296,27 @@
+@@ -55929,58 +20294,27 @@
    return 0;
  }
  _ACEOF
@@ -62757,21 +62723,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -
- 
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  
  fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  
--
+ 
 -    { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_REALTIME" >&5
  $as_echo_n "checking for CLOCK_REALTIME... " >&6; }
@@ -62784,7 +62750,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56010,49 +20340,22 @@
+@@ -56004,49 +20338,22 @@
    return 0;
  }
  _ACEOF
@@ -62824,8 +62790,8 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -
- 
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -62840,7 +62806,7 @@
  
  
  
-@@ -56070,18 +20373,14 @@
+@@ -56064,18 +20371,14 @@
  	    ;;
            *)
  	    # clock_gettime was not found, try adding librt
@@ -62862,7 +62828,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -56099,60 +20398,29 @@
+@@ -56093,60 +20396,29 @@
    return 0;
  }
  _ACEOF
@@ -62932,7 +62898,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56176,58 +20444,27 @@
+@@ -56170,58 +20442,27 @@
    return 0;
  }
  _ACEOF
@@ -62972,21 +62938,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
  
--
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  
  fi
--
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
  
- 
+-
 -    { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
  $as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
@@ -62999,7 +62965,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56251,58 +20488,27 @@
+@@ -56245,58 +20486,27 @@
    return 0;
  }
  _ACEOF
@@ -63039,21 +63005,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
  
--
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  
  fi
--
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
  
- 
+-
 -    { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_REALTIME" >&5
  $as_echo_n "checking for CLOCK_REALTIME... " >&6; }
@@ -63066,7 +63032,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56326,49 +20532,22 @@
+@@ -56320,49 +20530,22 @@
    return 0;
  }
  _ACEOF
@@ -63106,8 +63072,8 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
  
--
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -63122,7 +63088,7 @@
  
  
  
-@@ -56393,20 +20572,16 @@
+@@ -56387,20 +20570,16 @@
  
  fi
  
@@ -63147,7 +63113,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -56414,216 +20589,67 @@
+@@ -56408,216 +20587,67 @@
  if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
  di->d_name[0] == 0) exit(0); exit(1);}
  _ACEOF
@@ -63208,18 +63174,16 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
  $as_echo_n "checking for utimbuf... " >&6; }
 -if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then
-+if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
+-  $as_echo_n "(cached) " >&6
+-else
+-
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
+-/* end confdefs.h.  */
+-#include <sys/types.h>
 -#include <utime.h>
 -int
 -main ()
@@ -63283,8 +63247,9 @@
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -63322,16 +63287,14 @@
 -choke me
 -#endif
 -
-+#include <utime.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -return $ac_func ();
-+struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -63354,17 +63317,30 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  samba_cv_HAVE_UTIMBUF=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <utime.h>
++int
++main ()
++{
++struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_HAVE_UTIMBUF=yes
++else
 +  samba_cv_HAVE_UTIMBUF=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_UTIMBUF" >&5
 +$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
 +if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
@@ -63396,7 +63372,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -56632,17 +20658,13 @@
+@@ -56626,17 +20656,13 @@
  done
  
  
@@ -63417,7 +63393,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56654,55 +20676,28 @@
+@@ -56648,55 +20674,28 @@
    return 0;
  }
  _ACEOF
@@ -63480,7 +63456,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56714,55 +20709,28 @@
+@@ -56708,55 +20707,28 @@
    return 0;
  }
  _ACEOF
@@ -63543,7 +63519,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56774,55 +20742,28 @@
+@@ -56768,55 +20740,28 @@
    return 0;
  }
  _ACEOF
@@ -63606,7 +63582,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56834,55 +20775,28 @@
+@@ -56828,55 +20773,28 @@
    return 0;
  }
  _ACEOF
@@ -63669,7 +63645,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56894,55 +20808,28 @@
+@@ -56888,55 +20806,28 @@
    return 0;
  }
  _ACEOF
@@ -63732,7 +63708,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56954,55 +20841,28 @@
+@@ -56948,55 +20839,28 @@
    return 0;
  }
  _ACEOF
@@ -63795,7 +63771,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57014,55 +20874,28 @@
+@@ -57008,55 +20872,28 @@
    return 0;
  }
  _ACEOF
@@ -63858,7 +63834,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57074,55 +20907,28 @@
+@@ -57068,55 +20905,28 @@
    return 0;
  }
  _ACEOF
@@ -63921,7 +63897,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57134,55 +20940,28 @@
+@@ -57128,55 +20938,28 @@
    return 0;
  }
  _ACEOF
@@ -63984,7 +63960,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57194,55 +20973,28 @@
+@@ -57188,55 +20971,28 @@
    return 0;
  }
  _ACEOF
@@ -64047,7 +64023,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57254,56 +21006,29 @@
+@@ -57248,56 +21004,29 @@
    return 0;
  }
  _ACEOF
@@ -64111,7 +64087,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57315,56 +21040,29 @@
+@@ -57309,56 +21038,29 @@
    return 0;
  }
  _ACEOF
@@ -64175,7 +64151,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmpx.h>
-@@ -57376,41 +21074,18 @@
+@@ -57370,41 +21072,18 @@
    return 0;
  }
  _ACEOF
@@ -64221,7 +64197,7 @@
  
  fi
  
-@@ -57421,12 +21096,10 @@
+@@ -57415,12 +21094,10 @@
  ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
  
  # Check whether --with-libiconv was given.
@@ -64236,7 +64212,7 @@
    else
       if test "$withval" != "yes" ; then
  	ICONV_PATH_SPEC=yes
-@@ -57472,7 +21145,7 @@
+@@ -57466,7 +21143,7 @@
  		export LDFLAGS LIBS CPPFLAGS
  		# Try to find iconv(3)
  
@@ -64245,7 +64221,7 @@
  $as_echo_n "checking for iconv in $i/$l... " >&6; }
      jm_cv_func_iconv="no"
      jm_cv_lib_iconv=""
-@@ -57480,11 +21153,7 @@
+@@ -57474,11 +21151,7 @@
      jm_save_LIBS="$LIBS"
  
      if test "$jm_cv_func_iconv" != yes; then
@@ -64258,7 +64234,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57498,48 +21167,17 @@
+@@ -57492,48 +21165,17 @@
    return 0;
  }
  _ACEOF
@@ -64311,7 +64287,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57553,49 +21191,18 @@
+@@ -57547,49 +21189,18 @@
    return 0;
  }
  _ACEOF
@@ -64365,7 +64341,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57609,53 +21216,22 @@
+@@ -57603,53 +21214,22 @@
    return 0;
  }
  _ACEOF
@@ -64423,7 +64399,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57669,50 +21245,19 @@
+@@ -57663,50 +21243,19 @@
    return 0;
  }
  _ACEOF
@@ -64478,7 +64454,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <biconv.h>
-@@ -57726,42 +21271,15 @@
+@@ -57720,42 +21269,15 @@
    return 0;
  }
  _ACEOF
@@ -64524,7 +64500,7 @@
  
              LIBS="$jm_save_LIBS"
            fi
-@@ -57772,36 +21290,30 @@
+@@ -57766,36 +21288,30 @@
    if test "$jm_cv_func_iconv" = yes; then
      if test "$jm_cv_giconv" = yes; then
  
@@ -64568,7 +64544,7 @@
  $as_echo "no" >&6; }
    fi
  
-@@ -57839,16 +21351,12 @@
+@@ -57833,16 +21349,12 @@
  	# check for default dos charset name
  	for j in CP850 IBM850 ; do
  
@@ -64588,7 +64564,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -57861,43 +21369,16 @@
+@@ -57855,43 +21367,16 @@
  }
  
  _ACEOF
@@ -64637,7 +64613,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_dos_charset="$ICONV_CHARSET"
-@@ -57909,16 +21390,12 @@
+@@ -57903,16 +21388,12 @@
  	# check for default display charset name
  	for j in ASCII 646 ; do
  
@@ -64657,7 +64633,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -57931,43 +21408,16 @@
+@@ -57925,43 +21406,16 @@
  }
  
  _ACEOF
@@ -64706,7 +64682,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_display_charset="$ICONV_CHARSET"
-@@ -57979,16 +21429,12 @@
+@@ -57973,16 +21427,12 @@
  	# check for default unix charset name
  	for j in UTF-8 UTF8 ; do
  
@@ -64726,7 +64702,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -58001,43 +21447,16 @@
+@@ -57995,43 +21445,16 @@
  }
  
  _ACEOF
@@ -64775,7 +64751,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_unix_charset="$ICONV_CHARSET"
-@@ -58076,9 +21495,9 @@
+@@ -58070,9 +21493,9 @@
  	    default_display_charset="ASCII"
  	    default_unix_charset="UTF-8"
  	    samba_cv_HAVE_NATIVE_ICONV=yes
@@ -64787,7 +64763,7 @@
  $as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
  	fi
  
-@@ -58102,9 +21521,7 @@
+@@ -58096,9 +21519,7 @@
  	    default_unix_charset="\"$default_unix_charset\""
  
  
@@ -64798,7 +64774,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -58138,7 +21555,7 @@
+@@ -58132,7 +21553,7 @@
  
  
  if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -64807,7 +64783,7 @@
      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.
      Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&2;}
-@@ -58160,20 +21577,16 @@
+@@ -58154,20 +21575,16 @@
  fi
  
  
@@ -64832,7 +64808,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58187,67 +21600,34 @@
+@@ -58181,67 +21598,34 @@
  }
  
  _ACEOF
@@ -64910,15 +64886,10 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58256,330 +21636,68 @@
- #ifndef F_NOTIFY
- #define F_NOTIFY 1026
- #endif
--main() {
--       	exit(fcntl(open("/tmp", O_RDONLY), F_NOTIFY, 0) == -1 ?  1 : 0);
--}
--
--_ACEOF
+@@ -58255,325 +21639,63 @@
+ }
+ 
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -64941,23 +64912,28 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
--else
++if ac_fn_c_try_run "$LINENO"; 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
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no
--fi
++  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
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
 -
--
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
--$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
+ $as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
 -if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
 -
 -cat >>confdefs.h <<\_ACEOF
@@ -65177,11 +65153,8 @@
 -return $ac_func ();
 -  ;
 -  return 0;
-+main() {
-+       	exit(fcntl(open("/tmp", O_RDONLY), F_NOTIFY, 0) == -1 ?  1 : 0);
- }
-+
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -65204,37 +65177,19 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--	eval "$as_ac_var=no"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
-+$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
 +if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
 +
 +$as_echo "#define HAVE_KERNEL_CHANGE_NOTIFY 1" >>confdefs.h
  
+-	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
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify support" >&5
 +$as_echo_n "checking for inotify support... " >&6; }
 +if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
@@ -65247,12 +65202,18 @@
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
-+fi
+ 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
 +
 +done
 +
@@ -65260,7 +65221,8 @@
 +do :
 +  ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
 +if test "x$ac_cv_func_inotify_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_INOTIFY_INIT 1
  _ACEOF
  
@@ -65285,7 +65247,7 @@
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -58590,54 +21708,29 @@
+@@ -58584,54 +21706,29 @@
    return 0;
  }
  _ACEOF
@@ -65346,7 +65308,7 @@
  
  fi
  
-@@ -58646,157 +21739,18 @@
+@@ -58640,157 +21737,18 @@
  #	http://oss.sgi.com/projects/fam/
  #	http://savannah.nongnu.org/projects/fam/
  # Check whether --enable-fam was given.
@@ -65510,7 +65472,7 @@
  _ACEOF
   samba_cv_HAVE_FAM_H=yes
  else
-@@ -58808,18 +21762,14 @@
+@@ -58802,18 +21760,14 @@
      if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
          # On IRIX, libfam requires libC, but other FAM implementations
  	# might not need it.
@@ -65532,7 +65494,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -58837,43 +21787,18 @@
+@@ -58831,43 +21785,18 @@
    return 0;
  }
  _ACEOF
@@ -65582,7 +65544,7 @@
    samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
  else
    samba_cv_HAVE_LIBFAM=no
-@@ -58884,23 +21809,17 @@
+@@ -58878,23 +21807,17 @@
              samba_fam_xtra=-lC
  
  
@@ -65609,7 +65571,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -58918,72 +21837,41 @@
+@@ -58912,72 +21835,41 @@
    return 0;
  }
  _ACEOF
@@ -65690,7 +65652,7 @@
  /* end confdefs.h.  */
  #include <fam.h>
  int
-@@ -58994,43 +21882,16 @@
+@@ -58988,43 +21880,16 @@
    return 0;
  }
  _ACEOF
@@ -65737,7 +65699,7 @@
      fi
  fi
  
-@@ -59043,18 +21904,14 @@
+@@ -59037,18 +21902,14 @@
      samba_dmapi_libs=""
  
      if test x"$samba_dmapi_libs" = x"" ; then
@@ -65759,7 +65721,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59072,61 +21929,32 @@
+@@ -59066,61 +21927,32 @@
    return 0;
  }
  _ACEOF
@@ -65830,7 +65792,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59144,61 +21972,32 @@
+@@ -59138,61 +21970,32 @@
    return 0;
  }
  _ACEOF
@@ -65901,7 +65863,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59216,61 +22015,32 @@
+@@ -59210,61 +22013,32 @@
    return 0;
  }
  _ACEOF
@@ -65972,7 +65934,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59288,43 +22058,18 @@
+@@ -59282,43 +22056,18 @@
    return 0;
  }
  _ACEOF
@@ -66022,7 +65984,7 @@
    samba_dmapi_libs="-lxdsm"
  fi
  
-@@ -59333,153 +22078,12 @@
+@@ -59327,153 +22076,12 @@
  
      # Only bother to test ehaders if we have a candidate DMAPI library
      if test x"$samba_dmapi_libs" != x"" ; then
@@ -66182,7 +66144,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -59493,11 +22097,7 @@
+@@ -59487,11 +22095,7 @@
      if test x"$samba_dmapi_libs" != x"" ; then
  	samba_dmapi_save_LIBS="$LIBS"
  	LIBS="$LIBS $samba_dmapi_libs"
@@ -66195,15 +66157,10 @@
  /* end confdefs.h.  */
  
  #include <time.h>      /* needed by Tru64 */
-@@ -59527,471 +22127,159 @@
- 	dm_init_service(&version);
- 	/* IRIX 6.4 expects events to be a pointer. */
- 	DMEV_ISSET(DM_EVENT_READ, events);
--
--  ;
--  return 0;
--}
--_ACEOF
+@@ -59526,50 +22130,25 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -66225,83 +66182,79 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
--		    true # DMAPI link test succeeded
--
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ 		    true # DMAPI link test succeeded
+ 
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+ 
+ 		    # DMAPI link failure
+ 		    samba_dmapi_libs=
+ 
+ fi
 -
--		    # DMAPI link failure
--		    samba_dmapi_libs=
--
--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"
--    fi
--
--    if test x"$samba_dmapi_libs" = x"" ; then
--	# DMAPI detection failure actions begin
--
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$samba_dmapi_save_LIBS"
+     fi
+ 
+     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;}
--
--	# DMAPI detection failure actions end
--    else
--	# DMAPI detection success actions start
--
--
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
+ $as_echo "$as_me: DMAPI support not present" >&6;}
+ 
+ 	# DMAPI detection failure actions end
+@@ -59577,11 +22156,9 @@
+ 	# DMAPI detection success actions start
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define USE_DMAPI 1
 -_ACEOF
--
++$as_echo "#define USE_DMAPI 1" >>confdefs.h
+ 
 -		{ $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;}
--
--	# DMAPI detection success actions end
--    fi
--
--
--
--# Add TSM SM VFS module only if there are both GPFS and DMAPI support
--# Theoretically it should work with AIX JFS2 too but this needs testing
--if test x"$samba_cv_HAVE_GPFS" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
--    default_shared_modules="$default_shared_modules vfs_tsmsm"
--fi
--
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: Found DMAPI support in $samba_dmapi_libs" >&5
+ $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
+ 
+ 	# DMAPI detection success actions end
+@@ -59595,20 +22172,16 @@
+     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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel share modes" >&5
+ $as_echo_n "checking for kernel share modes... " >&6; }
 -if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--
++if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
 -if test "$cross_compiling" = yes; then
--  samba_cv_HAVE_KERNEL_SHARE_MODES=cross
--else
++if test "$cross_compiling" = yes; then :
+   samba_cv_HAVE_KERNEL_SHARE_MODES=cross
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <sys/types.h>
--#include <fcntl.h>
--#include <signal.h>
--#include <sys/file.h>
--#ifndef LOCK_MAND
--#define LOCK_MAND	32
--#define LOCK_READ	64
--#endif
--main() {
--       	exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
--}
--
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <sys/types.h>
+@@ -59624,65 +22197,32 @@
+ }
+ 
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -66324,54 +66277,59 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  samba_cv_HAVE_KERNEL_SHARE_MODES=yes
--else
++if ac_fn_c_try_run "$LINENO"; 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
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -samba_cv_HAVE_KERNEL_SHARE_MODES=no
--fi
++  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
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
 -
--
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
--$as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
--if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
+ $as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_KERNEL_SHARE_MODES 1
 -_ACEOF
--
--fi
--
--
++$as_echo "#define HAVE_KERNEL_SHARE_MODES 1" >>confdefs.h
+ 
+ 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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IRIX kernel oplock type definitions" >&5
+ $as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
 -if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--
++if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
--#include <fcntl.h>
--int
--main ()
--{
--oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
--  ;
--  return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <fcntl.h>
+@@ -59694,185 +22234,29 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -66390,29 +66348,33 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
--fi
++  samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
+ fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
--$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
--if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
+ $as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
+ if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_KERNEL_OPLOCKS_IRIX 1
 -_ACEOF
--
--fi
--
--#################################################
--# Check for POSIX capability support
--
++$as_echo "#define HAVE_KERNEL_OPLOCKS_IRIX 1" >>confdefs.h
+ 
+ fi
+ 
+ #################################################
+ # 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; }
@@ -66538,76 +66500,38 @@
 -$as_echo_n "checking for sys/capability.h... " >&6; }
 -if test "${ac_cv_header_sys_capability_h+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+		    true # DMAPI link test succeeded
-+
- else
+-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; }
-+
-+		    # DMAPI link failure
-+		    samba_dmapi_libs=
- 
- fi
+-
+-fi
 -if test "x$ac_cv_header_sys_capability_h" = x""yes; then
--  samba_cv_HAVE_SYS_CAPABILITY_H=yes;
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	LIBS="$samba_dmapi_save_LIBS"
-+    fi
++ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
+   samba_cv_HAVE_SYS_CAPABILITY_H=yes;
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SYS_CAPABILITY_H 1
 -_ACEOF
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+	# DMAPI detection failure actions begin
++$as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
  
--fi
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
-+$as_echo "$as_me: DMAPI support not present" >&6;}
-+
-+	# DMAPI detection failure actions end
-+    else
-+	# DMAPI detection success actions start
+ fi
  
+@@ -59882,110 +22266,18 @@
  
-+$as_echo "#define USE_DMAPI 1" >>confdefs.h
+     ac_save_LIBS=$LIBS
  
--if test x"$samba_cv_HAVE_SYS_CAPABILITY_H" = x"yes"; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Found DMAPI support in $samba_dmapi_libs" >&5
-+$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
- 
--    ac_save_LIBS=$LIBS
-+	# DMAPI detection success actions end
-+    fi
- 
- 
+-
 -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; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+# Add TSM SM VFS module only if there are both GPFS and DMAPI support
-+# Theoretically it should work with AIX JFS2 too but this needs testing
-+if test x"$samba_cv_HAVE_GPFS" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
-+    default_shared_modules="$default_shared_modules vfs_tsmsm"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel share modes" >&5
-+$as_echo_n "checking for kernel share modes... " >&6; }
-+if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -66617,49 +66541,20 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_KERNEL_SHARE_MODES=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <signal.h>
-+#include <sys/file.h>
-+#ifndef LOCK_MAND
-+#define LOCK_MAND	32
-+#define LOCK_READ	64
- #endif
-+main() {
-+       	exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_KERNEL_SHARE_MODES=yes
-+else
-+  samba_cv_HAVE_KERNEL_SHARE_MODES=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
+-#endif
+-
 -#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
-+$as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
-+if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -66673,30 +66568,15 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+$as_echo "#define HAVE_KERNEL_SHARE_MODES 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IRIX kernel oplock type definitions" >&5
-+$as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
-+if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <fcntl.h>
- int
- main ()
- {
+-
+-int
+-main ()
+-{
 -return $ac_func ();
-+oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -66719,37 +66599,17 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
-+$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
-+if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
-+
-+$as_echo "#define HAVE_KERNEL_OPLOCKS_IRIX 1" >>confdefs.h
- 
+-
 -	eval "$as_ac_var=no"
- fi
- 
+-fi
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+#################################################
-+# Check for POSIX capability support
-+
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
-+  samba_cv_HAVE_SYS_CAPABILITY_H=yes;
-+
-+$as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
-+
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -66757,13 +66617,6 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+
-+
-+if test x"$samba_cv_HAVE_SYS_CAPABILITY_H" = x"yes"; then
-+
-+    ac_save_LIBS=$LIBS
-+
 +  for ac_func in cap_get_proc
 +do :
 +  ac_fn_c_check_func "$LINENO" "cap_get_proc" "ac_cv_func_cap_get_proc"
@@ -66783,7 +66636,7 @@
  
  
  
-@@ -60008,18 +22296,14 @@
+@@ -60002,18 +22294,14 @@
  	    ;;
            *)
  	    # cap_get_proc was not found, try adding libcap
@@ -66805,7 +66658,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -60037,50 +22321,23 @@
+@@ -60031,50 +22319,23 @@
    return 0;
  }
  _ACEOF
@@ -66863,7 +66716,7 @@
  
  
  
-@@ -60102,20 +22359,16 @@
+@@ -60096,20 +22357,16 @@
  
  
  
@@ -66888,7 +66741,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -60131,52 +22384,23 @@
+@@ -60125,52 +22382,23 @@
   exit(0);
  }
  _ACEOF
@@ -66947,7 +66800,7 @@
  
  else
      LIBS=$ac_save_LIBS
-@@ -60189,17 +22413,13 @@
+@@ -60183,17 +22411,13 @@
  # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
  #
  
@@ -66968,7 +66821,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60213,55 +22433,28 @@
+@@ -60207,55 +22431,28 @@
    return 0;
  }
  _ACEOF
@@ -67031,7 +66884,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60275,55 +22468,28 @@
+@@ -60269,55 +22466,28 @@
    return 0;
  }
  _ACEOF
@@ -67094,7 +66947,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60337,55 +22503,28 @@
+@@ -60331,55 +22501,28 @@
    return 0;
  }
  _ACEOF
@@ -67157,7 +67010,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60399,56 +22538,29 @@
+@@ -60393,56 +22536,29 @@
    return 0;
  }
  _ACEOF
@@ -67221,7 +67074,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_SECURITY_H
-@@ -60466,238 +22578,112 @@
+@@ -60460,238 +22576,112 @@
    return 0;
  }
  _ACEOF
@@ -67496,7 +67349,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60708,63 +22694,32 @@
+@@ -60702,63 +22692,32 @@
    return 0;
  }
  _ACEOF
@@ -67569,7 +67422,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60775,63 +22730,32 @@
+@@ -60769,63 +22728,32 @@
    return 0;
  }
  _ACEOF
@@ -67642,7 +67495,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60842,63 +22766,32 @@
+@@ -60836,63 +22764,32 @@
    return 0;
  }
  _ACEOF
@@ -67715,7 +67568,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60909,147 +22802,30 @@
+@@ -60903,147 +22800,30 @@
    return 0;
  }
  _ACEOF
@@ -67873,7 +67726,7 @@
  _ACEOF
  
  fi
-@@ -61061,20 +22837,16 @@
+@@ -61055,20 +22835,16 @@
  seteuid=no;
  
  if test $seteuid = no; then
@@ -67898,7 +67751,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61082,50 +22854,21 @@
+@@ -61076,50 +22852,21 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -67955,7 +67808,7 @@
  
  fi
  fi
-@@ -61133,20 +22876,16 @@
+@@ -61127,20 +22874,16 @@
  # 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
@@ -67980,7 +67833,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61154,69 +22893,36 @@
+@@ -61148,69 +22891,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68060,7 +67913,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61224,69 +22930,36 @@
+@@ -61218,69 +22928,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68140,7 +67993,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61294,64 +22967,31 @@
+@@ -61288,64 +22965,31 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68214,7 +68067,7 @@
  /* end confdefs.h.  */
  
  #include <sys/syscall.h>
-@@ -61365,195 +23005,98 @@
+@@ -61359,195 +23003,98 @@
    return 0;
  }
  _ACEOF
@@ -68280,15 +68133,16 @@
 -if test "$cross_compiling" = yes; then
 +if test "$cross_compiling" = yes; then :
    samba_cv_HAVE_FCNTL_LOCK=cross
--else
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "${srcdir-.}/../tests/fcntl_lock.c"
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include "${srcdir-.}/../tests/fcntl_lock.c"
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -68311,11 +68165,6 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include "${srcdir-.}/../tests/fcntl_lock.c"
-+_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
    samba_cv_HAVE_FCNTL_LOCK=yes
  else
@@ -68444,7 +68293,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -61577,67 +23120,34 @@
+@@ -61571,385 +23118,114 @@
  #endif
  }
  _ACEOF
@@ -68502,29 +68351,36 @@
  
    fi
  fi
- 
- # glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
+-
+-# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
 -{ $as_echo "$as_me:$LINENO: checking for broken posix_fallocate" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
- $as_echo_n "checking for broken posix_fallocate... " >&6; }
+-$as_echo_n "checking for broken posix_fallocate... " >&6; }
 -if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then
-+if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
+-  $as_echo_n "(cached) " >&6
+-else
+-
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-   #define _XOPEN_SOURCE 600
-@@ -61655,56 +23165,29 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-
+-  #define _XOPEN_SOURCE 600
+-  #include <stdlib.h>
+-  #if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
+-    probably broken posix_fallocate
+-  #endif
+-
+-int
+-main ()
+-{
+-
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -68543,52 +68399,50 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
- else
+-  samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
-+  samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
- fi
+-fi
 -
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
- $as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
- if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
- 
+-$as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
+-if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BROKEN_POSIX_FALLOCATE /**/
 -_ACEOF
-+$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
- 
- fi
- 
- 
+-
+-fi
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
- $as_echo_n "checking for st_blocks in struct stat... " >&6; }
+-$as_echo_n "checking for st_blocks in struct stat... " >&6; }
 -if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then
-+if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
+-  $as_echo_n "(cached) " >&6
+-else
+-
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -61717,141 +23200,24 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-int
+-main ()
+-{
+-struct stat st;  st.st_blocks = 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -68607,23 +68461,20 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   samba_cv_HAVE_STAT_ST_BLOCKS=yes
- else
+-  samba_cv_HAVE_STAT_ST_BLOCKS=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_STAT_ST_BLOCKS=no
-+  samba_cv_HAVE_STAT_ST_BLOCKS=no
- fi
+-fi
 -
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
- $as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
- if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
- 
+-$as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
+-if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STAT_ST_BLOCKS 1
 -_ACEOF
@@ -68719,48 +68570,59 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
- 
- fi
- 
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blksize_t" >&5
 -$as_echo "$ac_cv_type_blksize_t" >&6; }
 -if test "x$ac_cv_type_blksize_t" = x""yes; then
-+ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
-+"
-+if test "x$ac_cv_type_blksize_t" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_BLKSIZE_T 1
-@@ -61859,103 +23225,9 @@
- 
- 
- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_BLKSIZE_T 1
+-_ACEOF
+-
+-
+-fi
 -{ $as_echo "$as_me:$LINENO: checking for blkcnt_t" >&5
 -$as_echo_n "checking for blkcnt_t... " >&6; }
 -if test "${ac_cv_type_blkcnt_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++
++# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
++$as_echo_n "checking for broken posix_fallocate... " >&6; }
++if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_blkcnt_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <sys/stat.h>
--
--int
--main ()
--{
++
++  #define _XOPEN_SOURCE 600
++  #include <stdlib.h>
++  #if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
++    probably broken posix_fallocate
++  #endif
+ 
+ int
+ main ()
+ {
 -if (sizeof (blkcnt_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -68784,18 +68646,44 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/stat.h>
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
++else
++  samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
++$as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
++if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
++
++$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
++$as_echo_n "checking for st_blocks in struct stat... " >&6; }
++if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <sys/types.h>
+ #include <sys/stat.h>
 -
--int
--main ()
--{
++#include <unistd.h>
+ int
+ main ()
+ {
 -if (sizeof ((blkcnt_t)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++struct stat st;  st.st_blocks = 0;
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -68815,23 +68703,40 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_HAVE_STAT_ST_BLOCKS=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_blkcnt_t=yes
--fi
++  samba_cv_HAVE_STAT_ST_BLOCKS=no
+ fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
++$as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
++if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
+ 
++$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
+ 
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blksize_t" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_BLKSIZE_T 1
++_ACEOF
++
++
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blkcnt_t" >&5
 -$as_echo "$ac_cv_type_blkcnt_t" >&6; }
 -if test "x$ac_cv_type_blkcnt_t" = x""yes; then
@@ -68841,7 +68746,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_BLKCNT_T 1
-@@ -61965,17 +23237,13 @@
+@@ -61959,17 +23235,13 @@
  fi
  
  
@@ -68862,7 +68767,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -61988,55 +23256,28 @@
+@@ -61982,55 +23254,28 @@
    return 0;
  }
  _ACEOF
@@ -68925,7 +68830,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -62049,57 +23290,30 @@
+@@ -62043,57 +23288,30 @@
    return 0;
  }
  _ACEOF
@@ -68990,7 +68895,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -62115,58 +23329,31 @@
+@@ -62109,58 +23327,31 @@
    return 0;
  }
  _ACEOF
@@ -69057,7 +68962,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -62185,74 +23372,45 @@
+@@ -62179,74 +23370,45 @@
  }
  
  _ACEOF
@@ -69143,7 +69048,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62261,24 +23419,24 @@
+@@ -62255,24 +23417,24 @@
  ####################################################
  # check for Linux-specific AFS fake-kaserver support
  samba_cv_WITH_FAKE_KASERVER=no
@@ -69173,7 +69078,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62290,18 +23448,14 @@
+@@ -62284,18 +23446,14 @@
     test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
  
      # see if this box has the OpenSSL DES libraries
@@ -69195,7 +69100,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62319,208 +23473,43 @@
+@@ -62313,208 +23471,43 @@
    return 0;
  }
  _ACEOF
@@ -69420,7 +69325,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62532,12 +23521,10 @@
+@@ -62526,12 +23519,10 @@
      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
@@ -69435,7 +69340,7 @@
  	fi
      else
      	have_afs_headers=yes
-@@ -62547,9 +23534,7 @@
+@@ -62541,9 +23532,7 @@
  FAKE_KASERVER_OBJ=""
  if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69446,7 +69351,7 @@
  
      FAKE_KASERVER_OBJ="utils/net_afs.o"
  fi
-@@ -62558,24 +23543,24 @@
+@@ -62552,24 +23541,24 @@
  #################################################
  # check whether to compile AFS/NT ACL mapping module
  samba_cv_WITH_VFS_AFSACL=no
@@ -69476,7 +69381,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62587,36 +23572,32 @@
+@@ -62581,36 +23570,32 @@
  
  if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69520,7 +69425,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62626,12 +23607,12 @@
+@@ -62620,12 +23605,12 @@
  # Compile with LDAP support?
  
  with_ldap_support=auto
@@ -69535,7 +69440,7 @@
    withval=$with_ldap;  case "$withval" in
      yes|no)
  	with_ldap_support=$withval
-@@ -62640,7 +23621,7 @@
+@@ -62634,7 +23619,7 @@
  fi
  
  
@@ -69544,7 +69449,7 @@
  $as_echo "$with_ldap_support" >&6; }
  
  SMBLDAP=""
-@@ -62655,150 +23636,12 @@
+@@ -62649,150 +23634,12 @@
    ##################################################################
    # first test for ldap.h and lber.h
    # (ldap.h is required for this test)
@@ -69701,7 +69606,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62810,11 +23653,9 @@
+@@ -62804,11 +23651,9 @@
  
    if test x"$ac_cv_header_ldap_h" != x"yes"; then
  	if test x"$with_ldap_support" = x"yes"; then
@@ -69715,7 +69620,7 @@
  $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
  	fi
  
-@@ -62826,117 +23667,24 @@
+@@ -62820,117 +23665,24 @@
    # unsigned int in include/includes.h
    case $host_os in
  	*hpux*)
@@ -69840,7 +69745,7 @@
  $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
  		fi
  		with_ldap_support=no
-@@ -62953,23 +23701,17 @@
+@@ -62947,23 +23699,17 @@
    # this test must be before the libldap test
  
  
@@ -69867,7 +69772,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62987,54 +23729,28 @@
+@@ -62981,54 +23727,28 @@
    return 0;
  }
  _ACEOF
@@ -69929,7 +69834,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLBER 1
  _ACEOF
-@@ -63050,25 +23766,19 @@
+@@ -63044,25 +23764,19 @@
  
  fi
  
@@ -69958,7 +69863,7 @@
  /* end confdefs.h.  */
  /* Define ber_sockbuf_add_io to an innocuous variant, in case <limits.h> declares ber_sockbuf_add_io.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63109,61 +23819,31 @@
+@@ -63103,61 +23817,31 @@
    return 0;
  }
  _ACEOF
@@ -70029,7 +69934,7 @@
  /* end confdefs.h.  */
  #include <ldap.h>
  int
-@@ -63174,105 +23854,55 @@
+@@ -63168,59 +23852,32 @@
    return 0;
  }
  _ACEOF
@@ -70096,13 +70001,10 @@
  /* end confdefs.h.  */
  #include <lber.h>
  int
- main ()
- {
--int val = LBER_OPT_LOG_PRINT_FN;
--  ;
--  return 0;
--}
--_ACEOF
+@@ -63231,42 +23888,19 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -70121,11 +70023,6 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+int val = LBER_OPT_LOG_PRINT_FN;
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=yes
  else
@@ -70151,7 +70048,7 @@
  
    fi
  
-@@ -63280,23 +23910,17 @@
+@@ -63274,23 +23908,17 @@
    # now see if we can find the ldap libs in standard paths
  
  
@@ -70178,7 +70075,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63314,54 +23938,28 @@
+@@ -63308,54 +23936,28 @@
    return 0;
  }
  _ACEOF
@@ -70240,7 +70137,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLDAP 1
  _ACEOF
-@@ -63377,25 +23975,19 @@
+@@ -63371,25 +23973,19 @@
  
  fi
  
@@ -70269,7 +70166,7 @@
  /* end confdefs.h.  */
  /* Define ldap_set_rebind_proc to an innocuous variant, in case <limits.h> declares ldap_set_rebind_proc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63436,62 +24028,32 @@
+@@ -63430,62 +24026,32 @@
    return 0;
  }
  _ACEOF
@@ -70341,7 +70238,7 @@
  /* end confdefs.h.  */
  
  	#include <lber.h>
-@@ -63504,37 +24066,16 @@
+@@ -63498,37 +24064,16 @@
    return 0;
  }
  _ACEOF
@@ -70382,7 +70279,7 @@
  $as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
  
  
-@@ -63545,19 +24086,14 @@
+@@ -63539,19 +24084,14 @@
  
  
  
@@ -70405,7 +70302,7 @@
  /* end confdefs.h.  */
  /* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63598,55 +24134,27 @@
+@@ -63592,55 +24132,27 @@
    return 0;
  }
  _ACEOF
@@ -70468,7 +70365,7 @@
  
      CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
      default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -63654,17 +24162,15 @@
+@@ -63648,17 +24160,15 @@
      SMBLDAP="lib/smbldap.o"
      SMBLDAPUTIL="lib/smbldap_util.o"
      with_ldap_support=yes
@@ -70490,7 +70387,7 @@
  $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
      fi
  
-@@ -63679,12 +24185,12 @@
+@@ -63673,12 +24183,12 @@
  # active directory support
  
  with_ads_support=auto
@@ -70505,7 +70402,7 @@
    withval=$with_ads;  case "$withval" in
      yes|no)
  	with_ads_support="$withval"
-@@ -63693,7 +24199,7 @@
+@@ -63687,7 +24197,7 @@
  fi
  
  
@@ -70514,7 +70411,7 @@
  $as_echo "$with_ads_support" >&6; }
  
  FOUND_KRB5=no
-@@ -63702,11 +24208,9 @@
+@@ -63696,11 +24206,9 @@
  if test x"$with_ldap_support" != x"yes"; then
  
      if test x"$with_ads_support" = x"yes"; then
@@ -70528,7 +70425,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
  	with_ads_support=no
      fi
-@@ -63721,19 +24225,14 @@
+@@ -63715,19 +24223,14 @@
  	*hpux*)
  
  
@@ -70551,7 +70448,7 @@
  /* end confdefs.h.  */
  /* Define ldap_init to an innocuous variant, in case <limits.h> declares ldap_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63774,57 +24273,29 @@
+@@ -63768,57 +24271,29 @@
    return 0;
  }
  _ACEOF
@@ -70617,7 +70514,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -63833,19 +24304,14 @@
+@@ -63827,19 +24302,14 @@
  	*)
  
  
@@ -70640,7 +70537,7 @@
  /* end confdefs.h.  */
  /* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63886,57 +24352,29 @@
+@@ -63880,57 +24350,29 @@
    return 0;
  }
  _ACEOF
@@ -70706,7 +70603,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -63947,19 +24385,14 @@
+@@ -63941,19 +24383,14 @@
  
  
  
@@ -70729,10 +70626,13 @@
  /* end confdefs.h.  */
  /* Define ldap_add_result_entry to an innocuous variant, in case <limits.h> declares ldap_add_result_entry.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64000,57 +24433,29 @@
-   return 0;
- }
- _ACEOF
+@@ -63991,60 +24428,32 @@
+ {
+ return ldap_add_result_entry ();
+   ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -70754,6 +70654,9 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_ldap_add_result_entry=yes
  else
@@ -70795,7 +70698,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -64066,23 +24471,23 @@
+@@ -64060,23 +24469,23 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # check for location of Kerberos 5 install
@@ -70824,7 +70727,7 @@
  $as_echo "$withval" >&6; }
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
-@@ -64094,7 +24499,7 @@
+@@ -64088,7 +24497,7 @@
          ;;
        esac
  else
@@ -70833,7 +70736,7 @@
  $as_echo "no krb5-path given" >&6; }
  
  fi
-@@ -64105,9 +24510,9 @@
+@@ -64099,9 +24508,9 @@
    # 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
@@ -70845,7 +70748,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $KRB5CONFIG in
-@@ -64120,14 +24525,14 @@
+@@ -64114,14 +24523,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -70863,7 +70766,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -64135,15 +24540,15 @@
+@@ -64129,15 +24538,15 @@
  fi
  KRB5CONFIG=$ac_cv_path_KRB5CONFIG
  if test -n "$KRB5CONFIG"; then
@@ -70882,7 +70785,7 @@
  $as_echo_n "checking for working krb5-config... " >&6; }
    if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
      ac_save_CFLAGS=$CFLAGS
-@@ -64157,17 +24562,17 @@
+@@ -64151,17 +24560,17 @@
      CFLAGS=$ac_save_CFLAGS;export CFLAGS
      LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
      FOUND_KRB5=yes
@@ -70903,7 +70806,7 @@
  $as_echo_n "checking for /usr/include/heimdal... " >&6; }
      if test -d /usr/include/heimdal; then
        if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-@@ -64175,17 +24580,17 @@
+@@ -64169,17 +24578,17 @@
            KRB5_CPPFLAGS="-I/usr/include/heimdal"
            KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
  	  FOUND_KRB5=yes
@@ -70924,7 +70827,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64193,17 +24598,17 @@
+@@ -64187,17 +24596,17 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the RedHat location for kerberos
@@ -70945,7 +70848,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64211,16 +24616,16 @@
+@@ -64205,16 +24614,16 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the OpenBSD location for heimdal krb5
@@ -70965,7 +70868,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64307,151 +24712,12 @@
+@@ -64301,151 +24710,12 @@
    # now check for krb5.h. Some systems have the libraries without the headers!
    # note that this check is done here to allow for different kerberos
    # include paths
@@ -71122,7 +71025,7 @@
  _ACEOF
  
  fi
-@@ -64465,11 +24731,9 @@
+@@ -64459,11 +24729,9 @@
      # i.e with_ads_support = auto, otherwise die with an error.
  
      if test x"$with_ads_support" = x"yes"; then
@@ -71136,7 +71039,7 @@
  $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
      fi
  
-@@ -64481,65 +24745,16 @@
+@@ -64475,65 +24743,16 @@
      CPPFLAGS=$ac_save_CPPFLAGS
      LDFLAGS=$ac_save_LDFLAGS
    fi
@@ -71208,7 +71111,7 @@
  _ACEOF
  
  fi
-@@ -64556,17 +24771,13 @@
+@@ -64550,17 +24769,13 @@
  
    # check for new heimdal KRB5_DEPRECATED handling
  
@@ -71229,7 +71132,7 @@
  /* end confdefs.h.  */
  #define KRB5_DEPRECATED 1
        #include <krb5.h>
-@@ -64578,42 +24789,19 @@
+@@ -64572,42 +24787,19 @@
    return 0;
  }
  _ACEOF
@@ -71276,7 +71179,7 @@
  
    fi
  fi
-@@ -64627,152 +24815,12 @@
+@@ -64621,152 +24813,12 @@
  
    # now check for gssapi headers.  This is also done here to allow for
    # different kerberos include paths
@@ -71435,7 +71338,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -64786,23 +24834,17 @@
+@@ -64780,23 +24832,17 @@
    # we might need the k5crypto and com_err libraries on some systems
  
  
@@ -71462,7 +71365,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -64820,54 +24862,28 @@
+@@ -64814,54 +24860,28 @@
    return 0;
  }
  _ACEOF
@@ -71524,7 +71427,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCOM_ERR 1
  _ACEOF
-@@ -64884,24 +24900,17 @@
+@@ -64878,24 +24898,17 @@
  fi
  
  
@@ -71552,7 +71455,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -64919,54 +24928,28 @@
+@@ -64913,54 +24926,28 @@
    return 0;
  }
  _ACEOF
@@ -71614,7 +71517,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBK5CRYPTO 1
  _ACEOF
-@@ -64982,27 +24965,20 @@
+@@ -64976,27 +24963,20 @@
  
  fi
  
@@ -71645,7 +71548,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65020,54 +24996,28 @@
+@@ -65014,54 +24994,28 @@
    return 0;
  }
  _ACEOF
@@ -71707,7 +71610,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPTO 1
  _ACEOF
-@@ -65084,24 +25034,17 @@
+@@ -65078,24 +25032,17 @@
  fi
  
  
@@ -71735,7 +71638,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65119,54 +25062,28 @@
+@@ -65113,54 +25060,28 @@
    return 0;
  }
  _ACEOF
@@ -71797,7 +71700,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBASN1 1
  _ACEOF
-@@ -65183,24 +25100,17 @@
+@@ -65177,24 +25098,17 @@
  fi
  
  
@@ -71825,7 +71728,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65218,54 +25128,28 @@
+@@ -65212,54 +25126,28 @@
    return 0;
  }
  _ACEOF
@@ -71887,7 +71790,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBROKEN 1
  _ACEOF
-@@ -65281,27 +25165,20 @@
+@@ -65275,27 +25163,20 @@
  
  fi
  
@@ -71918,7 +71821,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65319,54 +25196,28 @@
+@@ -65313,54 +25194,28 @@
    return 0;
  }
  _ACEOF
@@ -71980,7 +71883,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI 1
  _ACEOF
-@@ -65382,29 +25233,22 @@
+@@ -65376,29 +25231,22 @@
  
  fi
  
@@ -72013,7 +71916,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65422,54 +25266,28 @@
+@@ -65416,54 +25264,28 @@
    return 0;
  }
  _ACEOF
@@ -72075,7 +71978,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65486,24 +25304,17 @@
+@@ -65480,24 +25302,17 @@
  fi
  
  
@@ -72103,7 +72006,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65521,54 +25332,28 @@
+@@ -65515,54 +25330,28 @@
    return 0;
  }
  _ACEOF
@@ -72165,7 +72068,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65584,29 +25369,22 @@
+@@ -65578,29 +25367,22 @@
  
  fi
  
@@ -72198,7 +72101,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65624,54 +25402,28 @@
+@@ -65618,54 +25400,28 @@
    return 0;
  }
  _ACEOF
@@ -72260,7 +72163,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI_KRB5 1
  _ACEOF
-@@ -65686,24 +25438,18 @@
+@@ -65680,24 +25436,18 @@
  		have_gssapi=yes
  
  fi
@@ -72288,7 +72191,7 @@
  /* end confdefs.h.  */
  /* Define krb5_set_real_time to an innocuous variant, in case <limits.h> declares krb5_set_real_time.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65744,43 +25490,18 @@
+@@ -65738,43 +25488,18 @@
    return 0;
  }
  _ACEOF
@@ -72338,7 +72241,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_REAL_TIME 1
  _ACEOF
-@@ -65788,20 +25509,14 @@
+@@ -65782,20 +25507,14 @@
  fi
  
  
@@ -72362,7 +72265,7 @@
  /* end confdefs.h.  */
  /* Define krb5_set_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_set_default_in_tkt_etypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65842,43 +25557,18 @@
+@@ -65836,43 +25555,18 @@
    return 0;
  }
  _ACEOF
@@ -72389,12 +72292,11 @@
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_set_default_in_tkt_etypes=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_func_ext_krb5_set_default_in_tkt_etypes=no
-+else
 +  ac_cv_func_ext_krb5_set_default_in_tkt_etypes=no
  fi
 -
@@ -72413,7 +72315,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -65886,20 +25576,14 @@
+@@ -65880,20 +25574,14 @@
  fi
  
  
@@ -72437,7 +72339,7 @@
  /* end confdefs.h.  */
  /* Define krb5_set_default_tgs_enctypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_enctypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65940,43 +25624,18 @@
+@@ -65934,43 +25622,18 @@
    return 0;
  }
  _ACEOF
@@ -72487,7 +72389,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
  _ACEOF
-@@ -65984,20 +25643,14 @@
+@@ -65978,20 +25641,14 @@
  fi
  
  
@@ -72511,7 +72413,7 @@
  /* end confdefs.h.  */
  /* Define krb5_set_default_tgs_ktypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_ktypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66038,43 +25691,18 @@
+@@ -66032,43 +25689,18 @@
    return 0;
  }
  _ACEOF
@@ -72561,7 +72463,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
  _ACEOF
-@@ -66082,20 +25710,14 @@
+@@ -66076,20 +25708,14 @@
  fi
  
  
@@ -72585,7 +72487,7 @@
  /* end confdefs.h.  */
  /* Define krb5_principal2salt to an innocuous variant, in case <limits.h> declares krb5_principal2salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66136,43 +25758,18 @@
+@@ -66130,43 +25756,18 @@
    return 0;
  }
  _ACEOF
@@ -72635,7 +72537,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL2SALT 1
  _ACEOF
-@@ -66180,20 +25777,14 @@
+@@ -66174,20 +25775,14 @@
  fi
  
  
@@ -72659,7 +72561,7 @@
  /* end confdefs.h.  */
  /* Define krb5_use_enctype to an innocuous variant, in case <limits.h> declares krb5_use_enctype.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66234,43 +25825,18 @@
+@@ -66228,43 +25823,18 @@
    return 0;
  }
  _ACEOF
@@ -72709,7 +72611,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_USE_ENCTYPE 1
  _ACEOF
-@@ -66278,20 +25844,14 @@
+@@ -66272,20 +25842,14 @@
  fi
  
  
@@ -72733,7 +72635,7 @@
  /* end confdefs.h.  */
  /* Define krb5_string_to_key to an innocuous variant, in case <limits.h> declares krb5_string_to_key.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66332,43 +25892,18 @@
+@@ -66326,43 +25890,18 @@
    return 0;
  }
  _ACEOF
@@ -72783,7 +72685,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY 1
  _ACEOF
-@@ -66376,20 +25911,14 @@
+@@ -66370,20 +25909,14 @@
  fi
  
  
@@ -72807,7 +72709,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_pw_salt to an innocuous variant, in case <limits.h> declares krb5_get_pw_salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66430,43 +25959,18 @@
+@@ -66424,43 +25957,18 @@
    return 0;
  }
  _ACEOF
@@ -72857,7 +72759,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PW_SALT 1
  _ACEOF
-@@ -66474,20 +25978,14 @@
+@@ -66468,20 +25976,14 @@
  fi
  
  
@@ -72881,7 +72783,7 @@
  /* end confdefs.h.  */
  /* Define krb5_string_to_key_salt to an innocuous variant, in case <limits.h> declares krb5_string_to_key_salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66528,43 +26026,18 @@
+@@ -66522,43 +26024,18 @@
    return 0;
  }
  _ACEOF
@@ -72931,7 +72833,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY_SALT 1
  _ACEOF
-@@ -66572,20 +26045,14 @@
+@@ -66566,20 +26043,14 @@
  fi
  
  
@@ -72955,7 +72857,7 @@
  /* end confdefs.h.  */
  /* Define krb5_auth_con_setkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setkey.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66626,43 +26093,18 @@
+@@ -66620,43 +26091,18 @@
    return 0;
  }
  _ACEOF
@@ -73005,7 +72907,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETKEY 1
  _ACEOF
-@@ -66670,20 +26112,14 @@
+@@ -66664,20 +26110,14 @@
  fi
  
  
@@ -73029,7 +72931,7 @@
  /* end confdefs.h.  */
  /* Define krb5_auth_con_setuseruserkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setuseruserkey.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66724,43 +26160,18 @@
+@@ -66718,43 +26158,18 @@
    return 0;
  }
  _ACEOF
@@ -73079,7 +72981,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
  _ACEOF
-@@ -66768,20 +26179,14 @@
+@@ -66762,20 +26177,14 @@
  fi
  
  
@@ -73103,7 +73005,7 @@
  /* end confdefs.h.  */
  /* Define krb5_locate_kdc to an innocuous variant, in case <limits.h> declares krb5_locate_kdc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66822,43 +26227,18 @@
+@@ -66816,43 +26225,18 @@
    return 0;
  }
  _ACEOF
@@ -73153,7 +73055,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_LOCATE_KDC 1
  _ACEOF
-@@ -66866,20 +26246,14 @@
+@@ -66860,20 +26244,14 @@
  fi
  
  
@@ -73177,7 +73079,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_permitted_enctypes to an innocuous variant, in case <limits.h> declares krb5_get_permitted_enctypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66920,43 +26294,18 @@
+@@ -66914,43 +26292,18 @@
    return 0;
  }
  _ACEOF
@@ -73227,7 +73129,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
  _ACEOF
-@@ -66964,20 +26313,14 @@
+@@ -66958,20 +26311,14 @@
  fi
  
  
@@ -73251,7 +73153,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_get_default_in_tkt_etypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67018,43 +26361,18 @@
+@@ -67012,43 +26359,18 @@
    return 0;
  }
  _ACEOF
@@ -73301,7 +73203,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -67062,20 +26380,14 @@
+@@ -67056,20 +26378,14 @@
  fi
  
  
@@ -73325,7 +73227,7 @@
  /* end confdefs.h.  */
  /* Define krb5_free_data_contents to an innocuous variant, in case <limits.h> declares krb5_free_data_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67116,43 +26428,18 @@
+@@ -67110,43 +26426,18 @@
    return 0;
  }
  _ACEOF
@@ -73375,7 +73277,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_DATA_CONTENTS 1
  _ACEOF
-@@ -67160,20 +26447,14 @@
+@@ -67154,20 +26445,14 @@
  fi
  
  
@@ -73399,7 +73301,7 @@
  /* end confdefs.h.  */
  /* Define krb5_principal_get_comp_string to an innocuous variant, in case <limits.h> declares krb5_principal_get_comp_string.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67214,43 +26495,18 @@
+@@ -67208,43 +26493,18 @@
    return 0;
  }
  _ACEOF
@@ -73449,7 +73351,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
  _ACEOF
-@@ -67258,20 +26514,14 @@
+@@ -67252,20 +26512,14 @@
  fi
  
  
@@ -73473,7 +73375,7 @@
  /* end confdefs.h.  */
  /* Define krb5_free_unparsed_name to an innocuous variant, in case <limits.h> declares krb5_free_unparsed_name.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67312,43 +26562,18 @@
+@@ -67306,43 +26560,18 @@
    return 0;
  }
  _ACEOF
@@ -73523,7 +73425,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_UNPARSED_NAME 1
  _ACEOF
-@@ -67356,20 +26581,14 @@
+@@ -67350,20 +26579,14 @@
  fi
  
  
@@ -73547,7 +73449,7 @@
  /* end confdefs.h.  */
  /* Define krb5_free_keytab_entry_contents to an innocuous variant, in case <limits.h> declares krb5_free_keytab_entry_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67410,43 +26629,18 @@
+@@ -67404,43 +26627,18 @@
    return 0;
  }
  _ACEOF
@@ -73597,7 +73499,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
  _ACEOF
-@@ -67454,20 +26648,14 @@
+@@ -67448,20 +26646,14 @@
  fi
  
  
@@ -73621,7 +73523,7 @@
  /* end confdefs.h.  */
  /* Define krb5_kt_free_entry to an innocuous variant, in case <limits.h> declares krb5_kt_free_entry.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67508,43 +26696,18 @@
+@@ -67502,43 +26694,18 @@
    return 0;
  }
  _ACEOF
@@ -73671,7 +73573,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KT_FREE_ENTRY 1
  _ACEOF
-@@ -67552,20 +26715,14 @@
+@@ -67546,20 +26713,14 @@
  fi
  
  
@@ -73695,7 +73597,7 @@
  /* end confdefs.h.  */
  /* Define krb5_krbhst_init to an innocuous variant, in case <limits.h> declares krb5_krbhst_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67606,43 +26763,18 @@
+@@ -67600,43 +26761,18 @@
    return 0;
  }
  _ACEOF
@@ -73745,7 +73647,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_INIT 1
  _ACEOF
-@@ -67650,20 +26782,14 @@
+@@ -67644,20 +26780,14 @@
  fi
  
  
@@ -73769,7 +73671,7 @@
  /* end confdefs.h.  */
  /* Define krb5_krbhst_get_addrinfo to an innocuous variant, in case <limits.h> declares krb5_krbhst_get_addrinfo.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67704,43 +26830,18 @@
+@@ -67698,43 +26828,18 @@
    return 0;
  }
  _ACEOF
@@ -73819,7 +73721,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
  _ACEOF
-@@ -67748,20 +26849,14 @@
+@@ -67742,20 +26847,14 @@
  fi
  
  
@@ -73843,7 +73745,7 @@
  /* end confdefs.h.  */
  /* Define krb5_c_enctype_compare to an innocuous variant, in case <limits.h> declares krb5_c_enctype_compare.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67802,43 +26897,18 @@
+@@ -67796,43 +26895,18 @@
    return 0;
  }
  _ACEOF
@@ -73893,7 +73795,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_ENCTYPE_COMPARE 1
  _ACEOF
-@@ -67846,20 +26916,14 @@
+@@ -67840,20 +26914,14 @@
  fi
  
  
@@ -73917,7 +73819,7 @@
  /* end confdefs.h.  */
  /* Define krb5_enctypes_compatible_keys to an innocuous variant, in case <limits.h> declares krb5_enctypes_compatible_keys.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67900,43 +26964,18 @@
+@@ -67894,43 +26962,18 @@
    return 0;
  }
  _ACEOF
@@ -73967,7 +73869,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
  _ACEOF
-@@ -67944,20 +26983,14 @@
+@@ -67938,20 +26981,14 @@
  fi
  
  
@@ -73991,7 +73893,7 @@
  /* end confdefs.h.  */
  /* Define krb5_crypto_init to an innocuous variant, in case <limits.h> declares krb5_crypto_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67998,43 +27031,18 @@
+@@ -67992,43 +27029,18 @@
    return 0;
  }
  _ACEOF
@@ -74041,7 +73943,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_INIT 1
  _ACEOF
-@@ -68042,20 +27050,14 @@
+@@ -68036,20 +27048,14 @@
  fi
  
  
@@ -74065,7 +73967,7 @@
  /* end confdefs.h.  */
  /* Define krb5_crypto_destroy to an innocuous variant, in case <limits.h> declares krb5_crypto_destroy.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68096,43 +27098,18 @@
+@@ -68090,43 +27096,18 @@
    return 0;
  }
  _ACEOF
@@ -74115,7 +74017,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_DESTROY 1
  _ACEOF
-@@ -68140,20 +27117,14 @@
+@@ -68134,20 +27115,14 @@
  fi
  
  
@@ -74139,7 +74041,7 @@
  /* end confdefs.h.  */
  /* Define krb5_decode_ap_req to an innocuous variant, in case <limits.h> declares krb5_decode_ap_req.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68194,43 +27165,18 @@
+@@ -68188,43 +27163,18 @@
    return 0;
  }
  _ACEOF
@@ -74189,7 +74091,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_DECODE_AP_REQ 1
  _ACEOF
-@@ -68238,20 +27184,14 @@
+@@ -68232,20 +27182,14 @@
  fi
  
  
@@ -74213,7 +74115,7 @@
  /* end confdefs.h.  */
  /* Define free_AP_REQ to an innocuous variant, in case <limits.h> declares free_AP_REQ.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68292,43 +27232,18 @@
+@@ -68286,43 +27230,18 @@
    return 0;
  }
  _ACEOF
@@ -74263,7 +74165,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_FREE_AP_REQ 1
  _ACEOF
-@@ -68336,20 +27251,14 @@
+@@ -68330,20 +27249,14 @@
  fi
  
  
@@ -74287,7 +74189,7 @@
  /* end confdefs.h.  */
  /* Define krb5_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_verify_checksum.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68390,43 +27299,18 @@
+@@ -68384,43 +27297,18 @@
    return 0;
  }
  _ACEOF
@@ -74337,7 +74239,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68434,20 +27318,14 @@
+@@ -68428,20 +27316,14 @@
  fi
  
  
@@ -74361,7 +74263,7 @@
  /* end confdefs.h.  */
  /* Define krb5_c_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_c_verify_checksum.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68488,43 +27366,18 @@
+@@ -68482,43 +27364,18 @@
    return 0;
  }
  _ACEOF
@@ -74411,7 +74313,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68532,20 +27385,14 @@
+@@ -68526,20 +27383,14 @@
  fi
  
  
@@ -74435,7 +74337,7 @@
  /* end confdefs.h.  */
  /* Define krb5_principal_compare_any_realm to an innocuous variant, in case <limits.h> declares krb5_principal_compare_any_realm.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68586,43 +27433,18 @@
+@@ -68580,43 +27431,18 @@
    return 0;
  }
  _ACEOF
@@ -74485,7 +74387,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
  _ACEOF
-@@ -68630,20 +27452,14 @@
+@@ -68624,20 +27450,14 @@
  fi
  
  
@@ -74509,7 +74411,7 @@
  /* end confdefs.h.  */
  /* Define krb5_parse_name_norealm to an innocuous variant, in case <limits.h> declares krb5_parse_name_norealm.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68684,43 +27500,18 @@
+@@ -68678,43 +27498,18 @@
    return 0;
  }
  _ACEOF
@@ -74559,7 +74461,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PARSE_NAME_NOREALM 1
  _ACEOF
-@@ -68728,20 +27519,14 @@
+@@ -68722,20 +27517,14 @@
  fi
  
  
@@ -74583,7 +74485,7 @@
  /* end confdefs.h.  */
  /* Define krb5_princ_size to an innocuous variant, in case <limits.h> declares krb5_princ_size.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68782,43 +27567,18 @@
+@@ -68776,43 +27565,18 @@
    return 0;
  }
  _ACEOF
@@ -74633,7 +74535,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINC_SIZE 1
  _ACEOF
-@@ -68826,20 +27586,14 @@
+@@ -68820,20 +27584,14 @@
  fi
  
  
@@ -74657,7 +74559,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_set_pac_request to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_set_pac_request.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68880,43 +27634,18 @@
+@@ -68874,43 +27632,18 @@
    return 0;
  }
  _ACEOF
@@ -74707,7 +74609,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
  _ACEOF
-@@ -68924,20 +27653,14 @@
+@@ -68918,20 +27651,14 @@
  fi
  
  
@@ -74731,7 +74633,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_renewed_creds to an innocuous variant, in case <limits.h> declares krb5_get_renewed_creds.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -68978,43 +27701,18 @@
+@@ -68972,43 +27699,18 @@
    return 0;
  }
  _ACEOF
@@ -74781,7 +74683,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_RENEWED_CREDS 1
  _ACEOF
-@@ -69022,20 +27720,14 @@
+@@ -69016,20 +27718,14 @@
  fi
  
  
@@ -74805,7 +74707,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_kdc_cred to an innocuous variant, in case <limits.h> declares krb5_get_kdc_cred.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69076,43 +27768,18 @@
+@@ -69070,43 +27766,18 @@
    return 0;
  }
  _ACEOF
@@ -74855,7 +74757,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_KDC_CRED 1
  _ACEOF
-@@ -69120,20 +27787,14 @@
+@@ -69114,20 +27785,14 @@
  fi
  
  
@@ -74879,7 +74781,7 @@
  /* end confdefs.h.  */
  /* Define krb5_free_error_contents to an innocuous variant, in case <limits.h> declares krb5_free_error_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69174,43 +27835,18 @@
+@@ -69168,43 +27833,18 @@
    return 0;
  }
  _ACEOF
@@ -74929,7 +74831,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_ERROR_CONTENTS 1
  _ACEOF
-@@ -69218,20 +27854,14 @@
+@@ -69212,20 +27852,14 @@
  fi
  
  
@@ -74953,7 +74855,7 @@
  /* end confdefs.h.  */
  /* Define initialize_krb5_error_table to an innocuous variant, in case <limits.h> declares initialize_krb5_error_table.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69272,43 +27902,18 @@
+@@ -69266,43 +27900,18 @@
    return 0;
  }
  _ACEOF
@@ -75003,7 +74905,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
  _ACEOF
-@@ -69316,20 +27921,14 @@
+@@ -69310,20 +27919,14 @@
  fi
  
  
@@ -75027,7 +74929,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_alloc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69370,43 +27969,18 @@
+@@ -69364,43 +27967,18 @@
    return 0;
  }
  _ACEOF
@@ -75077,7 +74979,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -69414,20 +27988,14 @@
+@@ -69408,20 +27986,14 @@
  fi
  
  
@@ -75101,10 +75003,16 @@
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_free to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_free.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69468,43 +28036,18 @@
-   return 0;
- }
- _ACEOF
+@@ -69456,49 +28028,24 @@
+ 
+ int
+ main ()
+-{
+-return krb5_get_init_creds_opt_free ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -75126,6 +75034,12 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++{
++return krb5_get_init_creds_opt_free ();
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_get_init_creds_opt_free=yes
  else
@@ -75151,7 +75065,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
  _ACEOF
-@@ -69512,20 +28055,14 @@
+@@ -69506,20 +28053,14 @@
  fi
  
  
@@ -75175,7 +75089,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_get_error to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_get_error.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69566,43 +28103,18 @@
+@@ -69560,43 +28101,18 @@
    return 0;
  }
  _ACEOF
@@ -75225,7 +75139,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
  _ACEOF
-@@ -69610,20 +28122,14 @@
+@@ -69604,20 +28120,14 @@
  fi
  
  
@@ -75249,7 +75163,7 @@
  /* end confdefs.h.  */
  /* Define krb5_enctype_to_string to an innocuous variant, in case <limits.h> declares krb5_enctype_to_string.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69664,43 +28170,18 @@
+@@ -69658,43 +28168,18 @@
    return 0;
  }
  _ACEOF
@@ -75299,7 +75213,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPE_TO_STRING 1
  _ACEOF
-@@ -69708,20 +28189,14 @@
+@@ -69702,20 +28187,14 @@
  fi
  
  
@@ -75323,7 +75237,7 @@
  /* end confdefs.h.  */
  /* Define krb5_fwd_tgt_creds to an innocuous variant, in case <limits.h> declares krb5_fwd_tgt_creds.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69762,43 +28237,18 @@
+@@ -69756,43 +28235,18 @@
    return 0;
  }
  _ACEOF
@@ -75373,7 +75287,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FWD_TGT_CREDS 1
  _ACEOF
-@@ -69806,20 +28256,14 @@
+@@ -69800,20 +28254,14 @@
  fi
  
  
@@ -75397,7 +75311,7 @@
  /* end confdefs.h.  */
  /* Define krb5_auth_con_set_req_cksumtype to an innocuous variant, in case <limits.h> declares krb5_auth_con_set_req_cksumtype.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69860,43 +28304,18 @@
+@@ -69854,43 +28302,18 @@
    return 0;
  }
  _ACEOF
@@ -75447,7 +75361,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
  _ACEOF
-@@ -69904,20 +28323,14 @@
+@@ -69898,20 +28321,14 @@
  fi
  
  
@@ -75471,7 +75385,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_alloc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69958,43 +28371,18 @@
+@@ -69952,43 +28369,18 @@
    return 0;
  }
  _ACEOF
@@ -75521,7 +75435,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -70002,20 +28390,14 @@
+@@ -69996,20 +28388,14 @@
  fi
  
  
@@ -75545,7 +75459,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_creds_opt_set_impersonate to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_set_impersonate.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -70056,43 +28438,18 @@
+@@ -70050,43 +28436,18 @@
    return 0;
  }
  _ACEOF
@@ -75595,7 +75509,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
  _ACEOF
-@@ -70100,20 +28457,14 @@
+@@ -70094,20 +28455,14 @@
  fi
  
  
@@ -75619,7 +75533,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_creds to an innocuous variant, in case <limits.h> declares krb5_get_creds.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -70154,43 +28505,18 @@
+@@ -70148,43 +28503,18 @@
    return 0;
  }
  _ACEOF
@@ -75669,7 +75583,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS 1
  _ACEOF
-@@ -70198,20 +28524,14 @@
+@@ -70192,20 +28522,14 @@
  fi
  
  
@@ -75693,7 +75607,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_credentials_for_user to an innocuous variant, in case <limits.h> declares krb5_get_credentials_for_user.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -70252,207 +28572,61 @@
+@@ -70246,43 +28570,18 @@
    return 0;
  }
  _ACEOF
@@ -75743,9 +75657,158 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1
  _ACEOF
+@@ -70290,20 +28589,14 @@
+ fi
  
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_host_realm" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_host_realm" >&5
+ $as_echo_n "checking for krb5_get_host_realm... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_host_realm+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_host_realm+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Define krb5_get_host_realm to an innocuous variant, in case <limits.h> declares krb5_get_host_realm.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70344,43 +28637,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_host_realm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_host_realm=no
++  ac_cv_func_ext_krb5_get_host_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
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_host_realm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_host_realm" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_host_realm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_host_realm = yes; then
++    if test $ac_cv_func_ext_krb5_get_host_realm = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_HOST_REALM 1
+ _ACEOF
+@@ -70388,20 +28656,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_host_realm" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_host_realm" >&5
+ $as_echo_n "checking for krb5_free_host_realm... " >&6; }
+-if test "${ac_cv_func_ext_krb5_free_host_realm+set}" = set; then
++if test "${ac_cv_func_ext_krb5_free_host_realm+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Define krb5_free_host_realm to an innocuous variant, in case <limits.h> declares krb5_free_host_realm.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70442,208 +28704,62 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_free_host_realm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_free_host_realm=no
++  ac_cv_func_ext_krb5_free_host_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
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_host_realm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_free_host_realm" >&5
+ $as_echo "$ac_cv_func_ext_krb5_free_host_realm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_free_host_realm = yes; then
++    if test $ac_cv_func_ext_krb5_free_host_realm = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_FREE_HOST_REALM 1
+ _ACEOF
+ 
+ fi
+ 
+-
    # MIT krb5 1.8 does not expose this call (yet)
 -  { $as_echo "$as_me:$LINENO: checking whether krb5_get_credentials_for_user is declared" >&5
 -$as_echo_n "checking whether krb5_get_credentials_for_user is declared... " >&6; }
@@ -75878,27 +75941,27 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_decl_krb5_auth_con_set_req_cksumtype=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_have_decl=0
  fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" >&5
 -$as_echo "$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" >&6; }
 -if test "x$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" = x""yes; then
--
+ 
  cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
 +#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE $ac_have_decl
  _ACEOF
  
  
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
+-_ACEOF
+-
+-
 -fi
 -
 -
@@ -75922,7 +75985,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -70472,57 +28646,30 @@
+@@ -70663,57 +28779,30 @@
    return 0;
  }
  _ACEOF
@@ -75987,7 +76050,7 @@
  /* end confdefs.h.  */
  
  		    #include <krb5.h>
-@@ -70538,58 +28685,31 @@
+@@ -70729,58 +28818,31 @@
    return 0;
  }
  _ACEOF
@@ -76053,7 +76116,7 @@
  /* end confdefs.h.  */
  
  	#include <krb5.h>
-@@ -70601,36 +28721,15 @@
+@@ -70792,36 +28854,15 @@
    return 0;
  }
  _ACEOF
@@ -76093,7 +76156,7 @@
  $as_echo "$smb_krb5_cv_verify_checksum" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -70638,17 +28737,13 @@
+@@ -70829,17 +28870,13 @@
  _ACEOF
  
  
@@ -76114,7 +76177,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70659,56 +28754,29 @@
+@@ -70850,56 +28887,29 @@
    return 0;
  }
  _ACEOF
@@ -76178,7 +76241,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70719,56 +28787,29 @@
+@@ -70910,56 +28920,29 @@
    return 0;
  }
  _ACEOF
@@ -76242,7 +76305,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70779,56 +28820,29 @@
+@@ -70970,56 +28953,29 @@
    return 0;
  }
  _ACEOF
@@ -76306,7 +76369,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70839,56 +28853,29 @@
+@@ -71030,56 +28986,29 @@
    return 0;
  }
  _ACEOF
@@ -76370,7 +76433,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70899,56 +28886,29 @@
+@@ -71090,56 +29019,29 @@
    return 0;
  }
  _ACEOF
@@ -76434,7 +76497,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70959,56 +28919,29 @@
+@@ -71150,56 +29052,29 @@
    return 0;
  }
  _ACEOF
@@ -76498,7 +76561,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71019,56 +28952,29 @@
+@@ -71210,56 +29085,29 @@
    return 0;
  }
  _ACEOF
@@ -76562,7 +76625,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71079,55 +28985,28 @@
+@@ -71270,55 +29118,28 @@
    return 0;
  }
  _ACEOF
@@ -76625,7 +76688,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71138,56 +29017,29 @@
+@@ -71329,56 +29150,29 @@
    return 0;
  }
  _ACEOF
@@ -76689,7 +76752,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71198,56 +29050,29 @@
+@@ -71389,56 +29183,29 @@
    return 0;
  }
  _ACEOF
@@ -76753,7 +76816,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71258,56 +29083,29 @@
+@@ -71449,56 +29216,29 @@
    return 0;
  }
  _ACEOF
@@ -76817,7 +76880,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71318,56 +29116,29 @@
+@@ -71509,56 +29249,29 @@
    return 0;
  }
  _ACEOF
@@ -76881,7 +76944,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71378,47 +29149,22 @@
+@@ -71569,47 +29282,22 @@
    return 0;
  }
  _ACEOF
@@ -76935,7 +76998,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71429,58 +29175,31 @@
+@@ -71620,58 +29308,31 @@
    return 0;
  }
  _ACEOF
@@ -77001,7 +77064,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71491,56 +29210,29 @@
+@@ -71682,56 +29343,29 @@
    return 0;
  }
  _ACEOF
@@ -77065,7 +77128,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71551,56 +29243,29 @@
+@@ -71742,56 +29376,29 @@
    return 0;
  }
  _ACEOF
@@ -77129,10 +77192,12 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71611,56 +29276,29 @@
+@@ -71800,58 +29407,31 @@
+ krb5_keyusage usage = KRB5_KU_OTHER_CKSUM;
+   ;
    return 0;
- }
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -77151,6 +77216,8 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=yes
  else
@@ -77193,7 +77260,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71671,56 +29309,29 @@
+@@ -71862,56 +29442,29 @@
    return 0;
  }
  _ACEOF
@@ -77257,7 +77324,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71731,61 +29342,30 @@
+@@ -71922,61 +29475,30 @@
    return 0;
  }
  _ACEOF
@@ -77328,7 +77395,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71796,56 +29376,29 @@
+@@ -71987,56 +29509,29 @@
    return 0;
  }
  _ACEOF
@@ -77392,7 +77459,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71856,56 +29409,29 @@
+@@ -72047,56 +29542,29 @@
    return 0;
  }
  _ACEOF
@@ -77456,7 +77523,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71916,65 +29442,35 @@
+@@ -72107,65 +29575,35 @@
    return 0;
  }
  _ACEOF
@@ -77533,7 +77600,7 @@
  /* end confdefs.h.  */
  
  #include<krb5.h>
-@@ -71987,65 +29483,32 @@
+@@ -72178,65 +29616,32 @@
      return krb5_kt_resolve(context, "WRFILE:api", &keytab);
    }
  _ACEOF
@@ -77591,6 +77658,70 @@
  
    fi
  
+-  { $as_echo "$as_me:$LINENO: checking for krb5_realm type" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_realm type" >&5
+ $as_echo_n "checking for krb5_realm type... " >&6; }
+-if test "${samba_cv_HAVE_KRB5_REALM_TYPE+set}" = set; then
++if test "${samba_cv_HAVE_KRB5_REALM_TYPE+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <krb5.h>
+ int
+@@ -72247,56 +29652,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_HAVE_KRB5_REALM_TYPE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	samba_cv_HAVE_KRB5_REALM_TYPE=no
++  samba_cv_HAVE_KRB5_REALM_TYPE=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_REALM_TYPE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KRB5_REALM_TYPE" >&5
+ $as_echo "$samba_cv_HAVE_KRB5_REALM_TYPE" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_REALM_TYPE" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB5_REALM_TYPE 1
+-_ACEOF
++$as_echo "#define HAVE_KRB5_REALM_TYPE 1" >>confdefs.h
+ 
+   fi
+ 
 -  { $as_echo "$as_me:$LINENO: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
 +  { $as_echo "$as_me:${as_lineno-$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; }
@@ -77608,7 +77739,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72059,56 +29522,29 @@
+@@ -72310,56 +29688,29 @@
    return 0;
  }
  _ACEOF
@@ -77672,7 +77803,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72119,56 +29555,29 @@
+@@ -72370,56 +29721,29 @@
    return 0;
  }
  _ACEOF
@@ -77736,7 +77867,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72180,49 +29589,26 @@
+@@ -72431,49 +29755,26 @@
    return 0;
  }
  _ACEOF
@@ -77792,7 +77923,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72236,20 +29622,13 @@
+@@ -72487,20 +29788,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -77818,7 +77949,7 @@
  /* end confdefs.h.  */
  
  		#include <stdlib.h>
-@@ -72263,42 +29642,15 @@
+@@ -72514,42 +29808,15 @@
  		}
  
  _ACEOF
@@ -77865,7 +77996,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72310,20 +29662,18 @@
+@@ -72561,20 +29828,18 @@
  	export LDFLAGS;
  
  fi
@@ -77890,7 +78021,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72337,20 +29687,13 @@
+@@ -72588,20 +29853,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -77916,7 +78047,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -72361,42 +29704,15 @@
+@@ -72612,42 +29870,15 @@
  		}
  
  _ACEOF
@@ -77963,7 +78094,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72408,29 +29724,23 @@
+@@ -72659,29 +29890,23 @@
  	export LDFLAGS;
  
  fi
@@ -77998,7 +78129,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72441,61 +29751,30 @@
+@@ -72692,61 +29917,30 @@
    return 0;
  }
  _ACEOF
@@ -78069,7 +78200,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72506,47 +29785,20 @@
+@@ -72757,47 +29951,20 @@
    return 0;
  }
  _ACEOF
@@ -78123,7 +78254,7 @@
  
    fi
  
-@@ -72558,7 +29810,7 @@
+@@ -72809,7 +29976,7 @@
    #
    #
    if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -78132,7 +78263,7 @@
  $as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
      use_ads=no
    fi
-@@ -72566,7 +29818,7 @@
+@@ -72817,7 +29984,7 @@
    if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \
            x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes"
    then
@@ -78141,7 +78272,7 @@
  $as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -72574,7 +29826,7 @@
+@@ -72825,7 +29992,7 @@
    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
@@ -78150,7 +78281,7 @@
  $as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -72582,7 +29834,7 @@
+@@ -72833,7 +30000,7 @@
    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
@@ -78159,7 +78290,7 @@
  $as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -72590,7 +29842,7 @@
+@@ -72841,7 +30008,7 @@
    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
@@ -78168,7 +78299,7 @@
  $as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -72602,14 +29854,14 @@
+@@ -72853,14 +30020,14 @@
  
        if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
        then
@@ -78185,7 +78316,7 @@
  $as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
  	use_ads=no
        fi
-@@ -72618,29 +29870,21 @@
+@@ -72869,29 +30036,21 @@
  
    if test x"$use_ads" = x"yes"; then
  
@@ -78220,7 +78351,7 @@
  $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
      fi
  
-@@ -72666,9 +29910,9 @@
+@@ -72917,9 +30076,9 @@
      KRB5_LIBS=""
      with_ads_support=no
    fi
@@ -78232,7 +78363,7 @@
  $as_echo "$use_ads" >&6; }
  
  LIBS="$ac_save_LIBS"
-@@ -72680,23 +29924,17 @@
+@@ -72931,23 +30090,17 @@
  
  
  
@@ -78259,7 +78390,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -72714,54 +29952,28 @@
+@@ -72965,54 +30118,28 @@
    return 0;
  }
  _ACEOF
@@ -78321,7 +78452,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSCD 1
  _ACEOF
-@@ -72776,7 +29988,6 @@
+@@ -73027,7 +30154,6 @@
  
  
  fi
@@ -78329,7 +78460,7 @@
  PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
  
  
-@@ -72784,12 +29995,12 @@
+@@ -73035,12 +30161,12 @@
  # Compile with DNS Updates support?
  
  with_dnsupdate_support=no
@@ -78344,7 +78475,7 @@
    withval=$with_dnsupdate;  case "$withval" in
      yes|no)
  	with_dnsupdate_support=$withval
-@@ -72798,7 +30009,7 @@
+@@ -73049,7 +30175,7 @@
  fi
  
  
@@ -78353,7 +78484,7 @@
  $as_echo "$with_dnsupdate_support" >&6; }
  
  if test x"$with_dnsupdate_support" != x"no"; then
-@@ -72812,151 +30023,12 @@
+@@ -73063,151 +30189,12 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
@@ -78510,7 +78641,7 @@
  _ACEOF
  
  fi
-@@ -72966,11 +30038,9 @@
+@@ -73217,11 +30204,9 @@
  
    if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
  	if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78524,7 +78655,7 @@
  $as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
  	fi
  	with_dnsupdate_support=no
-@@ -72986,102 +30056,12 @@
+@@ -73237,102 +30222,12 @@
  
    UUID_LIBS=""
  
@@ -78632,7 +78763,7 @@
  _ACEOF
  
          # uuid_generate was found in libc or existing $LIBS
-@@ -73098,9 +30078,7 @@
+@@ -73349,9 +30244,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -78643,7 +78774,7 @@
  
  
  
-@@ -73113,11 +30091,9 @@
+@@ -73364,11 +30257,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78657,7 +78788,7 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73126,18 +30102,14 @@
+@@ -73377,18 +30268,14 @@
  	    ;;
            *)
  	    # uuid_generate was not found, try adding libuuid
@@ -78679,7 +78810,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -73155,43 +30127,18 @@
+@@ -73406,43 +30293,18 @@
    return 0;
  }
  _ACEOF
@@ -78729,7 +78860,7 @@
  
  		LIBS="-luuid $LIBS"
  
-@@ -73207,9 +30154,7 @@
+@@ -73458,9 +30320,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -78740,7 +78871,7 @@
  
  
  
-@@ -73219,11 +30164,9 @@
+@@ -73470,11 +30330,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78754,7 +78885,7 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73243,28 +30186,26 @@
+@@ -73494,28 +30352,26 @@
  
  #################################################
  # check for automount support
@@ -78789,7 +78920,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -73275,34 +30216,30 @@
+@@ -73526,34 +30382,30 @@
  CIFSMOUNT_PROGS=""
  INSTALL_CIFSMOUNT=""
  UNINSTALL_CIFSMOUNT=""
@@ -78830,7 +78961,7 @@
  		;;
  	esac
      ;;
-@@ -73310,19 +30247,17 @@
+@@ -73561,19 +30413,17 @@
  else
     case "$host_os" in
    *linux*)
@@ -78853,7 +78984,7 @@
  $as_echo "no" >&6; }
  	;;
    esac
-@@ -73333,192 +30268,49 @@
+@@ -73584,40 +30434,36 @@
  CIFSUMOUNT_PROGS=""
  INSTALL_CIFSUMOUNT=""
  UNINSTALL_CIFSUMOUNT=""
@@ -78897,15 +79028,16 @@
    esac
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ fi
+@@ -73625,151 +30471,12 @@
+ 
+ #################################################
+ # check for cifs.upcall support
 -
--fi
--
--
--#################################################
--# check for cifs.upcall support
--
--for ac_header in keyutils.h
+ for ac_header in keyutils.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -79042,18 +79174,11 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- fi
+-
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+
-+#################################################
-+# check for cifs.upcall support
-+for ac_header in keyutils.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "keyutils.h" "ac_cv_header_keyutils_h" "$ac_includes_default"
 +if test "x$ac_cv_header_keyutils_h" = x""yes; then :
@@ -79063,7 +79188,7 @@
  _ACEOF
   HAVE_KEYUTILS_H=1
  else
-@@ -73530,34 +30322,28 @@
+@@ -73781,34 +30488,28 @@
  CIFSUPCALL_PROGS=""
  INSTALL_CIFSUPCALL=""
  UNINSTALL_CIFSUPCALL=""
@@ -79105,7 +79230,7 @@
  
  			CIFSUPCALL_PROGS="bin/cifs.upcall"
  			INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73565,9 +30351,7 @@
+@@ -73816,9 +30517,7 @@
  		fi
  		;;
  	*)
@@ -79116,7 +79241,7 @@
  		;;
  	esac
      ;;
-@@ -73576,18 +30360,16 @@
+@@ -73827,210 +30526,70 @@
     case "$host_os" in
    *linux*)
  	if test x"$use_ads" != x"yes"; then
@@ -79139,44 +79264,53 @@
  
  		CIFSUPCALL_PROGS="bin/cifs.upcall"
  		INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73595,7 +30377,7 @@
+ 		UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
  	fi
  	;;
-   *)
+-  *)
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   esac
-@@ -73612,11 +30394,11 @@
- 
- with_pam_for_crypt=no
- try_pam=auto
+-$as_echo "no" >&6; }
+-	;;
+-  esac
+-
+-fi
+-
+-
+-
+-#################################################
+-# Check for a PAM clear-text auth, accounts, password
+-# and session support. Most PAM implementations keep their
+-# headers in /usr/include/security. Darwin keeps its in
+-# /usr/include/pam.
+-
+-with_pam_for_crypt=no
+-try_pam=auto
 -{ $as_echo "$as_me:$LINENO: checking whether to try PAM support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
- $as_echo_n "checking whether to try PAM support... " >&6; }
- 
- # Check whether --with-pam was given.
+-$as_echo_n "checking whether to try PAM support... " >&6; }
+-
+-# Check whether --with-pam was given.
 -if test "${with_pam+set}" = set; then
-+if test "${with_pam+set}" = set; then :
-   withval=$with_pam;  case "$withval" in
-   yes|no|auto)
-     try_pam=$withval
-@@ -73625,7 +30407,7 @@
- 
- fi
- 
+-  withval=$with_pam;  case "$withval" in
+-  yes|no|auto)
+-    try_pam=$withval
+-    ;;
+-  esac
+-
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: result: $try_pam" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_pam" >&5
- $as_echo "$try_pam" >&6; }
- 
- use_pam=no
-@@ -73636,150 +30418,12 @@
- 
- 	# Most systems have PAM headers in /usr/include/security, but Darwin
- 	# has them in /usr/include/pam.
+-$as_echo "$try_pam" >&6; }
 -
+-use_pam=no
+-create_pam_modules=no
+-if test x"${try_pam}" != x"no";then
+-	use_pam=yes
+-	create_pam_modules=yes
 -
+-	# Most systems have PAM headers in /usr/include/security, but Darwin
+-	# has them in /usr/include/pam.
+-
+-
 -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`
@@ -79225,14 +79359,19 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  *)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	;;
++  esac
+ 
 -	ac_header_compiler=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -79265,14 +79404,23 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
 -fi
--
++#################################################
++# Check for a PAM clear-text auth, accounts, password
++# and session support. Most PAM implementations keep their
++# headers in /usr/include/security. Darwin keeps its in
++# /usr/include/pam.
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++with_pam_for_crypt=no
++try_pam=auto
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
++$as_echo_n "checking whether to try PAM support... " >&6; }
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -79301,7 +79449,12 @@
 -## ---------------------------------------- ##
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
++# Check whether --with-pam was given.
++if test "${with_pam+set}" = set; then :
++  withval=$with_pam;  case "$withval" in
++  yes|no|auto)
++    try_pam=$withval
+     ;;
 -esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
@@ -79314,11 +79467,24 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
--fi
++  esac
+ 
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_pam" >&5
++$as_echo "$try_pam" >&6; }
++
++use_pam=no
++create_pam_modules=no
++if test x"${try_pam}" != x"no";then
++	use_pam=yes
++	create_pam_modules=yes
++
++	# Most systems have PAM headers in /usr/include/security, but Darwin
++	# has them in /usr/include/pam.
 +	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`
@@ -79328,7 +79494,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -73791,9 +30435,7 @@
+@@ -74042,9 +30601,7 @@
  	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
@@ -79339,7 +79505,7 @@
  		fi
  		use_pam=no
  		create_pam_modules=no
-@@ -73801,23 +30443,17 @@
+@@ -74052,23 +30609,17 @@
  
  
  
@@ -79366,7 +79532,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -73835,54 +30471,28 @@
+@@ -74086,54 +30637,28 @@
    return 0;
  }
  _ACEOF
@@ -79428,7 +79594,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -73897,34 +30507,18 @@
+@@ -74148,34 +30673,18 @@
  
  
  fi
@@ -79468,7 +79634,7 @@
  		#if HAVE_SECURITY_PAM_APPL_H
  		#include <security/pam_appl.h>
  		#endif
-@@ -73932,44 +30526,9 @@
+@@ -74183,44 +30692,9 @@
  		#include <pam/pam_appl.h>
  		#endif
  
@@ -79516,7 +79682,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -73981,179 +30540,33 @@
+@@ -74232,179 +30706,33 @@
  	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
@@ -79706,7 +79872,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74162,150 +30575,12 @@
+@@ -74413,150 +30741,12 @@
  
  done
  
@@ -79863,7 +80029,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74316,19 +30591,14 @@
+@@ -74567,19 +30757,14 @@
  
  
  
@@ -79886,7 +80052,7 @@
  /* end confdefs.h.  */
  /* Define pam_vsyslog to an innocuous variant, in case <limits.h> declares pam_vsyslog.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -74369,72 +30639,42 @@
+@@ -74620,72 +30805,42 @@
    return 0;
  }
  _ACEOF
@@ -79971,7 +80137,7 @@
  /* end confdefs.h.  */
  
  #if (!defined(LINUX))
-@@ -74472,36 +30712,11 @@
+@@ -74723,36 +30878,11 @@
    return 0;
  }
  _ACEOF
@@ -80010,7 +80176,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  #################################################
-@@ -74511,19 +30726,17 @@
+@@ -74762,19 +30892,17 @@
  UNINSTALL_PAM_MODULES=""
  
  try_pam_smbpass=auto
@@ -80033,7 +80199,7 @@
    ;;
    esac
  
-@@ -74537,16 +30750,12 @@
+@@ -74788,16 +30916,12 @@
  	# Conditions under which pam_smbpass can't be built.
  	if test x"$BLDSHARED" != xtrue ; then
  		if test x"${try_pam_smbpass}" = xyes ; then
@@ -80052,7 +80218,7 @@
  		fi
  		use_pam_smbpass=no
  	fi
-@@ -74557,7 +30766,7 @@
+@@ -74808,7 +30932,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  fi
@@ -80061,7 +80227,7 @@
  $as_echo "$use_pam_smbpass" >&6; }
  
  
-@@ -74568,98 +30777,63 @@
+@@ -74819,98 +30943,63 @@
  ## $with_pam_for_crypt variable as above   --jerry
  ##
  if test $with_pam_for_crypt = no; then
@@ -80176,7 +80342,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -74667,28 +30841,26 @@
+@@ -74918,28 +31007,26 @@
  
  #################################################
  # check for syslog logging
@@ -80211,7 +80377,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -74696,16 +30868,14 @@
+@@ -74947,16 +31034,14 @@
  
  #################################################
  # check for custom syslog facility
@@ -80231,7 +80397,7 @@
    else
       if test "$withval" != "yes" ; then
          syslog_facility="$withval"
-@@ -74730,14 +30900,14 @@
+@@ -74981,14 +31066,14 @@
  samba_cv_TRY_SYS_QUOTAS=auto
  samba_cv_SYSQUOTA_FOUND=no
  
@@ -80249,7 +80415,7 @@
  $as_echo "yes" >&6; }
      samba_cv_WITH_QUOTAS=yes
      samba_cv_TRY_QUOTAS=yes
-@@ -74746,7 +30916,7 @@
+@@ -74997,7 +31082,7 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    auto)
@@ -80258,7 +80424,7 @@
  $as_echo "auto" >&6; }
      samba_cv_WITH_QUOTAS=auto
      samba_cv_TRY_QUOTAS=auto
-@@ -74755,719 +30925,165 @@
+@@ -75006,74 +31091,74 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    no)
@@ -80322,61 +80488,63 @@
    esac
  else
 -  { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
--$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
--
--fi
--
--
--if test x"$samba_cv_TRY_SYS_QUOTAS" = x"auto"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+ $as_echo "${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; }
--  case "$host_os" in
--	*linux*)
++{ $as_echo "$as_me:${as_lineno-$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; }
+   case "$host_os" in
+ 	*linux*)
 -	    { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--            samba_cv_TRY_SYS_QUOTAS=yes
--            samba_cv_RUN_QUOTA_TESTS=yes
--	    ;;
--	*)
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "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; }
--            samba_cv_TRY_SYS_QUOTAS=no
--	    ;;
--  esac
--fi
--
--#############################################
--# only check for quota stuff if --with-quotas
--if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
--
--case "$host_os" in
--	# on linux we didn't need to test we have builtin support
--	*linux*)
--	    samba_cv_SYSQUOTA_FOUND=yes
--
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+             samba_cv_TRY_SYS_QUOTAS=no
+ 	    ;;
+@@ -75089,636 +31174,82 @@
+ 	*linux*)
+ 	    samba_cv_SYSQUOTA_FOUND=yes
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_QUOTACTL_LINUX 1
 -_ACEOF
--
--	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
++$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
+ 
+ 	    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:${as_lineno-$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; }
--
--
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LINUX_XFS_QUOTAS 1
 -_ACEOF
--
--	    samba_cv_found_xfs_header=yes
++$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
+ 
+ 	    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:${as_lineno-$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; }
--	    ;;
--	*solaris*)
--	    # need to set this define when using static linking (BUG 1473)
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	    ;;
+ 	*solaris*)
+ 	    # need to set this define when using static linking (BUG 1473)
 -	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
 -	    ;;
 -	*)
@@ -80671,49 +80839,22 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-+$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
- 
- fi
+-
+-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
- 
-+
-+if test x"$samba_cv_TRY_SYS_QUOTAS" = x"auto"; then
-+{ $as_echo "$as_me:${as_lineno-$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; }
-+  case "$host_os" in
-+	*linux*)
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+            samba_cv_TRY_SYS_QUOTAS=yes
-+            samba_cv_RUN_QUOTA_TESTS=yes
-+	    ;;
-+	*)
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+            samba_cv_TRY_SYS_QUOTAS=no
-+	    ;;
-+  esac
- fi
- 
+-
+-fi
+-
 -done
-+#############################################
-+# only check for quota stuff if --with-quotas
-+if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
- 
-+case "$host_os" in
-+	# on linux we didn't need to test we have builtin support
-+	*linux*)
-+	    samba_cv_SYSQUOTA_FOUND=yes
- 
+-
+-
 -# For quotas on Linux XFS filesystems
-+$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
- 
+-
 -for ac_header in linux/dqblk_xfs.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -80762,20 +80903,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
-+	    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
+-
 -	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; }
-+$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
- 
+-
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -80791,19 +80926,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+	    samba_cv_found_xfs_header=yes
-+	    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	    ;;
-+	*solaris*)
-+	    # need to set this define when using static linking (BUG 1473)
-+	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
-+	    ;;
-+	*)
-+	    ;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
@@ -80820,6 +80943,11 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
++	    ;;
++	*)
++	    ;;
++esac
  
 -  ac_header_preproc=no
 -fi
@@ -81063,7 +81191,7 @@
  _ACEOF
  
  fi
-@@ -75477,17 +31093,13 @@
+@@ -75728,17 +31259,13 @@
  
  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
@@ -81084,7 +81212,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -75507,35 +31119,14 @@
+@@ -75758,35 +31285,14 @@
    return 0;
  }
  _ACEOF
@@ -81123,7 +81251,7 @@
  $as_echo "$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
-@@ -75543,17 +31134,13 @@
+@@ -75794,17 +31300,13 @@
  fi
  
  # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -81144,7 +81272,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -75571,41 +31158,18 @@
+@@ -75822,41 +31324,18 @@
    return 0;
  }
  _ACEOF
@@ -81190,7 +81318,7 @@
  
  fi
  
-@@ -75613,9 +31177,9 @@
+@@ -75864,9 +31343,9 @@
  # look for a working quota system
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -81202,7 +81330,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -75629,14 +31193,10 @@
+@@ -75880,14 +31359,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81219,7 +81347,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4A 1
-@@ -75644,42 +31204,15 @@
+@@ -75895,42 +31370,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81266,7 +81394,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -75691,23 +31224,21 @@
+@@ -75942,23 +31390,21 @@
  	export LDFLAGS;
  
  fi
@@ -81294,7 +81422,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -75721,14 +31252,10 @@
+@@ -75972,14 +31418,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81311,7 +81439,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4B 1
-@@ -75736,42 +31263,15 @@
+@@ -75987,42 +31429,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81358,7 +81486,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -75783,24 +31283,22 @@
+@@ -76034,24 +31449,22 @@
  	export LDFLAGS;
  
  fi
@@ -81387,7 +81515,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -75814,14 +31312,10 @@
+@@ -76065,14 +31478,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81404,7 +81532,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_3 1
-@@ -75829,42 +31323,15 @@
+@@ -76080,42 +31489,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81451,7 +81579,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -75876,15 +31343,13 @@
+@@ -76127,15 +31509,13 @@
  	export LDFLAGS;
  
  fi
@@ -81469,7 +81597,7 @@
  
      samba_cv_sysquotas_file="lib/sysquotas_3.c"
  fi
-@@ -75892,151 +31357,12 @@
+@@ -76143,151 +31523,12 @@
  
  #################################################
  # check for mntent.h and struct mntent
@@ -81625,7 +81753,7 @@
  _ACEOF
  
  fi
-@@ -76045,102 +31371,12 @@
+@@ -76296,102 +31537,12 @@
  
  #################################################
  # check for setmntent,getmntent,endmntent
@@ -81733,7 +81861,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -76151,151 +31387,12 @@
+@@ -76402,151 +31553,12 @@
  
  #################################################
  # check for devnm.h and struct mntent
@@ -81889,7 +82017,7 @@
  _ACEOF
  
  fi
-@@ -76304,102 +31401,12 @@
+@@ -76555,102 +31567,12 @@
  
  #################################################
  # check for devnm
@@ -81996,7 +82124,7 @@
  _ACEOF
  
  fi
-@@ -76422,19 +31429,15 @@
+@@ -76673,19 +31595,15 @@
  fi
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -82019,7 +82147,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76452,76 +31455,47 @@
+@@ -76703,76 +31621,47 @@
    return 0;
  }
  _ACEOF
@@ -82107,7 +82235,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76539,62 +31513,35 @@
+@@ -76790,62 +31679,35 @@
    return 0;
  }
  _ACEOF
@@ -82177,7 +82305,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76610,56 +31557,33 @@
+@@ -76861,56 +31723,33 @@
    return 0;
  }
  _ACEOF
@@ -82242,7 +82370,7 @@
  $as_echo "no" >&6; }
      fi
  fi
-@@ -76671,12 +31595,12 @@
+@@ -76922,12 +31761,12 @@
  #################################################
  # check for experimental utmp accounting
  
@@ -82257,7 +82385,7 @@
    withval=$with_utmp;  case "$withval" in
    no)
  		WITH_UTMP=no
-@@ -76699,41 +31623,35 @@
+@@ -76950,41 +31789,35 @@
  # Display test results
  
  if test x"$WITH_UTMP" = x"yes"; then
@@ -82307,7 +82435,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -76747,51 +31665,22 @@
+@@ -76998,51 +31831,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -82365,7 +82493,7 @@
  
    fi
  fi
-@@ -76804,16 +31693,12 @@
+@@ -77055,16 +31859,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -82385,10 +82513,12 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -76825,47 +31710,20 @@
+@@ -77074,49 +31874,22 @@
+ struct statvfs fsd; statvfs (0, &fsd);
+   ;
    return 0;
- }
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -82410,6 +82540,8 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    fu_cv_sys_stat_statvfs=yes
  else
@@ -82439,7 +82571,7 @@
  
    fi
  fi
-@@ -76873,17 +31731,13 @@
+@@ -77124,17 +31897,13 @@
  # smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
  # This is not the case on ancient Linux systems.
  
@@ -82460,7 +82592,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -76895,57 +31749,30 @@
+@@ -77146,57 +31915,30 @@
    return 0;
  }
  _ACEOF
@@ -82525,7 +82657,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -76957,56 +31784,29 @@
+@@ -77208,56 +31950,29 @@
    return 0;
  }
  _ACEOF
@@ -82589,7 +82721,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77018,55 +31818,28 @@
+@@ -77269,55 +31984,28 @@
    return 0;
  }
  _ACEOF
@@ -82652,7 +82784,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77078,59 +31851,32 @@
+@@ -77329,59 +32017,32 @@
    return 0;
  }
  _ACEOF
@@ -82720,7 +82852,7 @@
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -77143,71 +31889,38 @@
+@@ -77394,71 +32055,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -82802,7 +82934,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -77226,71 +31939,38 @@
+@@ -77477,71 +32105,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -82884,7 +83016,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -77300,71 +31980,38 @@
+@@ -77551,71 +32146,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -82966,7 +83098,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -77380,71 +32027,38 @@
+@@ -77631,71 +32193,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -83048,7 +83180,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -77464,52 +32078,23 @@
+@@ -77715,52 +32244,23 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -83107,7 +83239,7 @@
  
    fi
  fi
-@@ -77522,13 +32107,9 @@
+@@ -77773,13 +32273,9 @@
  # If we don't have all of these then disable large
  # file support.
  #
@@ -83123,7 +83255,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -77545,41 +32126,18 @@
+@@ -77796,41 +32292,18 @@
    return 0;
  }
  _ACEOF
@@ -83169,7 +83301,7 @@
  $as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
  
  #################################################
-@@ -77589,10 +32147,10 @@
+@@ -77840,10 +32313,10 @@
  
  
  # Check whether --with-ctdb was given.
@@ -83182,7 +83314,7 @@
  $as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
      ;;
    *)
-@@ -77606,71 +32164,23 @@
+@@ -77857,71 +32330,23 @@
  CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
  ctdb_broken="missing or broken headers"
  
@@ -83264,7 +83396,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -77681,17 +32191,13 @@
+@@ -77932,17 +32357,13 @@
  
  
  
@@ -83285,7 +83417,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -77712,41 +32218,18 @@
+@@ -77963,41 +32384,18 @@
    return 0;
  }
  _ACEOF
@@ -83331,7 +83463,7 @@
  
   fi
  
-@@ -77757,351 +32240,13 @@
+@@ -78008,17 +32406,13 @@
  fi
  
  
@@ -83339,34 +83471,23 @@
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_ACTIVE declaration" >&5
  $as_echo_n "checking for CTDB_CONTROL_TRANS2_ACTIVE declaration... " >&6; }
 -if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--
++if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include "confdefs.h"
--#define NO_CONFIG_H
--#include "replace.h"
--#include "system/wait.h"
--#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
--
--int
--main ()
--{
--int i = (int)CTDB_CONTROL_TRANS2_ACTIVE
--  ;
--  return 0;
--}
--_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include "confdefs.h"
+@@ -78039,41 +32433,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -83385,33 +83506,34 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=no
--fi
++  ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=no
+ fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
--$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
-- if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
+ $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
+  if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1
 -_ACEOF
--
-- fi
--
--if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
--	ctdb_broken=no
--else
--	ctdb_broken="transaction support too old"
--fi
--
--# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1" >>confdefs.h
+ 
+  fi
+ 
+@@ -78084,255 +32455,43 @@
+ fi
+ 
+ # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
 -$as_echo_n "checking for struct ctdb_tcp_client... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_tcp_client+set}" = set; then
@@ -83471,16 +83593,21 @@
 -/* end confdefs.h.  */
 -
 -#include "confdefs.h"
--#define NO_CONFIG_H
++ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
++#include \"confdefs.h\"
+ #define NO_CONFIG_H
 -#include "replace.h"
 -#include "system/wait.h"
 -#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
+ #include <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+ 
 -
--
 -int
 -main ()
 -{
@@ -83529,16 +83656,19 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_tcp_client" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_tcp_client" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then
--
--
++"
++if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define ctdb_control_tcp ctdb_tcp_client
 -_ACEOF
--
--
--fi
--
--
++$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
+ 
+ 
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
 -$as_echo_n "checking for struct ctdb_control_tcp... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_control_tcp+set}" = set; then
@@ -83598,16 +83728,21 @@
 -/* end confdefs.h.  */
 -
 -#include "confdefs.h"
--#define NO_CONFIG_H
++ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
++#include \"confdefs.h\"
+ #define NO_CONFIG_H
 -#include "replace.h"
 -#include "system/wait.h"
 -#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
+ #include <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+ 
 -
--
 -int
 -main ()
 -{
@@ -83656,52 +83791,54 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_control_tcp" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then
--
--
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_CTDB_CONTROL_TCP 1
 -_ACEOF
--
--
--else
--
--	ctdb_broken="missing struct ctdb_control_tcp"
--
--fi
--
--
++$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
+ 
+ 
+ else
+@@ -78342,139 +32501,33 @@
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp_addr" >&5
 -$as_echo_n "checking for struct ctdb_control_tcp_addr... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_control_tcp_addr+set}" = set; then
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_struct_ctdb_control_tcp_addr=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include "confdefs.h"
-@@ -78114,116 +32259,109 @@
- #include <ctdb.h>
- #include <ctdb_private.h>
- 
+-/* end confdefs.h.  */
 -
- int
- main ()
- {
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-
+-int
+-main ()
+-{
 -if (sizeof (struct ctdb_control_tcp_addr))
 -       return 0;
-+int i = (int)CTDB_CONTROL_TRANS2_ACTIVE
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -83726,30 +83863,9 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=yes
-+else
-+  ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
-+$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
-+ if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
- 
+-
 -#include "confdefs.h"
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
-+	ctdb_broken=no
-+else
-+	ctdb_broken="transaction support too old"
-+fi
-+
-+# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
-+ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
++ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
 +#include \"confdefs.h\"
  #define NO_CONFIG_H
 -#include "replace.h"
@@ -83763,12 +83879,7 @@
  #include <ctdb.h>
  #include <ctdb_private.h>
  
-+"
-+if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
-+
-+
-+$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
- 
+-
 -int
 -main ()
 -{
@@ -83800,62 +83911,30 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_struct_ctdb_control_tcp_addr=yes
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
-+#include \"confdefs.h\"
-+#define NO_CONFIG_H
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+#include <ctdb_private.h>
-+
-+"
-+if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
-+
-+
-+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
-+
-+
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
-+	ctdb_broken="missing struct ctdb_control_tcp"
- 
- fi
- 
+-
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp_addr" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_control_tcp_addr" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then
- 
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
-+#include \"confdefs.h\"
-+#define NO_CONFIG_H
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+#include <ctdb_private.h>
-+
 +"
 +if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
  
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1
 -_ACEOF
-+
 +$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1" >>confdefs.h
  
  
@@ -83873,7 +83952,7 @@
    withval=$with_cluster_support;
  fi
  
-@@ -78234,44 +32372,38 @@
+@@ -78485,44 +32538,38 @@
  
  if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
  	if test "x$with_cluster_support" = "xyes"; then
@@ -83925,7 +84004,7 @@
    withval=$with_acl_support;  case "$withval" in
  	yes|no)
  		with_acl_support="$withval"
-@@ -78284,105 +32416,85 @@
+@@ -78535,105 +32582,85 @@
  	with_acl_support="auto"
  fi
  
@@ -84052,7 +84131,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78400,60 +32512,31 @@
+@@ -78651,60 +32678,31 @@
    return 0;
  }
  _ACEOF
@@ -84122,7 +84201,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78471,61 +32554,32 @@
+@@ -78722,61 +32720,32 @@
    return 0;
  }
  _ACEOF
@@ -84193,7 +84272,7 @@
  /* end confdefs.h.  */
  
  				#include <sys/types.h>
-@@ -78544,64 +32598,33 @@
+@@ -78795,64 +32764,33 @@
    return 0;
  }
  _ACEOF
@@ -84268,7 +84347,7 @@
  /* end confdefs.h.  */
  
  					#include <sys/types.h>
-@@ -78619,58 +32642,29 @@
+@@ -78870,58 +32808,29 @@
    return 0;
  }
  _ACEOF
@@ -84335,7 +84414,7 @@
  
  		fi
  		;;
-@@ -78682,31 +32676,27 @@
+@@ -78933,31 +32842,27 @@
  #################################################
  # check for AIO support
  
@@ -84373,7 +84452,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78724,58 +32714,29 @@
+@@ -78975,58 +32880,29 @@
    return 0;
  }
  _ACEOF
@@ -84441,7 +84520,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78793,59 +32754,30 @@
+@@ -79044,59 +32920,30 @@
    return 0;
  }
  _ACEOF
@@ -84510,7 +84589,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -78857,55 +32789,26 @@
+@@ -79108,55 +32955,26 @@
    return 0;
  }
  _ACEOF
@@ -84574,7 +84653,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -78917,716 +32820,317 @@
+@@ -79168,716 +32986,317 @@
    return 0;
  }
  _ACEOF
@@ -85429,7 +85508,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -79643,30 +33147,26 @@
+@@ -79894,30 +33313,26 @@
  # check for sendfile support
  
  with_sendfile_support=yes
@@ -85466,7 +85545,7 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -79682,53 +33182,24 @@
+@@ -79933,53 +33348,24 @@
    return 0;
  }
  _ACEOF
@@ -85528,7 +85607,7 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -79744,54 +33215,25 @@
+@@ -79995,54 +33381,25 @@
    return 0;
  }
  _ACEOF
@@ -85591,7 +85670,7 @@
  /* end confdefs.h.  */
  \
  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -79811,103 +33253,58 @@
+@@ -80062,103 +33419,58 @@
    return 0;
  }
  _ACEOF
@@ -85712,16 +85791,10 @@
  /* end confdefs.h.  */
  \
  #include <sys/types.h>
-@@ -79928,82 +33325,47 @@
- 	hdr.trl_cnt = 0;
- 	hdtrl.iov_base = NULL;
- 	hdtrl.iov_len = 0;
--	ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
--
--  ;
--  return 0;
--}
--_ACEOF
+@@ -80185,76 +33497,41 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -85743,12 +85816,6 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+	ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    samba_cv_HAVE_SENDFILE=yes
  else
@@ -85813,7 +85880,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80027,73 +33389,38 @@
+@@ -80278,73 +33555,38 @@
    return 0;
  }
  _ACEOF
@@ -85899,7 +85966,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80117,77 +33444,41 @@
+@@ -80368,77 +33610,41 @@
    return 0;
  }
  _ACEOF
@@ -85989,7 +86056,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80205,43 +33496,18 @@
+@@ -80456,43 +33662,18 @@
    return 0;
  }
  _ACEOF
@@ -86039,7 +86106,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSENDFILE 1
  _ACEOF
-@@ -80250,17 +33516,13 @@
+@@ -80501,17 +33682,13 @@
  
  fi
  
@@ -86060,7 +86127,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80291,74 +33553,39 @@
+@@ -80542,74 +33719,39 @@
    return 0;
  }
  _ACEOF
@@ -86147,7 +86214,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80389,75 +33616,40 @@
+@@ -80640,75 +33782,40 @@
    return 0;
  }
  _ACEOF
@@ -86235,7 +86302,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80485,59 +33677,28 @@
+@@ -80736,59 +33843,28 @@
    return 0;
  }
  _ACEOF
@@ -86304,7 +86371,7 @@
  $as_echo "no" >&6; };
  	fi
  	;;
-@@ -80546,12 +33707,12 @@
+@@ -80797,12 +33873,12 @@
          esac
          ;;
    *)
@@ -86319,7 +86386,7 @@
  $as_echo "yes" >&6; }
  
  fi
-@@ -80560,17 +33721,13 @@
+@@ -80811,17 +33887,13 @@
  ############################################
  # See if we have the Linux readahead syscall.
  
@@ -86340,7 +86407,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80585,62 +33742,31 @@
+@@ -80836,62 +33908,31 @@
    return 0;
  }
  _ACEOF
@@ -86412,7 +86479,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -80651,41 +33777,18 @@
+@@ -80902,41 +33943,18 @@
    return 0;
  }
  _ACEOF
@@ -86458,7 +86525,7 @@
  
   fi
  
-@@ -80693,17 +33796,13 @@
+@@ -80944,17 +33962,13 @@
  ############################################
  # See if we have the posix_fadvise syscall.
  
@@ -86479,7 +86546,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80718,47 +33817,20 @@
+@@ -80969,47 +33983,20 @@
    return 0;
  }
  _ACEOF
@@ -86533,7 +86600,7 @@
  
  fi
  
-@@ -80767,17 +33839,13 @@
+@@ -81018,17 +34005,13 @@
  
  case "$host_os" in
  *linux*)
@@ -86554,7 +86621,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80792,40 +33860,15 @@
+@@ -81043,40 +34026,15 @@
    return 0;
  }
  _ACEOF
@@ -86600,7 +86667,7 @@
  $as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
  ;;
  *)
-@@ -80835,24 +33878,18 @@
+@@ -81086,24 +34044,18 @@
  
  if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
  
@@ -86629,7 +86696,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -80863,41 +33900,18 @@
+@@ -81114,41 +34066,18 @@
    return 0;
  }
  _ACEOF
@@ -86675,7 +86742,7 @@
  
   fi
  
-@@ -80905,68 +33919,35 @@
+@@ -81156,68 +34085,35 @@
  ############################################
  # See if we have the a broken readlink syscall.
  
@@ -86754,7 +86821,7 @@
  
  fi
  
-@@ -80974,7 +33955,7 @@
+@@ -81225,7 +34121,7 @@
  # Check whether winbind is supported on this platform.  If so we need to
  # build and install client programs, sbin programs and shared libraries
  
@@ -86763,7 +86830,7 @@
  $as_echo_n "checking whether to build winbind... " >&6; }
  
  # Initially, the value of $host_os decides whether winbind is supported
-@@ -80986,7 +33967,7 @@
+@@ -81237,7 +34133,7 @@
  # We define this here so --with-winbind can override it.
  
  # Check whether --with-wbclient was given.
@@ -86772,7 +86839,7 @@
    withval=$with_wbclient;
    case "$withval" in
          no)
-@@ -81085,7 +34066,7 @@
+@@ -81335,7 +34231,7 @@
  
  
  # Check whether --with-winbind was given.
@@ -86781,7 +86848,7 @@
    withval=$with_winbind;
    case "$withval" in
  	yes)
-@@ -81116,18 +34097,14 @@
+@@ -81366,18 +34262,14 @@
  	WINBIND_WINS_NSS=""
  fi
  if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -86803,7 +86870,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -81145,57 +34122,28 @@
+@@ -81395,57 +34287,28 @@
    return 0;
  }
  _ACEOF
@@ -86870,7 +86937,7 @@
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  else
-@@ -81224,12 +34172,10 @@
+@@ -81474,12 +34337,10 @@
  fi
  
  if test x"$HAVE_WINBIND" = x"yes"; then
@@ -86885,7 +86952,7 @@
  
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -81240,22 +34186,18 @@
+@@ -81490,7 +34351,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  else
@@ -86894,83 +86961,9 @@
  $as_echo "no$winbind_no_reason" >&6; }
  fi
  
--{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
- $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
--if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
-+if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+@@ -81503,108 +34364,11 @@
  
- /* Override any GCC internal prototype to avoid an error.
-@@ -81273,48 +34215,21 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_pthread_pthread_mutex_lock=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_pthread_pthread_mutex_lock=no
-+  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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-+if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
-   WINBIND_NSS_PTHREAD="-lpthread"
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PTHREAD 1
--_ACEOF
-+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
- 
- 			samba_cv_HAVE_PTHREAD=yes
- else
-@@ -81332,108 +34247,11 @@
- 
- 
  # 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; }
@@ -87081,7 +87074,7 @@
  
  fi
  
-@@ -81441,318 +34259,29 @@
+@@ -81612,318 +34376,29 @@
  # Solaris has some extra fields in struct passwd that need to be
  # initialised otherwise nscd crashes.
  
@@ -87411,7 +87404,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -81761,104 +34290,9 @@
+@@ -81932,104 +34407,9 @@
  
  fi
  
@@ -87519,7 +87512,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -81868,17 +34302,13 @@
+@@ -82039,17 +34419,13 @@
  fi
  
  
@@ -87540,7 +87533,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -81893,41 +34323,18 @@
+@@ -82064,41 +34440,18 @@
    return 0;
  }
  _ACEOF
@@ -87586,7 +87579,7 @@
  
  fi
  
-@@ -81937,7 +34344,7 @@
+@@ -82108,7 +34461,7 @@
  
  
  # Check whether --with-included-popt was given.
@@ -87595,7 +87588,7 @@
    withval=$with_included_popt;
    case "$withval" in
  	yes)
-@@ -81950,18 +34357,14 @@
+@@ -82121,18 +34474,14 @@
  fi
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -87617,7 +87610,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -81979,43 +34382,18 @@
+@@ -82150,43 +34499,18 @@
    return 0;
  }
  _ACEOF
@@ -87667,7 +87660,7 @@
    INCLUDED_POPT=no
  else
    INCLUDED_POPT=yes
-@@ -82023,16 +34401,16 @@
+@@ -82194,16 +34518,16 @@
  
  fi
  
@@ -87687,7 +87680,7 @@
  $as_echo "no" >&6; }
  	BUILD_POPT=""
      POPTLIBS="-lpopt"
-@@ -82045,7 +34423,7 @@
+@@ -82216,7 +34540,7 @@
  # Check if user wants DNS service discovery support
  
  # Check whether --enable-dnssd was given.
@@ -87696,7 +87689,7 @@
    enableval=$enable_dnssd;
  fi
  
-@@ -82054,151 +34432,12 @@
+@@ -82225,151 +34549,12 @@
  if test x"$enable_dnssd" = x"yes"; then
      have_dnssd_support=yes
  
@@ -87853,7 +87846,7 @@
  _ACEOF
  
  fi
-@@ -82211,102 +34450,12 @@
+@@ -82382,102 +34567,12 @@
  
      # On Darwin the DNSSD API is in libc, but on other platforms it's
      # probably in -ldns_sd
@@ -87961,7 +87954,7 @@
  _ACEOF
  
  fi
-@@ -82314,23 +34463,17 @@
+@@ -82485,23 +34580,17 @@
  
  
  
@@ -87988,10 +87981,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82348,54 +34491,28 @@
-   return 0;
- }
- _ACEOF
+@@ -82513,60 +34602,34 @@
+ char DNSServiceRegister ();
+ int
+ main ()
+-{
+-return DNSServiceRegister ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -88013,6 +88012,12 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++{
++return DNSServiceRegister ();
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ext_dns_sd_DNSServiceRegister=yes;
  		  ac_cv_lib_ext_dns_sd=yes
@@ -88050,7 +88055,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDNS_SD 1
  _ACEOF
-@@ -82410,7 +34527,6 @@
+@@ -82581,7 +34644,6 @@
  
  
  fi
@@ -88058,7 +88063,7 @@
      if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
              x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
  	have_dnssd_support=no
-@@ -82418,15 +34534,11 @@
+@@ -82589,15 +34651,11 @@
  
      if test x"$have_dnssd_support" = x"yes"; then
  
@@ -88076,7 +88081,7 @@
  	fi
      fi
  
-@@ -82436,7 +34548,7 @@
+@@ -82607,7 +34665,7 @@
  # Check if user wants avahi support
  
  # Check whether --enable-avahi was given.
@@ -88085,7 +88090,7 @@
    enableval=$enable_avahi;
  fi
  
-@@ -82444,151 +34556,12 @@
+@@ -82615,151 +34673,12 @@
  if test x"$enable_avahi" != x"no"; then
      have_avahi_support=yes
  
@@ -88242,7 +88247,7 @@
  _ACEOF
  
  fi
-@@ -82599,151 +34572,12 @@
+@@ -82770,151 +34689,12 @@
  	have_avahi_support=no
      fi
  
@@ -88399,7 +88404,7 @@
  _ACEOF
  
  fi
-@@ -82755,18 +34589,14 @@
+@@ -82926,18 +34706,14 @@
      fi
  
      save_LIBS="$LIBS"
@@ -88421,7 +88426,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82784,58 +34614,29 @@
+@@ -82955,58 +34731,29 @@
    return 0;
  }
  _ACEOF
@@ -88489,7 +88494,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82853,43 +34654,18 @@
+@@ -83024,43 +34771,18 @@
    return 0;
  }
  _ACEOF
@@ -88539,7 +88544,7 @@
    have_avahi_strerror=yes
  fi
  
-@@ -82904,17 +34680,13 @@
+@@ -83075,17 +34797,13 @@
          AVAHI_LIBS="-lavahi-client -lavahi-common"
  
  
@@ -88559,27 +88564,101 @@
  	fi
      fi
  fi
-@@ -82923,17 +34695,13 @@
- # Check if user wants pthreadpool support
+@@ -83100,18 +34818,14 @@
+ # If it's error, then the user didn't
+ # define it.
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-  { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5
+ $as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- # Check whether --enable-pthreadpool was given.
--if test "${enable_pthreadpool+set}" = set; then
-+if test "${enable_pthreadpool+set}" = set; then :
-   enableval=$enable_pthreadpool;
+ /* Override any GCC internal prototype to avoid an error.
+@@ -83129,43 +34843,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread_pthread_attr_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_attr_init=no
++  ac_cv_lib_pthread_pthread_attr_init=no
  fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then :
  
+ 	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+ 	     PTHREAD_LDFLAGS="-lpthread"
+@@ -83174,18 +34863,14 @@
+ fi
  
- if test x"$enable_pthreadpool" != x"no" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
--    cat >conftest.$ac_ext <<_ACEOF
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-  { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthreads" >&5
+ $as_echo_n "checking for pthread_attr_init in -lpthreads... " >&6; }
+-if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthreads  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- #include "pthread.h"
- int
-@@ -82944,42 +34712,15 @@
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -83203,43 +34888,18 @@
    return 0;
  }
  _ACEOF
@@ -88604,23 +88683,448 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  :
--else
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthreads_pthread_attr_init=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
+-
+-	ac_cv_lib_pthreads_pthread_attr_init=no
++  ac_cv_lib_pthreads_pthread_attr_init=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then :
  
--	LIBS="$LIBS -lpthread"
-+else
-+  LIBS="$LIBS -lpthread"
+ 	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ 	     PTHREAD_LDFLAGS="-lpthreads"
+@@ -83248,18 +34908,14 @@
  fi
+ 
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-   { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lc_r" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lc_r" >&5
+ $as_echo_n "checking for pthread_attr_init in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lc_r  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -83277,43 +34933,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_c_r_pthread_attr_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_c_r_pthread_attr_init=no
++  ac_cv_lib_c_r_pthread_attr_init=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then :
  
+ 		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ 		PTHREAD_LDFLAGS="-pthread"
+@@ -83322,92 +34953,8 @@
+ fi
+ 
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-   { $as_echo "$as_me:$LINENO: checking for pthread_attr_init" >&5
+-$as_echo_n "checking for pthread_attr_init... " >&6; }
+-if test "${ac_cv_func_pthread_attr_init+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define pthread_attr_init to an innocuous variant, in case <limits.h> declares pthread_attr_init.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define pthread_attr_init innocuous_pthread_attr_init
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pthread_attr_init (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef pthread_attr_init
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pthread_attr_init ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_pthread_attr_init || defined __stub___pthread_attr_init
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return pthread_attr_init ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_pthread_attr_init=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_pthread_attr_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_pthread_attr_init" >&5
+-$as_echo "$ac_cv_func_pthread_attr_init" >&6; }
+-if test "x$ac_cv_func_pthread_attr_init" = x""yes; then
++   ac_fn_c_check_func "$LINENO" "pthread_attr_init" "ac_cv_func_pthread_attr_init"
++if test "x$ac_cv_func_pthread_attr_init" = x""yes; then :
+ 
+ 		 PTHREAD_CFLAGS="-D_REENTRANT"
+ 		 PTHREAD_LDFLAGS="-lpthread"
+@@ -83418,18 +34965,14 @@
+ # especially for HP-UX, where the AC_CHECK_FUNC macro fails to test for
+ # pthread_attr_init. On pthread_mutex_lock it works there...
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-   { $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
+ $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
++if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -83447,43 +34990,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread_pthread_mutex_lock=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	ac_cv_lib_pthread_pthread_mutex_lock=no
++  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
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
++{ $as_echo "$as_me:${as_lineno-$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
++if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
+ 
+ 		PTHREAD_CFLAGS="-D_REENTRANT"
+ 		PTHREAD_LDFLAGS="-lpthread"
+@@ -83502,151 +35020,12 @@
+ 	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 	ac_save_LDFLAGS=$LDFLAGS
+ 	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
+-
+-for ac_header in pthread.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to 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
++	for ac_header in pthread.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
++if test "x$ac_cv_header_pthread_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_PTHREAD_H 1
+ _ACEOF
+ 
+ fi
+@@ -83661,24 +35040,20 @@
+ # Check if user wants pthreadpool support
+ 
+ # Check whether --enable-pthreadpool was given.
+-if test "${enable_pthreadpool+set}" = set; then
++if test "${enable_pthreadpool+set}" = set; then :
+   enableval=$enable_pthreadpool;
+ fi
+ 
+ 
+ if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: pthreadpool support cannot be enabled when pthread support was found" >&5
+-$as_echo "$as_me: error: pthreadpool support cannot be enabled when pthread support was found" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "pthreadpool support cannot be enabled when pthread support was found" "$LINENO" 5
+ fi
+ 
+ if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
+     LIBS="$LIBS $PTHREAD_LDFLAGS"
+     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_PTHREADPOOL 1
 -_ACEOF
@@ -88628,7 +89132,7 @@
  
      PTHREADPOOL_OBJ="lib/pthreadpool.o"
  
-@@ -82990,7 +34731,7 @@
+@@ -83689,7 +35064,7 @@
  
  
  # Check whether --with-included-iniparser was given.
@@ -88637,7 +89141,7 @@
    withval=$with_included_iniparser;
    case "$withval" in
  	yes)
-@@ -83003,18 +34744,14 @@
+@@ -83702,18 +35077,14 @@
  fi
  
  if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -88659,7 +89163,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83032,43 +34769,18 @@
+@@ -83731,43 +35102,18 @@
    return 0;
  }
  _ACEOF
@@ -88709,7 +89213,7 @@
    INCLUDED_INIPARSER=no
  else
    INCLUDED_INIPARSER=yes
-@@ -83076,260 +34788,40 @@
+@@ -83775,260 +35121,40 @@
  
  fi
  
@@ -88995,7 +89499,7 @@
  _ACEOF
  
  fi
-@@ -83337,20 +34829,16 @@
+@@ -84036,20 +35162,16 @@
  done
  
  
@@ -89020,7 +89524,7 @@
  /* end confdefs.h.  */
  
  		#include <sys/types.h>
-@@ -83362,46 +34850,19 @@
+@@ -84061,46 +35183,19 @@
  			return statfs (".", &fsd);
  		}
  _ACEOF
@@ -89072,7 +89576,7 @@
  $as_echo "$vfsfileid_cv_statfs" >&6; }
  
  if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -83436,7 +34897,7 @@
+@@ -84135,7 +35230,7 @@
  
  
  # Check whether --with-static-modules was given.
@@ -89081,7 +89585,7 @@
    withval=$with_static_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -83448,7 +34909,7 @@
+@@ -84147,7 +35242,7 @@
  
  
  # Check whether --with-shared-modules was given.
@@ -89090,7 +89594,7 @@
    withval=$with_shared_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -83465,7 +34926,7 @@
+@@ -84164,7 +35259,7 @@
  fi
  
  
@@ -89099,7 +89603,7 @@
  $as_echo_n "checking how to build pdb_ldap... " >&6; }
  	if test "$MODULE_pdb_ldap"; then
  		DEST=$MODULE_pdb_ldap
-@@ -83477,12 +34938,10 @@
+@@ -84176,12 +35271,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89114,7 +89618,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -83493,16 +34952,16 @@
+@@ -84192,16 +35285,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
  
  		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -89134,7 +89638,7 @@
  $as_echo_n "checking how to build pdb_ads... " >&6; }
  	if test "$MODULE_pdb_ads"; then
  		DEST=$MODULE_pdb_ads
-@@ -83514,12 +34973,10 @@
+@@ -84213,12 +35306,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89149,7 +89653,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ads"
-@@ -83530,16 +34987,16 @@
+@@ -84229,16 +35320,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
  
  
@@ -89169,7 +89673,7 @@
  $as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
  	if test "$MODULE_pdb_smbpasswd"; then
  		DEST=$MODULE_pdb_smbpasswd
-@@ -83551,12 +35008,10 @@
+@@ -84250,12 +35341,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89184,7 +89688,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -83567,16 +35022,16 @@
+@@ -84266,16 +35355,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
  
  
@@ -89204,7 +89708,7 @@
  $as_echo_n "checking how to build pdb_tdbsam... " >&6; }
  	if test "$MODULE_pdb_tdbsam"; then
  		DEST=$MODULE_pdb_tdbsam
-@@ -83588,12 +35043,10 @@
+@@ -84287,12 +35376,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89219,7 +89723,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -83604,16 +35057,16 @@
+@@ -84303,16 +35390,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
  
  
@@ -89239,7 +89743,7 @@
  $as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
  	if test "$MODULE_pdb_wbc_sam"; then
  		DEST=$MODULE_pdb_wbc_sam
-@@ -83625,12 +35078,10 @@
+@@ -84324,12 +35411,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89254,7 +89758,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -83641,11 +35092,11 @@
+@@ -84340,11 +35425,11 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
  
  
@@ -89268,7 +89772,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -83667,7 +35118,7 @@
+@@ -84366,7 +35451,7 @@
  
  
  
@@ -89277,7 +89781,7 @@
  $as_echo_n "checking how to build rpc_lsarpc... " >&6; }
  	if test "$MODULE_rpc_lsarpc"; then
  		DEST=$MODULE_rpc_lsarpc
-@@ -83679,12 +35130,10 @@
+@@ -84378,12 +35463,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89292,7 +89796,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -83695,16 +35144,16 @@
+@@ -84394,16 +35477,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
  
  
@@ -89312,7 +89816,7 @@
  $as_echo_n "checking how to build rpc_winreg... " >&6; }
  	if test "$MODULE_rpc_winreg"; then
  		DEST=$MODULE_rpc_winreg
-@@ -83716,12 +35165,10 @@
+@@ -84415,12 +35498,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89327,7 +89831,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -83732,16 +35179,16 @@
+@@ -84431,16 +35512,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
  
  
@@ -89347,7 +89851,7 @@
  $as_echo_n "checking how to build rpc_initshutdown... " >&6; }
  	if test "$MODULE_rpc_initshutdown"; then
  		DEST=$MODULE_rpc_initshutdown
-@@ -83753,12 +35200,10 @@
+@@ -84452,12 +35533,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89362,7 +89866,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -83769,16 +35214,16 @@
+@@ -84468,16 +35547,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
  
  
@@ -89382,7 +89886,7 @@
  $as_echo_n "checking how to build rpc_dssetup... " >&6; }
  	if test "$MODULE_rpc_dssetup"; then
  		DEST=$MODULE_rpc_dssetup
-@@ -83790,12 +35235,10 @@
+@@ -84489,12 +35568,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89397,7 +89901,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -83806,16 +35249,16 @@
+@@ -84505,16 +35582,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
  
  
@@ -89417,7 +89921,7 @@
  $as_echo_n "checking how to build rpc_wkssvc... " >&6; }
  	if test "$MODULE_rpc_wkssvc"; then
  		DEST=$MODULE_rpc_wkssvc
-@@ -83827,12 +35270,10 @@
+@@ -84526,12 +35603,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89432,7 +89936,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -83843,16 +35284,16 @@
+@@ -84542,16 +35617,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
  
  
@@ -89452,7 +89956,7 @@
  $as_echo_n "checking how to build rpc_svcctl... " >&6; }
  	if test "$MODULE_rpc_svcctl"; then
  		DEST=$MODULE_rpc_svcctl
-@@ -83864,12 +35305,10 @@
+@@ -84563,12 +35638,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89467,7 +89971,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -83880,16 +35319,16 @@
+@@ -84579,16 +35652,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
  
  
@@ -89487,7 +89991,7 @@
  $as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
  	if test "$MODULE_rpc_ntsvcs"; then
  		DEST=$MODULE_rpc_ntsvcs
-@@ -83901,12 +35340,10 @@
+@@ -84600,12 +35673,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89502,7 +90006,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -83917,16 +35354,16 @@
+@@ -84616,16 +35687,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
  
  
@@ -89522,7 +90026,7 @@
  $as_echo_n "checking how to build rpc_netlogon... " >&6; }
  	if test "$MODULE_rpc_netlogon"; then
  		DEST=$MODULE_rpc_netlogon
-@@ -83938,12 +35375,10 @@
+@@ -84637,12 +35708,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89537,7 +90041,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -83954,16 +35389,16 @@
+@@ -84653,16 +35722,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
  
  
@@ -89557,7 +90061,7 @@
  $as_echo_n "checking how to build rpc_netdfs... " >&6; }
  	if test "$MODULE_rpc_netdfs"; then
  		DEST=$MODULE_rpc_netdfs
-@@ -83975,12 +35410,10 @@
+@@ -84674,12 +35743,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89572,7 +90076,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -83991,16 +35424,16 @@
+@@ -84690,16 +35757,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
  
  
@@ -89592,7 +90096,7 @@
  $as_echo_n "checking how to build rpc_srvsvc... " >&6; }
  	if test "$MODULE_rpc_srvsvc"; then
  		DEST=$MODULE_rpc_srvsvc
-@@ -84012,12 +35445,10 @@
+@@ -84711,12 +35778,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89607,7 +90111,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -84028,16 +35459,16 @@
+@@ -84727,16 +35792,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
  
  
@@ -89627,7 +90131,7 @@
  $as_echo_n "checking how to build rpc_spoolss... " >&6; }
  	if test "$MODULE_rpc_spoolss"; then
  		DEST=$MODULE_rpc_spoolss
-@@ -84049,12 +35480,10 @@
+@@ -84748,12 +35813,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89642,7 +90146,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -84065,16 +35494,16 @@
+@@ -84764,16 +35827,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
  
  
@@ -89662,7 +90166,7 @@
  $as_echo_n "checking how to build rpc_eventlog... " >&6; }
  	if test "$MODULE_rpc_eventlog"; then
  		DEST=$MODULE_rpc_eventlog
-@@ -84086,12 +35515,10 @@
+@@ -84785,12 +35848,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89677,7 +90181,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -84102,16 +35529,16 @@
+@@ -84801,16 +35862,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
  
  
@@ -89697,7 +90201,7 @@
  $as_echo_n "checking how to build rpc_samr... " >&6; }
  	if test "$MODULE_rpc_samr"; then
  		DEST=$MODULE_rpc_samr
-@@ -84123,12 +35550,10 @@
+@@ -84822,12 +35883,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89712,7 +90216,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_samr"
-@@ -84139,16 +35564,16 @@
+@@ -84838,16 +35897,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
  
  
@@ -89732,7 +90236,7 @@
  $as_echo_n "checking how to build rpc_rpcecho... " >&6; }
  	if test "$MODULE_rpc_rpcecho"; then
  		DEST=$MODULE_rpc_rpcecho
-@@ -84160,12 +35585,10 @@
+@@ -84859,12 +35918,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89747,7 +90251,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -84176,11 +35599,11 @@
+@@ -84875,11 +35932,11 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
  
  
@@ -89761,7 +90265,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84201,7 +35624,7 @@
+@@ -84900,7 +35957,7 @@
  
  
  
@@ -89770,7 +90274,7 @@
  $as_echo_n "checking how to build idmap_ldap... " >&6; }
  	if test "$MODULE_idmap_ldap"; then
  		DEST=$MODULE_idmap_ldap
-@@ -84213,12 +35636,10 @@
+@@ -84912,12 +35969,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89785,7 +90289,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -84229,16 +35650,16 @@
+@@ -84928,16 +35983,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
  
  
@@ -89805,7 +90309,7 @@
  $as_echo_n "checking how to build idmap_tdb... " >&6; }
  	if test "$MODULE_idmap_tdb"; then
  		DEST=$MODULE_idmap_tdb
-@@ -84250,12 +35671,10 @@
+@@ -84949,12 +36004,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89820,7 +90324,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -84266,16 +35685,16 @@
+@@ -84965,16 +36018,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
  
  
@@ -89840,7 +90344,7 @@
  $as_echo_n "checking how to build idmap_tdb2... " >&6; }
  	if test "$MODULE_idmap_tdb2"; then
  		DEST=$MODULE_idmap_tdb2
-@@ -84287,12 +35706,10 @@
+@@ -84986,12 +36039,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89855,7 +90359,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -84303,16 +35720,16 @@
+@@ -85002,16 +36053,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
  
  
@@ -89875,7 +90379,7 @@
  $as_echo_n "checking how to build idmap_passdb... " >&6; }
  	if test "$MODULE_idmap_passdb"; then
  		DEST=$MODULE_idmap_passdb
-@@ -84324,12 +35741,10 @@
+@@ -85023,12 +36074,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89890,7 +90394,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -84340,16 +35755,16 @@
+@@ -85039,16 +36088,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
  
  
@@ -89910,7 +90414,7 @@
  $as_echo_n "checking how to build idmap_nss... " >&6; }
  	if test "$MODULE_idmap_nss"; then
  		DEST=$MODULE_idmap_nss
-@@ -84361,12 +35776,10 @@
+@@ -85060,12 +36109,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89925,7 +90429,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_nss"
-@@ -84377,16 +35790,16 @@
+@@ -85076,16 +36123,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
  
  
@@ -89945,7 +90449,7 @@
  $as_echo_n "checking how to build idmap_rid... " >&6; }
  	if test "$MODULE_idmap_rid"; then
  		DEST=$MODULE_idmap_rid
-@@ -84398,12 +35811,10 @@
+@@ -85097,12 +36144,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89960,7 +90464,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_rid"
-@@ -84414,16 +35825,16 @@
+@@ -85113,16 +36158,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
  
  
@@ -89980,7 +90484,7 @@
  $as_echo_n "checking how to build idmap_ad... " >&6; }
  	if test "$MODULE_idmap_ad"; then
  		DEST=$MODULE_idmap_ad
-@@ -84435,12 +35846,10 @@
+@@ -85134,12 +36179,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89995,7 +90499,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ad"
-@@ -84451,16 +35860,16 @@
+@@ -85150,16 +36193,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
  
  
@@ -90015,7 +90519,7 @@
  $as_echo_n "checking how to build idmap_hash... " >&6; }
  	if test "$MODULE_idmap_hash"; then
  		DEST=$MODULE_idmap_hash
-@@ -84472,12 +35881,10 @@
+@@ -85171,12 +36214,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90030,7 +90534,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_hash"
-@@ -84488,16 +35895,16 @@
+@@ -85187,16 +36228,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
  
  
@@ -90050,7 +90554,7 @@
  $as_echo_n "checking how to build idmap_adex... " >&6; }
  	if test "$MODULE_idmap_adex"; then
  		DEST=$MODULE_idmap_adex
-@@ -84509,12 +35916,10 @@
+@@ -85208,12 +36249,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90065,7 +90569,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_adex"
-@@ -84525,11 +35930,11 @@
+@@ -85224,11 +36263,11 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
  
  
@@ -90079,7 +90583,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84550,7 +35955,7 @@
+@@ -85249,7 +36288,7 @@
  
  
  
@@ -90088,7 +90592,7 @@
  $as_echo_n "checking how to build nss_info_template... " >&6; }
  	if test "$MODULE_nss_info_template"; then
  		DEST=$MODULE_nss_info_template
-@@ -84562,12 +35967,10 @@
+@@ -85261,12 +36300,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90103,7 +90607,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules nss_info_template"
-@@ -84578,11 +35981,11 @@
+@@ -85277,11 +36314,11 @@
  		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
  
  
@@ -90117,7 +90621,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84603,7 +36006,7 @@
+@@ -85302,7 +36339,7 @@
  
  
  
@@ -90126,7 +90630,7 @@
  $as_echo_n "checking how to build charset_weird... " >&6; }
  	if test "$MODULE_charset_weird"; then
  		DEST=$MODULE_charset_weird
-@@ -84615,12 +36018,10 @@
+@@ -85314,12 +36351,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90141,7 +90645,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_weird"
-@@ -84631,16 +36032,16 @@
+@@ -85330,16 +36365,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
  
  
@@ -90161,7 +90665,7 @@
  $as_echo_n "checking how to build charset_CP850... " >&6; }
  	if test "$MODULE_charset_CP850"; then
  		DEST=$MODULE_charset_CP850
-@@ -84652,12 +36053,10 @@
+@@ -85351,12 +36386,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90176,7 +90680,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP850"
-@@ -84668,16 +36067,16 @@
+@@ -85367,16 +36400,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
  
  
@@ -90196,7 +90700,7 @@
  $as_echo_n "checking how to build charset_CP437... " >&6; }
  	if test "$MODULE_charset_CP437"; then
  		DEST=$MODULE_charset_CP437
-@@ -84689,12 +36088,10 @@
+@@ -85388,12 +36421,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90211,7 +90715,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP437"
-@@ -84705,16 +36102,16 @@
+@@ -85404,16 +36435,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
  
  
@@ -90231,7 +90735,7 @@
  $as_echo_n "checking how to build charset_macosxfs... " >&6; }
  	if test "$MODULE_charset_macosxfs"; then
  		DEST=$MODULE_charset_macosxfs
-@@ -84726,12 +36123,10 @@
+@@ -85425,12 +36456,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90246,7 +90750,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -84742,11 +36137,11 @@
+@@ -85441,11 +36470,11 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
  
  
@@ -90260,7 +90764,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84767,7 +36162,7 @@
+@@ -85466,7 +36495,7 @@
  
  
  
@@ -90269,7 +90773,7 @@
  $as_echo_n "checking how to build auth_sam... " >&6; }
  	if test "$MODULE_auth_sam"; then
  		DEST=$MODULE_auth_sam
-@@ -84779,12 +36174,10 @@
+@@ -85478,12 +36507,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90284,7 +90788,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_sam"
-@@ -84795,16 +36188,16 @@
+@@ -85494,16 +36521,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
  
  
@@ -90304,7 +90808,7 @@
  $as_echo_n "checking how to build auth_unix... " >&6; }
  	if test "$MODULE_auth_unix"; then
  		DEST=$MODULE_auth_unix
-@@ -84816,12 +36209,10 @@
+@@ -85515,12 +36542,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90319,7 +90823,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_unix"
-@@ -84832,16 +36223,16 @@
+@@ -85531,16 +36556,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
  
  
@@ -90339,7 +90843,7 @@
  $as_echo_n "checking how to build auth_winbind... " >&6; }
  	if test "$MODULE_auth_winbind"; then
  		DEST=$MODULE_auth_winbind
-@@ -84853,12 +36244,10 @@
+@@ -85552,12 +36577,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90354,7 +90858,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_winbind"
-@@ -84869,16 +36258,16 @@
+@@ -85568,16 +36591,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
  
  
@@ -90374,7 +90878,7 @@
  $as_echo_n "checking how to build auth_wbc... " >&6; }
  	if test "$MODULE_auth_wbc"; then
  		DEST=$MODULE_auth_wbc
-@@ -84890,12 +36279,10 @@
+@@ -85589,12 +36612,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90389,7 +90893,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_wbc"
-@@ -84906,16 +36293,16 @@
+@@ -85605,16 +36626,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
  
  
@@ -90409,7 +90913,7 @@
  $as_echo_n "checking how to build auth_server... " >&6; }
  	if test "$MODULE_auth_server"; then
  		DEST=$MODULE_auth_server
-@@ -84927,12 +36314,10 @@
+@@ -85626,12 +36647,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90424,7 +90928,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_server"
-@@ -84943,16 +36328,16 @@
+@@ -85642,16 +36661,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
  
  
@@ -90444,7 +90948,7 @@
  $as_echo_n "checking how to build auth_domain... " >&6; }
  	if test "$MODULE_auth_domain"; then
  		DEST=$MODULE_auth_domain
-@@ -84964,12 +36349,10 @@
+@@ -85663,12 +36682,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90459,7 +90963,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_domain"
-@@ -84980,16 +36363,16 @@
+@@ -85679,16 +36696,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
  
  
@@ -90479,7 +90983,7 @@
  $as_echo_n "checking how to build auth_builtin... " >&6; }
  	if test "$MODULE_auth_builtin"; then
  		DEST=$MODULE_auth_builtin
-@@ -85001,12 +36384,10 @@
+@@ -85700,12 +36717,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90494,7 +90998,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_builtin"
-@@ -85017,16 +36398,16 @@
+@@ -85716,16 +36731,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
  
  
@@ -90514,7 +91018,7 @@
  $as_echo_n "checking how to build auth_script... " >&6; }
  	if test "$MODULE_auth_script"; then
  		DEST=$MODULE_auth_script
-@@ -85038,12 +36419,10 @@
+@@ -85737,12 +36752,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90529,7 +91033,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_script"
-@@ -85054,16 +36433,16 @@
+@@ -85753,16 +36766,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
  
  
@@ -90549,7 +91053,7 @@
  $as_echo_n "checking how to build auth_netlogond... " >&6; }
  	if test "$MODULE_auth_netlogond"; then
  		DEST=$MODULE_auth_netlogond
-@@ -85075,12 +36454,10 @@
+@@ -85774,12 +36787,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90564,7 +91068,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -85091,11 +36468,11 @@
+@@ -85790,11 +36801,11 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
  
  
@@ -90578,7 +91082,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85116,7 +36493,7 @@
+@@ -85815,7 +36826,7 @@
  
  
  
@@ -90587,7 +91091,7 @@
  $as_echo_n "checking how to build vfs_default... " >&6; }
  	if test "$MODULE_vfs_default"; then
  		DEST=$MODULE_vfs_default
-@@ -85128,12 +36505,10 @@
+@@ -85827,12 +36838,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90602,7 +91106,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default"
-@@ -85144,16 +36519,16 @@
+@@ -85843,16 +36852,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
  
  
@@ -90622,7 +91126,7 @@
  $as_echo_n "checking how to build vfs_recycle... " >&6; }
  	if test "$MODULE_vfs_recycle"; then
  		DEST=$MODULE_vfs_recycle
-@@ -85165,12 +36540,10 @@
+@@ -85864,12 +36873,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90637,7 +91141,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -85181,16 +36554,16 @@
+@@ -85880,16 +36887,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
  
  
@@ -90657,7 +91161,7 @@
  $as_echo_n "checking how to build vfs_audit... " >&6; }
  	if test "$MODULE_vfs_audit"; then
  		DEST=$MODULE_vfs_audit
-@@ -85202,12 +36575,10 @@
+@@ -85901,12 +36908,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90672,7 +91176,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_audit"
-@@ -85218,16 +36589,16 @@
+@@ -85917,16 +36922,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
  
  
@@ -90692,7 +91196,7 @@
  $as_echo_n "checking how to build vfs_extd_audit... " >&6; }
  	if test "$MODULE_vfs_extd_audit"; then
  		DEST=$MODULE_vfs_extd_audit
-@@ -85239,12 +36610,10 @@
+@@ -85938,12 +36943,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90707,7 +91211,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -85255,16 +36624,16 @@
+@@ -85954,16 +36957,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
  
  
@@ -90727,7 +91231,7 @@
  $as_echo_n "checking how to build vfs_full_audit... " >&6; }
  	if test "$MODULE_vfs_full_audit"; then
  		DEST=$MODULE_vfs_full_audit
-@@ -85276,12 +36645,10 @@
+@@ -85975,12 +36978,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90742,7 +91246,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -85292,16 +36659,16 @@
+@@ -85991,16 +36992,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
  
  
@@ -90762,7 +91266,7 @@
  $as_echo_n "checking how to build vfs_netatalk... " >&6; }
  	if test "$MODULE_vfs_netatalk"; then
  		DEST=$MODULE_vfs_netatalk
-@@ -85313,12 +36680,10 @@
+@@ -86012,12 +37013,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90777,7 +91281,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -85329,16 +36694,16 @@
+@@ -86028,16 +37027,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
  
  
@@ -90797,7 +91301,7 @@
  $as_echo_n "checking how to build vfs_fake_perms... " >&6; }
  	if test "$MODULE_vfs_fake_perms"; then
  		DEST=$MODULE_vfs_fake_perms
-@@ -85350,12 +36715,10 @@
+@@ -86049,12 +37048,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90812,7 +91316,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -85366,16 +36729,16 @@
+@@ -86065,16 +37062,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
  
  
@@ -90832,7 +91336,7 @@
  $as_echo_n "checking how to build vfs_default_quota... " >&6; }
  	if test "$MODULE_vfs_default_quota"; then
  		DEST=$MODULE_vfs_default_quota
-@@ -85387,12 +36750,10 @@
+@@ -86086,12 +37083,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90847,7 +91351,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -85403,16 +36764,16 @@
+@@ -86102,16 +37097,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
  
  
@@ -90867,7 +91371,7 @@
  $as_echo_n "checking how to build vfs_readonly... " >&6; }
  	if test "$MODULE_vfs_readonly"; then
  		DEST=$MODULE_vfs_readonly
-@@ -85424,12 +36785,10 @@
+@@ -86123,12 +37118,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90882,7 +91386,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -85440,16 +36799,16 @@
+@@ -86139,16 +37132,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
  
  
@@ -90902,7 +91406,7 @@
  $as_echo_n "checking how to build vfs_cap... " >&6; }
  	if test "$MODULE_vfs_cap"; then
  		DEST=$MODULE_vfs_cap
-@@ -85461,12 +36820,10 @@
+@@ -86160,12 +37153,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90917,7 +91421,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cap"
-@@ -85477,16 +36834,16 @@
+@@ -86176,16 +37167,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
  
  
@@ -90937,7 +91441,7 @@
  $as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
  	if test "$MODULE_vfs_expand_msdfs"; then
  		DEST=$MODULE_vfs_expand_msdfs
-@@ -85498,12 +36855,10 @@
+@@ -86197,12 +37188,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90952,7 +91456,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -85514,16 +36869,16 @@
+@@ -86213,16 +37202,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
  
  
@@ -90972,7 +91476,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
  	if test "$MODULE_vfs_shadow_copy"; then
  		DEST=$MODULE_vfs_shadow_copy
-@@ -85535,12 +36890,10 @@
+@@ -86234,12 +37223,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90987,7 +91491,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -85551,16 +36904,16 @@
+@@ -86250,16 +37237,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
  
  
@@ -91007,7 +91511,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
  	if test "$MODULE_vfs_shadow_copy2"; then
  		DEST=$MODULE_vfs_shadow_copy2
-@@ -85572,12 +36925,10 @@
+@@ -86271,12 +37258,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91022,7 +91526,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -85588,16 +36939,16 @@
+@@ -86287,16 +37272,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
  
  
@@ -91042,7 +91546,7 @@
  $as_echo_n "checking how to build vfs_afsacl... " >&6; }
  	if test "$MODULE_vfs_afsacl"; then
  		DEST=$MODULE_vfs_afsacl
-@@ -85609,12 +36960,10 @@
+@@ -86308,12 +37293,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91057,7 +91561,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -85625,16 +36974,16 @@
+@@ -86324,16 +37307,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
  
  
@@ -91077,7 +91581,7 @@
  $as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
  	if test "$MODULE_vfs_xattr_tdb"; then
  		DEST=$MODULE_vfs_xattr_tdb
-@@ -85646,12 +36995,10 @@
+@@ -86345,12 +37328,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91092,7 +91596,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -85662,16 +37009,16 @@
+@@ -86361,16 +37342,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
  
  
@@ -91112,7 +91616,7 @@
  $as_echo_n "checking how to build vfs_posixacl... " >&6; }
  	if test "$MODULE_vfs_posixacl"; then
  		DEST=$MODULE_vfs_posixacl
-@@ -85683,12 +37030,10 @@
+@@ -86382,12 +37363,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91127,7 +91631,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -85699,16 +37044,16 @@
+@@ -86398,16 +37377,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
  
  
@@ -91147,7 +91651,7 @@
  $as_echo_n "checking how to build vfs_aixacl... " >&6; }
  	if test "$MODULE_vfs_aixacl"; then
  		DEST=$MODULE_vfs_aixacl
-@@ -85720,12 +37065,10 @@
+@@ -86419,12 +37398,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91162,7 +91666,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -85736,16 +37079,16 @@
+@@ -86435,16 +37412,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
  
  
@@ -91182,7 +91686,7 @@
  $as_echo_n "checking how to build vfs_aixacl2... " >&6; }
  	if test "$MODULE_vfs_aixacl2"; then
  		DEST=$MODULE_vfs_aixacl2
-@@ -85757,12 +37100,10 @@
+@@ -86456,12 +37433,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91197,7 +91701,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -85773,16 +37114,16 @@
+@@ -86472,16 +37447,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
  
  
@@ -91217,7 +91721,7 @@
  $as_echo_n "checking how to build vfs_solarisacl... " >&6; }
  	if test "$MODULE_vfs_solarisacl"; then
  		DEST=$MODULE_vfs_solarisacl
-@@ -85794,12 +37135,10 @@
+@@ -86493,12 +37468,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91232,7 +91736,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -85810,16 +37149,16 @@
+@@ -86509,16 +37482,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
  
  
@@ -91252,7 +91756,7 @@
  $as_echo_n "checking how to build vfs_irixacl... " >&6; }
  	if test "$MODULE_vfs_irixacl"; then
  		DEST=$MODULE_vfs_irixacl
-@@ -85831,12 +37170,10 @@
+@@ -86530,12 +37503,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91267,7 +91771,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -85847,16 +37184,16 @@
+@@ -86546,16 +37517,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
  
  
@@ -91287,7 +91791,7 @@
  $as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
  	if test "$MODULE_vfs_hpuxacl"; then
  		DEST=$MODULE_vfs_hpuxacl
-@@ -85868,12 +37205,10 @@
+@@ -86567,12 +37538,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91302,7 +91806,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -85884,16 +37219,16 @@
+@@ -86583,16 +37552,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
  
  
@@ -91322,7 +91826,7 @@
  $as_echo_n "checking how to build vfs_tru64acl... " >&6; }
  	if test "$MODULE_vfs_tru64acl"; then
  		DEST=$MODULE_vfs_tru64acl
-@@ -85905,12 +37240,10 @@
+@@ -86604,12 +37573,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91337,7 +91841,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -85921,16 +37254,16 @@
+@@ -86620,16 +37587,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
  
  
@@ -91357,7 +91861,7 @@
  $as_echo_n "checking how to build vfs_catia... " >&6; }
  	if test "$MODULE_vfs_catia"; then
  		DEST=$MODULE_vfs_catia
-@@ -85942,12 +37275,10 @@
+@@ -86641,12 +37608,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91372,7 +91876,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_catia"
-@@ -85958,16 +37289,16 @@
+@@ -86657,16 +37622,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
  
  
@@ -91392,7 +91896,7 @@
  $as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
  	if test "$MODULE_vfs_streams_xattr"; then
  		DEST=$MODULE_vfs_streams_xattr
-@@ -85979,12 +37310,10 @@
+@@ -86678,12 +37643,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91407,7 +91911,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -85995,16 +37324,16 @@
+@@ -86694,16 +37657,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
  
  
@@ -91427,7 +91931,7 @@
  $as_echo_n "checking how to build vfs_streams_depot... " >&6; }
  	if test "$MODULE_vfs_streams_depot"; then
  		DEST=$MODULE_vfs_streams_depot
-@@ -86016,12 +37345,10 @@
+@@ -86715,12 +37678,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91442,7 +91946,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -86032,16 +37359,16 @@
+@@ -86731,16 +37692,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
  
  
@@ -91462,7 +91966,7 @@
  $as_echo_n "checking how to build vfs_cacheprime... " >&6; }
  	if test "$MODULE_vfs_cacheprime"; then
  		DEST=$MODULE_vfs_cacheprime
-@@ -86053,12 +37380,10 @@
+@@ -86752,12 +37713,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91477,7 +91981,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -86069,16 +37394,16 @@
+@@ -86768,16 +37727,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
  
  
@@ -91497,7 +92001,7 @@
  $as_echo_n "checking how to build vfs_prealloc... " >&6; }
  	if test "$MODULE_vfs_prealloc"; then
  		DEST=$MODULE_vfs_prealloc
-@@ -86090,12 +37415,10 @@
+@@ -86789,12 +37748,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91512,7 +92016,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -86106,16 +37429,16 @@
+@@ -86805,16 +37762,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
  
  
@@ -91532,7 +92036,7 @@
  $as_echo_n "checking how to build vfs_commit... " >&6; }
  	if test "$MODULE_vfs_commit"; then
  		DEST=$MODULE_vfs_commit
-@@ -86127,12 +37450,10 @@
+@@ -86826,12 +37783,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91547,7 +92051,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_commit"
-@@ -86143,16 +37464,16 @@
+@@ -86842,16 +37797,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
  
  
@@ -91567,7 +92071,7 @@
  $as_echo_n "checking how to build vfs_gpfs... " >&6; }
  	if test "$MODULE_vfs_gpfs"; then
  		DEST=$MODULE_vfs_gpfs
-@@ -86164,12 +37485,10 @@
+@@ -86863,12 +37818,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91582,7 +92086,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -86180,16 +37499,16 @@
+@@ -86879,16 +37832,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
  
  
@@ -91602,7 +92106,7 @@
  $as_echo_n "checking how to build vfs_readahead... " >&6; }
  	if test "$MODULE_vfs_readahead"; then
  		DEST=$MODULE_vfs_readahead
-@@ -86201,12 +37520,10 @@
+@@ -86900,12 +37853,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91617,7 +92121,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -86217,16 +37534,16 @@
+@@ -86916,16 +37867,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
  
  
@@ -91637,7 +92141,7 @@
  $as_echo_n "checking how to build vfs_tsmsm... " >&6; }
  	if test "$MODULE_vfs_tsmsm"; then
  		DEST=$MODULE_vfs_tsmsm
-@@ -86238,12 +37555,10 @@
+@@ -86937,12 +37888,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91652,7 +92156,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -86254,16 +37569,16 @@
+@@ -86953,16 +37902,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
  
  
@@ -91672,7 +92176,7 @@
  $as_echo_n "checking how to build vfs_fileid... " >&6; }
  	if test "$MODULE_vfs_fileid"; then
  		DEST=$MODULE_vfs_fileid
-@@ -86275,12 +37590,10 @@
+@@ -86974,12 +37923,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91687,7 +92191,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -86291,16 +37604,16 @@
+@@ -86990,16 +37937,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
  
  
@@ -91707,7 +92211,7 @@
  $as_echo_n "checking how to build vfs_aio_fork... " >&6; }
  	if test "$MODULE_vfs_aio_fork"; then
  		DEST=$MODULE_vfs_aio_fork
-@@ -86312,12 +37625,10 @@
+@@ -87011,12 +37958,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91722,7 +92226,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -86328,16 +37639,16 @@
+@@ -87027,16 +37972,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
  
  
@@ -91742,7 +92246,7 @@
  $as_echo_n "checking how to build vfs_preopen... " >&6; }
  	if test "$MODULE_vfs_preopen"; then
  		DEST=$MODULE_vfs_preopen
-@@ -86349,12 +37660,10 @@
+@@ -87048,12 +37993,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91757,7 +92261,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -86365,16 +37674,16 @@
+@@ -87064,16 +38007,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
  
  
@@ -91777,7 +92281,7 @@
  $as_echo_n "checking how to build vfs_syncops... " >&6; }
  	if test "$MODULE_vfs_syncops"; then
  		DEST=$MODULE_vfs_syncops
-@@ -86386,12 +37695,10 @@
+@@ -87085,12 +38028,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91792,7 +92296,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -86402,16 +37709,16 @@
+@@ -87101,16 +38042,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
  
  
@@ -91812,7 +92316,7 @@
  $as_echo_n "checking how to build vfs_zfsacl... " >&6; }
  	if test "$MODULE_vfs_zfsacl"; then
  		DEST=$MODULE_vfs_zfsacl
-@@ -86423,12 +37730,10 @@
+@@ -87122,12 +38063,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91827,7 +92331,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -86439,16 +37744,16 @@
+@@ -87138,16 +38077,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
  
  
@@ -91847,7 +92351,7 @@
  $as_echo_n "checking how to build vfs_notify_fam... " >&6; }
  	if test "$MODULE_vfs_notify_fam"; then
  		DEST=$MODULE_vfs_notify_fam
-@@ -86460,12 +37765,10 @@
+@@ -87159,12 +38098,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91862,7 +92366,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -86476,16 +37779,16 @@
+@@ -87175,16 +38112,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
  
  
@@ -91882,7 +92386,7 @@
  $as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
  	if test "$MODULE_vfs_acl_xattr"; then
  		DEST=$MODULE_vfs_acl_xattr
-@@ -86497,12 +37800,10 @@
+@@ -87196,12 +38133,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91897,7 +92401,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -86513,16 +37814,16 @@
+@@ -87212,16 +38147,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
  
  
@@ -91917,7 +92421,7 @@
  $as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
  	if test "$MODULE_vfs_acl_tdb"; then
  		DEST=$MODULE_vfs_acl_tdb
-@@ -86534,12 +37835,10 @@
+@@ -87233,12 +38168,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91932,7 +92436,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -86550,16 +37849,16 @@
+@@ -87249,16 +38182,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
  
  
@@ -91952,7 +92456,7 @@
  $as_echo_n "checking how to build vfs_smb_traffic_analyzer... " >&6; }
  	if test "$MODULE_vfs_smb_traffic_analyzer"; then
  		DEST=$MODULE_vfs_smb_traffic_analyzer
-@@ -86571,12 +37870,10 @@
+@@ -87270,12 +38203,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91967,7 +92471,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -86587,16 +37884,16 @@
+@@ -87286,16 +38217,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
  
  
@@ -91987,7 +92491,7 @@
  $as_echo_n "checking how to build vfs_onefs... " >&6; }
  	if test "$MODULE_vfs_onefs"; then
  		DEST=$MODULE_vfs_onefs
-@@ -86608,12 +37905,10 @@
+@@ -87307,12 +38238,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92002,7 +92506,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -86624,16 +37919,16 @@
+@@ -87323,16 +38252,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
  
  
@@ -92022,7 +92526,7 @@
  $as_echo_n "checking how to build vfs_onefs_shadow_copy... " >&6; }
  	if test "$MODULE_vfs_onefs_shadow_copy"; then
  		DEST=$MODULE_vfs_onefs_shadow_copy
-@@ -86645,12 +37940,10 @@
+@@ -87344,12 +38273,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92037,7 +92541,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -86661,16 +37954,16 @@
+@@ -87360,16 +38287,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
  
  
@@ -92057,7 +92561,7 @@
  $as_echo_n "checking how to build vfs_dirsort... " >&6; }
  	if test "$MODULE_vfs_dirsort"; then
  		DEST=$MODULE_vfs_dirsort
-@@ -86682,12 +37975,10 @@
+@@ -87381,12 +38308,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92072,7 +92576,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -86698,16 +37989,16 @@
+@@ -87397,16 +38322,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
  
  
@@ -92092,7 +92596,7 @@
  $as_echo_n "checking how to build vfs_scannedonly... " >&6; }
  	if test "$MODULE_vfs_scannedonly"; then
  		DEST=$MODULE_vfs_scannedonly
-@@ -86719,12 +38010,10 @@
+@@ -87418,12 +38343,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92107,7 +92611,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_scannedonly"
-@@ -86735,11 +38024,11 @@
+@@ -87434,11 +38357,11 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
  
  
@@ -92121,7 +92625,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -86761,7 +38050,7 @@
+@@ -87460,7 +38383,7 @@
  
  
  
@@ -92130,7 +92634,7 @@
  $as_echo_n "checking how to build perfcount_onefs... " >&6; }
  	if test "$MODULE_perfcount_onefs"; then
  		DEST=$MODULE_perfcount_onefs
-@@ -86773,12 +38062,10 @@
+@@ -87472,12 +38395,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92145,7 +92649,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -86789,16 +38076,16 @@
+@@ -87488,16 +38409,16 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
  
  
@@ -92165,7 +92669,7 @@
  $as_echo_n "checking how to build perfcount_test... " >&6; }
  	if test "$MODULE_perfcount_test"; then
  		DEST=$MODULE_perfcount_test
-@@ -86810,12 +38097,10 @@
+@@ -87509,12 +38430,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92180,7 +92684,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_test"
-@@ -86826,11 +38111,11 @@
+@@ -87525,11 +38444,11 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
  
  
@@ -92194,7 +92698,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -86851,7 +38136,7 @@
+@@ -87550,7 +38469,7 @@
  
  
  
@@ -92203,7 +92707,7 @@
  $as_echo_n "checking how to build gpext_registry... " >&6; }
  	if test "$MODULE_gpext_registry"; then
  		DEST=$MODULE_gpext_registry
-@@ -86863,12 +38148,10 @@
+@@ -87562,12 +38481,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92218,7 +92722,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_registry"
-@@ -86879,16 +38162,16 @@
+@@ -87578,16 +38495,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
  
  
@@ -92238,7 +92742,7 @@
  $as_echo_n "checking how to build gpext_scripts... " >&6; }
  	if test "$MODULE_gpext_scripts"; then
  		DEST=$MODULE_gpext_scripts
-@@ -86900,12 +38183,10 @@
+@@ -87599,12 +38516,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92253,7 +92757,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -86916,16 +38197,16 @@
+@@ -87615,16 +38530,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
  
  
@@ -92273,7 +92777,7 @@
  $as_echo_n "checking how to build gpext_security... " >&6; }
  	if test "$MODULE_gpext_security"; then
  		DEST=$MODULE_gpext_security
-@@ -86937,12 +38218,10 @@
+@@ -87636,12 +38551,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92288,7 +92792,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_security"
-@@ -86953,11 +38232,11 @@
+@@ -87652,11 +38565,11 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
  
  
@@ -92302,7 +92806,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -86993,18 +38272,16 @@
+@@ -87692,18 +38605,16 @@
  #################################################
  # If run from the build farm, enable NASTY hacks
  #################################################
@@ -92325,7 +92829,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87021,11 +38298,11 @@
+@@ -87720,11 +38631,11 @@
      rt_signal_lease_works=yes
      rt_signal_aio_works=yes
  
@@ -92340,7 +92844,7 @@
  $as_echo "cross" >&6; }
  
  	    # cross compiling, I hope you know what you are doing
-@@ -87033,11 +38310,7 @@
+@@ -87732,11 +38643,7 @@
  
  
  else
@@ -92353,7 +92857,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -87096,41 +38369,16 @@
+@@ -87795,41 +38702,16 @@
  }
  
  _ACEOF
@@ -92399,7 +92903,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -87141,61 +38389,31 @@
+@@ -87840,61 +38722,31 @@
    return 0;
  }
  _ACEOF
@@ -92468,7 +92972,7 @@
  $as_echo "no" >&6; }
  	    case "$ac_status" in
  		1|11|101|111)  rt_signal_lease_ok=no ;;
-@@ -87209,13 +38427,9 @@
+@@ -87908,13 +38760,9 @@
  
  	    # no RT_SIGNAL bug, we are golden
  
@@ -92484,7 +92988,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -87226,65 +38440,39 @@
+@@ -87925,65 +38773,39 @@
    return 0;
  }
  _ACEOF
@@ -92559,7 +93063,7 @@
    enableval=$enable_merged_build;  enable_merged_build=$enableval
  else
     enable_merged_build=auto
-@@ -87293,9 +38481,7 @@
+@@ -87992,9 +38814,7 @@
  
  if test x"$enable_merged_build" = x"yes" -a \
  	x"$merged_build_possible" = x"no" ; then
@@ -92570,7 +93074,7 @@
  fi
  
  
-@@ -87318,9 +38504,9 @@
+@@ -88017,9 +38837,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -92582,7 +93086,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -87333,14 +38519,14 @@
+@@ -88032,14 +38852,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -92600,7 +93104,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87348,10 +38534,10 @@
+@@ -88047,10 +38867,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -92613,7 +93117,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87362,9 +38548,9 @@
+@@ -88061,9 +38881,9 @@
  	else
  		# Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args.
  set dummy python$PYTHON_VER; ac_word=$2
@@ -92625,7 +93129,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -87377,14 +38563,14 @@
+@@ -88076,14 +38896,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -92643,7 +93147,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87392,10 +38578,10 @@
+@@ -88091,10 +38911,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -92656,7 +93160,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87403,7 +38589,7 @@
+@@ -88102,7 +38922,7 @@
  	fi
  	if test -z "$PYTHON"; then
  		working_python=no
@@ -92665,7 +93169,7 @@
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -87414,9 +38600,9 @@
+@@ -88113,9 +38933,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -92677,7 +93181,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -87429,14 +38615,14 @@
+@@ -88128,14 +38948,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -92695,7 +93199,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87444,10 +38630,10 @@
+@@ -88143,10 +38963,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -92708,7 +93212,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87458,9 +38644,9 @@
+@@ -88157,9 +38977,9 @@
  	else
  		# Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
  set dummy python$PYTHON_VER-config; ac_word=$2
@@ -92720,7 +93224,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -87473,14 +38659,14 @@
+@@ -88172,14 +38992,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -92738,7 +93242,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87488,10 +38674,10 @@
+@@ -88187,10 +39007,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -92751,7 +93255,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87499,7 +38685,7 @@
+@@ -88198,7 +39018,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -92760,7 +93264,7 @@
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -87509,11 +38695,7 @@
+@@ -88208,11 +39028,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -92773,7 +93277,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -87530,42 +38712,15 @@
+@@ -88229,42 +39045,15 @@
    return 0;
  }
  _ACEOF
@@ -92819,7 +93323,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -87577,11 +38732,7 @@
+@@ -88276,11 +39065,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -92832,7 +93336,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -87598,42 +38749,15 @@
+@@ -88297,42 +39082,15 @@
    return 0;
  }
  _ACEOF
@@ -92878,7 +93382,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -87648,11 +38772,7 @@
+@@ -88347,11 +39105,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -92891,7 +93395,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -87669,42 +38789,15 @@
+@@ -88368,42 +39122,15 @@
    return 0;
  }
  _ACEOF
@@ -92937,7 +93441,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -87716,11 +38809,7 @@
+@@ -88415,11 +39142,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -92950,7 +93454,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -87737,42 +38826,15 @@
+@@ -88436,42 +39159,15 @@
    return 0;
  }
  _ACEOF
@@ -92996,7 +93500,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -87802,11 +38864,7 @@
+@@ -88501,11 +39197,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -93009,7 +93513,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -87823,64 +38881,37 @@
+@@ -88522,64 +39214,37 @@
    return 0;
  }
  _ACEOF
@@ -93082,7 +93586,7 @@
  $as_echo "$merged_build_possible" >&6; }
  
  	# Enable merged build automatically if possible, when in developer mode
-@@ -87936,9 +38967,9 @@
+@@ -88635,9 +39300,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -93094,7 +93598,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -87951,14 +38982,14 @@
+@@ -88650,14 +39315,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93112,7 +93616,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87966,10 +38997,10 @@
+@@ -88665,10 +39330,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93125,7 +93629,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87980,9 +39011,9 @@
+@@ -88679,9 +39344,9 @@
  	else
  		# Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args.
  set dummy python$PYTHON_VER; ac_word=$2
@@ -93137,7 +93641,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -87995,14 +39026,14 @@
+@@ -88694,14 +39359,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93155,7 +93659,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88010,10 +39041,10 @@
+@@ -88709,10 +39374,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93168,7 +93672,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88021,7 +39052,7 @@
+@@ -88720,7 +39385,7 @@
  	fi
  	if test -z "$PYTHON"; then
  		working_python=no
@@ -93177,7 +93681,7 @@
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -88032,9 +39063,9 @@
+@@ -88731,9 +39396,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -93189,7 +93693,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88047,14 +39078,14 @@
+@@ -88746,14 +39411,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93207,7 +93711,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88062,10 +39093,10 @@
+@@ -88761,10 +39426,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93220,7 +93724,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88076,9 +39107,9 @@
+@@ -88775,9 +39440,9 @@
  	else
  		# Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
  set dummy python$PYTHON_VER-config; ac_word=$2
@@ -93232,7 +93736,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88091,14 +39122,14 @@
+@@ -88790,14 +39455,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93250,7 +93754,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88106,10 +39137,10 @@
+@@ -88805,10 +39470,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93263,7 +93767,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88117,7 +39148,7 @@
+@@ -88816,7 +39481,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -93272,7 +93776,7 @@
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -88127,11 +39158,7 @@
+@@ -88826,11 +39491,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93285,7 +93789,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88148,42 +39175,15 @@
+@@ -88847,42 +39508,15 @@
    return 0;
  }
  _ACEOF
@@ -93331,7 +93835,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88195,11 +39195,7 @@
+@@ -88894,11 +39528,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93344,7 +93848,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88216,42 +39212,15 @@
+@@ -88915,42 +39545,15 @@
    return 0;
  }
  _ACEOF
@@ -93390,7 +93894,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88266,11 +39235,7 @@
+@@ -88965,11 +39568,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93403,7 +93907,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88287,42 +39252,15 @@
+@@ -88986,42 +39585,15 @@
    return 0;
  }
  _ACEOF
@@ -93449,7 +93953,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88334,11 +39272,7 @@
+@@ -89033,11 +39605,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93462,7 +93966,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88355,42 +39289,15 @@
+@@ -89054,42 +39622,15 @@
    return 0;
  }
  _ACEOF
@@ -93508,7 +94012,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88420,11 +39327,7 @@
+@@ -89119,11 +39660,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -93521,7 +94025,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88441,52 +39344,25 @@
+@@ -89140,52 +39677,25 @@
    return 0;
  }
  _ACEOF
@@ -93579,7 +94083,7 @@
  $as_echo "yes" >&6; }
  
  
-@@ -88514,20 +39390,18 @@
+@@ -89213,20 +39723,18 @@
  
  
  	else
@@ -93604,7 +94108,7 @@
  $as_echo "$pythondir" >&6; }
  
  
-@@ -88542,553 +39416,133 @@
+@@ -89241,553 +39749,133 @@
  
  
  
@@ -94245,7 +94749,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89106,63 +39560,32 @@
+@@ -89805,63 +39893,32 @@
    return 0;
  }
  _ACEOF
@@ -94320,7 +94824,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89180,43 +39603,18 @@
+@@ -89879,43 +39936,18 @@
    return 0;
  }
  _ACEOF
@@ -94370,7 +94874,7 @@
    TERMLIBS="-lreadline $TERMLIBS"
         EXTERNAL_READLINE=yes
         break
-@@ -89230,11 +39628,11 @@
+@@ -89929,11 +39961,11 @@
  
      ;;
    no)
@@ -94384,7 +94888,7 @@
  $as_echo "yes" >&6; }
  
      # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -89246,151 +39644,12 @@
+@@ -89945,151 +39977,12 @@
      LDFLAGS="-L$with_readline/lib $LDFLAGS"
      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  
@@ -94542,7 +95046,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -89399,151 +39658,12 @@
+@@ -90098,151 +39991,12 @@
  
  done
  
@@ -94699,7 +95203,7 @@
  _ACEOF
  
  fi
-@@ -89551,168 +39671,26 @@
+@@ -90250,168 +40004,26 @@
  done
  
  
@@ -94877,7 +95381,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89730,63 +39708,32 @@
+@@ -90429,63 +40041,32 @@
    return 0;
  }
  _ACEOF
@@ -94952,7 +95456,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89804,43 +39751,18 @@
+@@ -90503,43 +40084,18 @@
    return 0;
  }
  _ACEOF
@@ -95002,7 +95506,7 @@
    TERMLDFLAGS="-L$with_readline/lib"
         TERMCPPFLAGS="-I$with_readline/include"
         LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -89860,7 +39782,7 @@
+@@ -90559,7 +40115,7 @@
      ;;
    esac
  else
@@ -95011,7 +95515,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -89869,18 +39791,14 @@
+@@ -90568,18 +40124,14 @@
  # 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.
@@ -95033,7 +95537,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89893,142 +39811,53 @@
+@@ -90592,142 +40144,53 @@
  int
  main ()
  {
@@ -95207,7 +95711,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -90046,60 +39875,31 @@
+@@ -90745,60 +40208,31 @@
    return 0;
  }
  _ACEOF
@@ -95278,7 +95782,7 @@
  
  
  MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -90154,7 +39954,7 @@
+@@ -90853,7 +40287,7 @@
  ###################################
  "
  
@@ -95287,7 +95791,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -90163,102 +39963,9 @@
+@@ -90862,102 +40296,9 @@
  
  
  
@@ -95392,7 +95896,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -90267,102 +39974,9 @@
+@@ -90966,102 +40307,9 @@
  
  fi
  
@@ -95497,7 +96001,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -90372,151 +39986,12 @@
+@@ -91071,151 +40319,12 @@
  fi
  
  
@@ -95653,7 +96157,7 @@
  _ACEOF
  
  else
-@@ -90526,151 +40001,12 @@
+@@ -91225,151 +40334,12 @@
  done
  
  
@@ -95809,7 +96313,7 @@
  _ACEOF
  
  else
-@@ -90680,29 +40016,6 @@
+@@ -91379,29 +40349,6 @@
  done
  
  
@@ -95839,7 +96343,7 @@
  for ac_header in 				\
  	crypt.h					\
  	curses.h				\
-@@ -90728,147 +40041,11 @@
+@@ -91427,147 +40374,11 @@
  	netinet6/in6.h				\
  	libintl.h
  
@@ -95992,7 +96496,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -90878,42 +40055,6 @@
+@@ -91577,42 +40388,6 @@
  done
  
  
@@ -96035,7 +96539,7 @@
  for ac_func in 				\
  	atexit					\
  	cgetent					\
-@@ -90946,271 +40087,65 @@
+@@ -91645,271 +40420,65 @@
  	warn					\
  	errx					\
  	warnx					\
@@ -96344,7 +96848,7 @@
  _ACEOF
  
  fi
-@@ -91226,11 +40161,11 @@
+@@ -91925,11 +40494,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -96358,7 +96862,7 @@
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -91240,17 +40175,13 @@
+@@ -91939,17 +40508,13 @@
  
  
  
@@ -96379,7 +96883,7 @@
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_BSWAP_H
  #include <sys/bswap.h>
-@@ -91263,140 +40194,25 @@
+@@ -91962,140 +40527,25 @@
    return 0;
  }
  _ACEOF
@@ -96529,7 +97033,7 @@
  _ACEOF
  
  fi
-@@ -91412,11 +40228,11 @@
+@@ -92111,11 +40561,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -96543,7 +97047,7 @@
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -91427,25 +40243,21 @@
+@@ -92126,25 +40576,21 @@
  
  
  
@@ -96573,7 +97077,7 @@
    ac_cv_struct_winsize=yes; break
  fi
  rm -f conftest*
-@@ -91455,63 +40267,45 @@
+@@ -92154,63 +40600,45 @@
  
  if test "$ac_cv_struct_winsize" = "yes"; then
  
@@ -96648,7 +97152,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
-@@ -91524,35 +40318,14 @@
+@@ -92223,35 +40651,14 @@
    return 0;
  }
  _ACEOF
@@ -96687,7 +97191,7 @@
  $as_echo "$ac_cv_type_signal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -91562,9 +40335,7 @@
+@@ -92261,9 +40668,7 @@
  
  if test "$ac_cv_type_signal" = "void" ; then
  
@@ -96698,7 +97202,7 @@
  
  fi
  
-@@ -91595,18 +40366,14 @@
+@@ -92294,18 +40699,14 @@
  
  
  
@@ -96720,7 +97224,7 @@
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
-@@ -91623,44 +40390,15 @@
+@@ -92322,44 +40723,15 @@
    return 0;
  }
  _ACEOF
@@ -96770,7 +97274,7 @@
  /* end confdefs.h.  */
  extern int h_errno;
  int foo(void) { return h_errno; }
-@@ -91672,44 +40410,19 @@
+@@ -92371,44 +40743,19 @@
    return 0;
  }
  _ACEOF
@@ -96820,7 +97324,7 @@
  $as_echo "$ac_foo" >&6; }
  if test "$ac_foo" = yes; then
  
-@@ -91717,81 +40430,23 @@
+@@ -92416,81 +40763,23 @@
  #define HAVE_H_ERRNO 1
  _ACEOF
  
@@ -96908,7 +97412,7 @@
  fi
  
  
-@@ -91807,151 +40462,12 @@
+@@ -92506,151 +40795,12 @@
  
  
  
@@ -97065,7 +97569,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -91963,23 +40479,17 @@
+@@ -92662,23 +40812,17 @@
  
  
  
@@ -97092,7 +97596,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -91997,54 +40507,28 @@
+@@ -92696,54 +40840,28 @@
    return 0;
  }
  _ACEOF
@@ -97154,7 +97658,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBUTIL 1
  _ACEOF
-@@ -92061,7 +40545,6 @@
+@@ -92760,7 +40878,6 @@
  fi
  
  
@@ -97162,7 +97666,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  OPENPTY_ENABLE = YES
  "
-@@ -92081,23 +40564,17 @@
+@@ -92780,23 +40897,17 @@
  
  
  
@@ -97189,7 +97693,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -92115,54 +40592,28 @@
+@@ -92814,54 +40925,28 @@
    return 0;
  }
  _ACEOF
@@ -97251,7 +97755,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBINTL 1
  _ACEOF
-@@ -92179,7 +40630,6 @@
+@@ -92878,7 +40963,6 @@
  fi
  
  
@@ -97259,7 +97763,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  INTL_ENABLE = YES
  "
-@@ -92203,150 +40653,12 @@
+@@ -92902,150 +40986,12 @@
  
  
  
@@ -97415,7 +97919,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -92356,22 +40668,9 @@
+@@ -93055,22 +41001,9 @@
  done
  
  
@@ -97440,7 +97944,7 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -92382,46 +40681,10 @@
+@@ -93081,46 +41014,10 @@
  #include <arpa/nameser.h>
  #endif
  
@@ -97490,7 +97994,7 @@
  _ACEOF
  
  fi
-@@ -92433,9 +40696,9 @@
+@@ -93132,9 +41029,9 @@
  
  
  
@@ -97502,7 +98006,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -92450,11 +40713,7 @@
+@@ -93149,11 +41046,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -97515,7 +98019,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -92476,148 +40735,31 @@
+@@ -93175,148 +41068,31 @@
  {
  res_search(0,0,0,0,0)
    ;
@@ -97685,7 +98189,7 @@
  _ACEOF
  
  fi
-@@ -92637,13 +40779,13 @@
+@@ -93336,13 +41112,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -97701,7 +98205,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -92657,7 +40799,7 @@
+@@ -93356,7 +41132,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -97710,7 +98214,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -92672,9 +40814,9 @@
+@@ -93371,9 +41147,9 @@
  
  
  
@@ -97722,7 +98226,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -92689,11 +40831,7 @@
+@@ -93388,11 +41164,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -97735,7 +98239,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -92718,38 +40856,11 @@
+@@ -93417,38 +41189,11 @@
    return 0;
  }
  _ACEOF
@@ -97777,7 +98281,7 @@
  	done
  	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
  	LIBS="$ac_save_LIBS"
-@@ -92761,102 +40872,12 @@
+@@ -93460,102 +41205,12 @@
  eval "ac_res=\$ac_cv_funclib_res_nsearch"
  
  if false; then
@@ -97885,7 +98389,7 @@
  _ACEOF
  
  fi
-@@ -92876,13 +40897,13 @@
+@@ -93575,13 +41230,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -97901,7 +98405,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -92896,7 +40917,7 @@
+@@ -93595,7 +41250,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -97910,7 +98414,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -92911,9 +40932,9 @@
+@@ -93610,9 +41265,9 @@
  
  
  
@@ -97922,7 +98426,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -92928,11 +40949,7 @@
+@@ -93627,11 +41282,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -97935,7 +98439,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -92957,38 +40974,11 @@
+@@ -93656,38 +41307,11 @@
    return 0;
  }
  _ACEOF
@@ -97977,7 +98481,7 @@
  	done
  	eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93000,102 +40990,12 @@
+@@ -93699,102 +41323,12 @@
  eval "ac_res=\$ac_cv_funclib_res_ndestroy"
  
  if false; then
@@ -98085,7 +98589,7 @@
  _ACEOF
  
  fi
-@@ -93115,13 +41015,13 @@
+@@ -93814,13 +41348,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98101,7 +98605,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93135,7 +41035,7 @@
+@@ -93834,7 +41368,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98110,7 +98614,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93149,9 +41049,9 @@
+@@ -93848,9 +41382,9 @@
  
  
  
@@ -98122,7 +98626,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93166,11 +41066,7 @@
+@@ -93865,11 +41399,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98135,7 +98639,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_DNS_H
-@@ -93185,38 +41081,11 @@
+@@ -93884,38 +41414,11 @@
    return 0;
  }
  _ACEOF
@@ -98177,7 +98681,7 @@
  	done
  	eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93228,102 +41097,12 @@
+@@ -93927,102 +41430,12 @@
  eval "ac_res=\$ac_cv_funclib_dns_search"
  
  if false; then
@@ -98285,7 +98789,7 @@
  _ACEOF
  
  fi
-@@ -93343,13 +41122,13 @@
+@@ -94042,13 +41455,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98301,7 +98805,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93363,7 +41142,7 @@
+@@ -94062,7 +41475,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98310,7 +98814,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93375,9 +41154,9 @@
+@@ -94074,9 +41487,9 @@
  
  
  
@@ -98322,7 +98826,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93392,11 +41171,7 @@
+@@ -94091,11 +41504,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98335,7 +98839,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -93421,38 +41196,11 @@
+@@ -94120,38 +41529,11 @@
    return 0;
  }
  _ACEOF
@@ -98377,7 +98881,7 @@
  	done
  	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93464,102 +41212,12 @@
+@@ -94163,102 +41545,12 @@
  eval "ac_res=\$ac_cv_funclib_dn_expand"
  
  if false; then
@@ -98485,7 +98989,7 @@
  _ACEOF
  
  fi
-@@ -93579,13 +41237,13 @@
+@@ -94278,13 +41570,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98501,7 +99005,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93599,7 +41257,7 @@
+@@ -94298,7 +41590,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98510,7 +99014,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93611,18 +41269,14 @@
+@@ -94310,18 +41602,14 @@
  
  
  
@@ -98532,7 +99036,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  #ifdef HAVE_SYS_TYPES_H
-@@ -93646,44 +41300,15 @@
+@@ -94345,44 +41633,15 @@
    return 0;
  }
  _ACEOF
@@ -98582,7 +99086,7 @@
  /* end confdefs.h.  */
  extern int _res;
  int foo(void) { return _res; }
-@@ -93695,44 +41320,19 @@
+@@ -94394,44 +41653,19 @@
    return 0;
  }
  _ACEOF
@@ -98632,7 +99136,7 @@
  $as_echo "$ac_foo" >&6; }
  if test "$ac_foo" = yes; then
  
-@@ -93740,18 +41340,7 @@
+@@ -94439,18 +41673,7 @@
  #define HAVE__RES 1
  _ACEOF
  
@@ -98652,7 +99156,7 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -93764,64 +41353,17 @@
+@@ -94463,64 +41686,17 @@
  #ifdef HAVE_RESOLV_H
  #include <resolv.h>
  #endif
@@ -98722,7 +99226,7 @@
  fi
  
  
-@@ -93887,9 +41429,9 @@
+@@ -94586,9 +41762,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -98734,7 +99238,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LEX"; then
-@@ -93900,24 +41442,24 @@
+@@ -94599,24 +41775,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -98764,7 +99268,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -93946,20 +41488,20 @@
+@@ -94645,20 +41821,20 @@
    return ! yylex () + ! yywrap ();
  }
  _ACEOF
@@ -98792,7 +99296,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93968,19 +41510,17 @@
+@@ -94667,19 +41843,17 @@
  elif test -f lexyy.c; then
    ac_cv_prog_lex_root=lexyy
  else
@@ -98816,7 +99320,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93988,55 +41528,29 @@
+@@ -94687,55 +41861,29 @@
      ac_cv_lib_lex='none needed'
      for ac_lib in '' -lfl -ll; do
        LIBS="$ac_lib $ac_save_LIBS"
@@ -98880,7 +99384,7 @@
    $as_echo_n "(cached) " >&6
  else
    # POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -94045,52 +41559,24 @@
+@@ -94744,52 +41892,24 @@
  ac_cv_prog_lex_yytext_pointer=no
  ac_save_LIBS=$LIBS
  LIBS="$LEXLIB $ac_save_LIBS"
@@ -98940,7 +99444,7 @@
  
  fi
  rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -94100,9 +41586,9 @@
+@@ -94799,9 +41919,9 @@
  if test x"$LEX_BASENAME" = x"flex"; then
  	# "flex 2.5.33"
  	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -98952,7 +99456,7 @@
  $as_echo "$FLEX_VERSION" >&6; }
  	FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
  	FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -94115,9 +41601,9 @@
+@@ -94814,9 +41934,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -98964,7 +99468,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$YACC"; then
-@@ -94128,24 +41614,24 @@
+@@ -94827,24 +41947,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -98994,7 +99498,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -94158,9 +41644,9 @@
+@@ -94857,9 +41977,9 @@
  if test x"$YACC_BASENAME" = x"bison -y"; then
  	# bison (GNU Bison) 2.3
  	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -99006,7 +99510,7 @@
  $as_echo "$BISON_VERSION" >&6; }
  	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
  	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -94168,7 +41654,7 @@
+@@ -94867,7 +41987,7 @@
  	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
  fi
  
@@ -99015,7 +99519,7 @@
  $as_echo_n "checking working LEX YACC combination... " >&6; }
  LEX_YACC="no"
  if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-@@ -94184,7 +41670,7 @@
+@@ -94883,7 +42003,7 @@
  	LEX=false
  	YACC=false
  fi
@@ -99024,7 +99528,7 @@
  $as_echo "$LEX_YACC" >&6; }
  
  # Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -94192,21 +41678,15 @@
+@@ -94891,21 +42011,15 @@
  
  # if we ever get to using a host kerberos, we might add conditionals here
  
@@ -99049,7 +99553,7 @@
  
  HAVE_GSSAPI=YES
  
-@@ -94286,193 +41766,48 @@
+@@ -94985,193 +42099,48 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
  
@@ -99271,7 +99775,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -94490,46 +41825,15 @@
+@@ -95189,46 +42158,15 @@
    return 0;
  }
  _ACEOF
@@ -99322,7 +99826,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -94547,65 +41851,32 @@
+@@ -95246,65 +42184,32 @@
    return 0;
  }
  _ACEOF
@@ -99396,7 +99900,7 @@
  /* end confdefs.h.  */
  /* Define backtrace to an innocuous variant, in case <limits.h> declares backtrace.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -94646,43 +41917,18 @@
+@@ -95345,43 +42250,18 @@
    return 0;
  }
  _ACEOF
@@ -99446,7 +99950,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_BACKTRACE 1
  _ACEOF
-@@ -94690,7 +41936,6 @@
+@@ -95389,7 +42269,6 @@
  fi
  
  
@@ -99454,7 +99958,7 @@
  if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94776,102 +42021,12 @@
+@@ -95475,102 +42354,12 @@
  
  
  
@@ -99562,7 +100066,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -94880,102 +42035,12 @@
+@@ -95579,102 +42368,12 @@
  done
  
  
@@ -99669,7 +100173,7 @@
  _ACEOF
  
  fi
-@@ -94984,153 +42049,14 @@
+@@ -95683,153 +42382,14 @@
  
  #################################################
  # these tests are taken from the GNU fileutils package
@@ -99829,7 +100333,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -95140,65 +42066,16 @@
+@@ -95839,65 +42399,16 @@
  done
  
  
@@ -99900,7 +100404,7 @@
  _ACEOF
  
  fi
-@@ -95211,19 +42088,15 @@
+@@ -95910,19 +42421,15 @@
  # Test for statvfs64.
  if test $space = no; then
    # SVR4
@@ -99924,7 +100428,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -95237,51 +42110,22 @@
+@@ -95936,51 +42443,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -99982,7 +100486,7 @@
  
    fi
  fi
-@@ -95294,16 +42138,12 @@
+@@ -95993,16 +42471,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -100002,7 +100506,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -95315,64 +42155,33 @@
+@@ -96014,64 +42488,33 @@
    return 0;
  }
  _ACEOF
@@ -100076,7 +100580,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -95384,59 +42193,32 @@
+@@ -96083,59 +42526,32 @@
    return 0;
  }
  _ACEOF
@@ -100144,7 +100648,7 @@
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -95449,71 +42231,38 @@
+@@ -96148,71 +42564,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -100226,7 +100730,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -95532,71 +42281,38 @@
+@@ -96231,71 +42614,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -100308,7 +100812,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -95606,71 +42322,38 @@
+@@ -96305,71 +42655,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -100390,7 +100894,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -95686,71 +42369,38 @@
+@@ -96385,71 +42702,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -100472,7 +100976,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -95770,201 +42420,33 @@
+@@ -96469,201 +42753,33 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -100697,7 +101201,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -95973,19 +42455,15 @@
+@@ -96672,19 +42788,15 @@
  
  done
  
@@ -100720,7 +101224,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96003,46 +42481,15 @@
+@@ -96702,46 +42814,15 @@
    return 0;
  }
  _ACEOF
@@ -100771,7 +101275,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96060,65 +42507,32 @@
+@@ -96759,65 +42840,32 @@
    return 0;
  }
  _ACEOF
@@ -100845,7 +101349,7 @@
  /* end confdefs.h.  */
  /* Define flistxattr to an innocuous variant, in case <limits.h> declares flistxattr.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -96159,50 +42573,24 @@
+@@ -96858,50 +42906,24 @@
    return 0;
  }
  _ACEOF
@@ -100902,7 +101406,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  XATTR_LIBS = ${XATTR_LIBS}
  XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -96212,18 +42600,14 @@
+@@ -96911,18 +42933,14 @@
  
  
  if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -100924,7 +101428,7 @@
  /* end confdefs.h.  */
  
  	 	#include <sys/types.h>
-@@ -96246,48 +42630,23 @@
+@@ -96945,48 +42963,23 @@
    return 0;
  }
  _ACEOF
@@ -100978,7 +101482,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -96299,20 +42658,16 @@
+@@ -96998,20 +42991,16 @@
  fi
  
  
@@ -101003,7 +101507,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/capability.h>
-@@ -96327,117 +42682,55 @@
+@@ -97026,117 +43015,55 @@
  }
  
  _ACEOF
@@ -101137,7 +101641,7 @@
  
  fi
  
-@@ -96445,7 +42738,7 @@
+@@ -97144,7 +43071,7 @@
  INCLUDED_POPT=auto
  
  # Check whether --with-included-popt was given.
@@ -101146,7 +101650,7 @@
    withval=$with_included_popt;  INCLUDED_POPT=$withval
  fi
  
-@@ -96454,169 +42747,26 @@
+@@ -97153,169 +43080,26 @@
  
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -101324,7 +101828,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96634,43 +42784,18 @@
+@@ -97333,43 +43117,18 @@
    return 0;
  }
  _ACEOF
@@ -101374,7 +101878,7 @@
     POPT_LIBS="-lpopt"
  fi
  
-@@ -96682,9 +42807,9 @@
+@@ -97381,9 +43140,9 @@
  	fi
  fi
  
@@ -101386,7 +101890,7 @@
  $as_echo "$INCLUDED_POPT" >&6; }
  if test x"$INCLUDED_POPT" != x"no"; then
  			poptdir=""
-@@ -96698,156 +42823,16 @@
+@@ -97397,156 +43156,16 @@
  		fi
  	done
          if test x"$poptdir" = "x"; then
@@ -101550,7 +102054,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -96886,12 +42871,10 @@
+@@ -97585,12 +43204,10 @@
  LOOK_DIRS="/usr /usr/local /sw"
  
  # Check whether --with-libiconv was given.
@@ -101565,7 +102069,7 @@
    else
       if test "$withval" != "yes" ; then
  
-@@ -96903,26 +42886,20 @@
+@@ -97602,26 +43219,20 @@
  	LIBS=-liconv
  
  
@@ -101600,7 +102104,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -96935,33 +42912,10 @@
+@@ -97634,33 +43245,10 @@
  }
  
  _ACEOF
@@ -101637,7 +102141,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -96969,29 +42923,17 @@
+@@ -97668,29 +43256,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -101672,7 +102176,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97004,33 +42946,10 @@
+@@ -97703,33 +43279,10 @@
  }
  
  _ACEOF
@@ -101709,7 +102213,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97038,28 +42957,17 @@
+@@ -97737,28 +43290,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -101744,7 +102248,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97072,33 +42980,10 @@
+@@ -97771,33 +43313,10 @@
  }
  
  _ACEOF
@@ -101781,7 +102285,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97106,31 +42991,22 @@
+@@ -97805,31 +43324,22 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -101819,7 +102323,7 @@
  	CPPFLAGS="$save_CPPFLAGS"
  	LDFLAGS="$save_LDFLAGS"
  	LIBS="$save_LIBS"
-@@ -97143,17 +43019,13 @@
+@@ -97842,17 +43352,13 @@
  
  if test x$ICONV_FOUND = xno; then
  
@@ -101841,7 +102345,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97166,49 +43038,20 @@
+@@ -97865,49 +43371,20 @@
  }
  
  _ACEOF
@@ -101897,7 +102401,7 @@
  fi
  
  for i in $LOOK_DIRS ; do
-@@ -97225,24 +43068,20 @@
+@@ -97924,24 +43401,20 @@
  	LIBS=-liconv
  
  
@@ -101929,7 +102433,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97255,33 +43094,10 @@
+@@ -97954,33 +43427,10 @@
  }
  
  _ACEOF
@@ -101966,7 +102470,7 @@
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97289,27 +43105,17 @@
+@@ -97988,27 +43438,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -101998,7 +102502,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97322,33 +43128,10 @@
+@@ -98021,33 +43461,10 @@
  }
  
  _ACEOF
@@ -102035,7 +102539,7 @@
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97356,26 +43139,17 @@
+@@ -98055,26 +43472,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102067,7 +102571,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97387,304 +43161,92 @@
+@@ -98086,304 +43494,92 @@
     return 0;
  }
  
@@ -102439,7 +102943,7 @@
  _ACEOF
  
  fi
-@@ -97763,151 +43325,12 @@
+@@ -98462,151 +43658,12 @@
  
  
  
@@ -102595,7 +103099,7 @@
  _ACEOF
  
  fi
-@@ -97917,23 +43340,17 @@
+@@ -98616,23 +43673,17 @@
  
  
  
@@ -102622,7 +103126,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -97951,54 +43368,28 @@
+@@ -98650,54 +43701,28 @@
    return 0;
  }
  _ACEOF
@@ -102684,7 +103188,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -98014,18 +43405,13 @@
+@@ -98713,18 +43738,13 @@
  
  fi
  
@@ -102706,7 +103210,7 @@
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -98043,40 +43429,19 @@
+@@ -98742,40 +43762,19 @@
    return 0;
  }
  _ACEOF
@@ -102749,7 +103253,7 @@
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -98135,9 +43500,9 @@
+@@ -98834,9 +43833,9 @@
  	if test -z "$PKG_CONFIG"; then
  		# Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -102761,7 +103265,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -98150,14 +43515,14 @@
+@@ -98849,14 +43848,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -102779,7 +103283,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98166,10 +43531,10 @@
+@@ -98865,10 +43864,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -102792,20 +103296,20 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -98185,52 +43550,27 @@
+@@ -98884,52 +43883,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for talloc >= 2.0.0" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= 2.0.0" >&5
- $as_echo_n "checking for talloc >= 2.0.0... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for talloc >= 2.0.1" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= 2.0.1" >&5
+ $as_echo_n "checking for talloc >= 2.0.1... " >&6; }
  
- 			if $PKG_CONFIG --exists 'talloc >= 2.0.0' ; then
+ 			if $PKG_CONFIG --exists 'talloc >= 2.0.1' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= 2.0.0'`"
+ 				LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= 2.0.1'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBTALLOC_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTALLOC_CFLAGS" >&5
@@ -102852,7 +103356,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTALLOC_ENABLE = YES
-@@ -98238,22 +43578,16 @@
+@@ -98937,22 +43911,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTALLOC\"} = \"YES\";"
  
@@ -102878,17 +103382,17 @@
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 				ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.0'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.0'`"
-@@ -98314,7 +43648,7 @@
+ 				ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.1'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.1'`"
+@@ -99013,7 +43981,7 @@
  				ac_cv_LIBTALLOC_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.0'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.1'
  				ac_cv_LIBTALLOC_found=no
-@@ -98348,9 +43682,9 @@
+@@ -99047,9 +44015,9 @@
  	if test -z "$PKG_CONFIG"; then
  		# Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -102900,7 +103404,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -98363,14 +43697,14 @@
+@@ -99062,14 +44030,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -102918,7 +103422,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98379,10 +43713,10 @@
+@@ -99078,10 +44046,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -102931,20 +103435,20 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -98398,52 +43732,27 @@
+@@ -99097,52 +44065,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for tdb >= 1.1.7" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= 1.1.7" >&5
- $as_echo_n "checking for tdb >= 1.1.7... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for tdb >= 1.2.1" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= 1.2.1" >&5
+ $as_echo_n "checking for tdb >= 1.2.1... " >&6; }
  
- 			if $PKG_CONFIG --exists 'tdb >= 1.1.7' ; then
+ 			if $PKG_CONFIG --exists 'tdb >= 1.2.1' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= 1.1.7'`"
+ 				LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= 1.2.1'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBTDB_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTDB_CFLAGS" >&5
@@ -102991,7 +103495,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTDB_ENABLE = YES
-@@ -98451,22 +43760,16 @@
+@@ -99150,22 +44093,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTDB\"} = \"YES\";"
  
@@ -103017,17 +103521,17 @@
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 				ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.1.7'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.1.7'`"
-@@ -98527,7 +43830,7 @@
+ 				ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.2.1'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.2.1'`"
+@@ -99226,7 +44163,7 @@
  				ac_cv_LIBTDB_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.1.7'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.2.1'
  				ac_cv_LIBTDB_found=no
-@@ -98552,9 +43855,7 @@
+@@ -99251,9 +44188,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -103038,7 +103542,7 @@
  fi
  TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
  TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -98567,104 +43868,12 @@
+@@ -99266,104 +44201,12 @@
  TDB_CFLAGS="-I$tdbdir/include"
  
  
@@ -103148,7 +103652,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -98672,151 +43881,12 @@
+@@ -99371,151 +44214,12 @@
  fi
  done
  
@@ -103305,7 +103809,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -98827,17 +43897,13 @@
+@@ -99526,17 +44230,13 @@
  
  
  
@@ -103326,7 +103830,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -98848,56 +43914,29 @@
+@@ -99547,56 +44247,29 @@
    return 0;
  }
  _ACEOF
@@ -103390,7 +103894,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -98908,41 +43947,18 @@
+@@ -99607,41 +44280,18 @@
    return 0;
  }
  _ACEOF
@@ -103436,7 +103940,7 @@
  
   fi
  
-@@ -98973,9 +43989,9 @@
+@@ -99672,9 +44322,9 @@
  	if test -z "$PKG_CONFIG"; then
  		# Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -103448,7 +103952,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -98988,14 +44004,14 @@
+@@ -99687,14 +44337,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -103466,7 +103970,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99004,10 +44020,10 @@
+@@ -99703,10 +44353,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -103479,7 +103983,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -99023,52 +44039,27 @@
+@@ -99722,52 +44372,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103539,7 +104043,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTEVENT_ENABLE = YES
-@@ -99076,22 +44067,16 @@
+@@ -99775,22 +44400,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTEVENT\"} = \"YES\";"
  
@@ -103566,7 +104070,7 @@
  				CFLAGS="$OLD_CFLAGS"
  
  				ac_cv_LIBTEVENT_libs_only_other="`$PKG_CONFIG --libs-only-other 'tevent = 0.9.8'` `$PKG_CONFIG --libs-only-L 'tevent = 0.9.8'`"
-@@ -99152,7 +44137,7 @@
+@@ -99851,7 +44470,7 @@
  				ac_cv_LIBTEVENT_found=yes
  
  			else
@@ -103575,7 +104079,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
  				ac_cv_LIBTEVENT_found=no
-@@ -99173,281 +44158,50 @@
+@@ -99872,281 +44491,50 @@
  
  if test x"$teventdir" = "x"; then
  	teventdir=""
@@ -103888,7 +104392,7 @@
  _ACEOF
  
  fi
-@@ -99456,9 +44210,7 @@
+@@ -100155,9 +44543,7 @@
  if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
     TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
  
@@ -103899,7 +104403,7 @@
  
  fi
  
-@@ -99514,9 +44266,9 @@
+@@ -100213,9 +44599,9 @@
  	if test -z "$PKG_CONFIG"; then
  		# Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -103911,7 +104415,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -99529,14 +44281,14 @@
+@@ -100228,14 +44614,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -103929,7 +104433,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99545,10 +44297,10 @@
+@@ -100244,10 +44630,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -103942,20 +104446,20 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -99564,52 +44316,27 @@
+@@ -100263,52 +44649,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for ldb = 0.9.7" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = 0.9.7" >&5
- $as_echo_n "checking for ldb = 0.9.7... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for ldb = 0.9.10" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = 0.9.10" >&5
+ $as_echo_n "checking for ldb = 0.9.10... " >&6; }
  
- 			if $PKG_CONFIG --exists 'ldb = 0.9.7' ; then
+ 			if $PKG_CONFIG --exists 'ldb = 0.9.10' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = 0.9.7'`"
+ 				LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = 0.9.10'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBLDB_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBLDB_CFLAGS" >&5
@@ -104002,7 +104506,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBLDB_ENABLE = YES
-@@ -99617,22 +44344,16 @@
+@@ -100316,22 +44677,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBLDB\"} = \"YES\";"
  
@@ -104028,17 +104532,17 @@
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 				ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.7'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.7'`"
-@@ -99693,7 +44414,7 @@
+ 				ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.10'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.10'`"
+@@ -100392,7 +44747,7 @@
  				ac_cv_LIBLDB_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.7'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.10'
  				ac_cv_LIBLDB_found=no
-@@ -99739,12 +44460,12 @@
+@@ -100438,12 +44793,12 @@
  
  SQLITE3_LIBS=""
  with_sqlite3_support=no
@@ -104053,7 +104557,7 @@
    withval=$with_sqlite3;  case "$withval" in
      yes|no|auto)
  	with_sqlite3_support=$withval
-@@ -99753,157 +44474,18 @@
+@@ -100452,157 +44807,18 @@
  fi
  
  
@@ -104217,7 +104721,7 @@
  _ACEOF
  
  fi
-@@ -99913,11 +44495,9 @@
+@@ -100612,11 +44828,9 @@
  
    if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
  	if test x"$with_sqlite3_support" = x"yes"; then
@@ -104231,7 +104735,7 @@
  $as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
  	fi
  
-@@ -99932,23 +44512,17 @@
+@@ -100631,23 +44845,17 @@
    # now see if we can find the sqlite3 libs in standard paths
  
  
@@ -104258,7 +104762,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -99966,54 +44540,28 @@
+@@ -100665,54 +44873,28 @@
    return 0;
  }
  _ACEOF
@@ -104320,7 +104824,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSQLITE3 1
  _ACEOF
-@@ -100029,21 +44577,16 @@
+@@ -100728,21 +44910,16 @@
  
  fi
  
@@ -104346,7 +104850,7 @@
  $as_echo "yes" >&6; }
      with_sqlite3_support=yes
  
-@@ -100055,11 +44598,9 @@
+@@ -100754,11 +44931,9 @@
  
    else
      if test x"$with_sqlite3_support" = x"yes"; then
@@ -104360,7 +104864,7 @@
  $as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
      fi
  
-@@ -100129,7 +44670,7 @@
+@@ -100828,7 +45003,7 @@
  
  use_gnutls=auto
  # Check whether --enable-gnutls was given.
@@ -104369,7 +104873,7 @@
    enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
          use_gnutls=no
      fi
-@@ -100143,9 +44684,9 @@
+@@ -100842,9 +45017,9 @@
  	if test -z "$PKG_CONFIG"; then
  		# Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -104381,7 +104885,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -100158,14 +44699,14 @@
+@@ -100857,14 +45032,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -104399,7 +104903,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100174,10 +44715,10 @@
+@@ -100873,10 +45048,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -104412,7 +104916,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -100193,52 +44734,27 @@
+@@ -100892,52 +45067,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104472,7 +104976,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  GNUTLS_ENABLE = YES
-@@ -100246,22 +44762,16 @@
+@@ -100945,22 +45095,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"GNUTLS\"} = \"YES\";"
  
@@ -104499,7 +105003,7 @@
  				CFLAGS="$OLD_CFLAGS"
  
  				ac_cv_GNUTLS_libs_only_other="`$PKG_CONFIG --libs-only-other 'gnutls >= 1.4.0'` `$PKG_CONFIG --libs-only-L 'gnutls >= 1.4.0'`"
-@@ -100322,7 +44832,7 @@
+@@ -101021,7 +45165,7 @@
  				ac_cv_GNUTLS_found=yes
  
  			else
@@ -104508,7 +105012,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
  				ac_cv_GNUTLS_found=no
-@@ -100342,151 +44852,12 @@
+@@ -101041,151 +45185,12 @@
  fi
  
  if test x$use_gnutls = xauto; then
@@ -104665,7 +105169,7 @@
  _ACEOF
  
  fi
-@@ -100495,23 +44866,17 @@
+@@ -101194,23 +45199,17 @@
  
  
  
@@ -104692,7 +105196,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -100529,580 +44894,116 @@
+@@ -101228,580 +45227,116 @@
    return 0;
  }
  _ACEOF
@@ -105352,7 +105856,7 @@
  _ACEOF
  
  fi
-@@ -101111,23 +45012,17 @@
+@@ -101810,23 +45345,17 @@
  
  
  
@@ -105379,7 +105883,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101145,54 +45040,28 @@
+@@ -101844,54 +45373,28 @@
    return 0;
  }
  _ACEOF
@@ -105441,7 +105945,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGCRYPT 1
  _ACEOF
-@@ -101208,7 +45077,6 @@
+@@ -101907,7 +45410,6 @@
  
  fi
  
@@ -105449,7 +105953,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  GCRYPT_LIBS = $GCRYPT_LIBS
  GCRYPT_CFLAGS =
-@@ -101225,7 +45093,7 @@
+@@ -101924,7 +45426,7 @@
  
  use_netapi=auto
  # Check whether --enable-netapi was given.
@@ -105458,7 +105962,7 @@
    enableval=$enable_netapi; if test x$enable_netapi = xno; then
          use_netapi=no
      fi
-@@ -101247,151 +45115,12 @@
+@@ -101946,151 +45448,12 @@
  \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
  
  if test x$use_netapi != xno; then
@@ -105615,7 +106119,7 @@
  _ACEOF
  
  fi
-@@ -101400,23 +45129,17 @@
+@@ -102099,23 +45462,17 @@
  
  
  
@@ -105642,7 +106146,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101434,54 +45157,28 @@
+@@ -102133,54 +45490,28 @@
    return 0;
  }
  _ACEOF
@@ -105704,7 +106208,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -101498,24 +45195,17 @@
+@@ -102197,24 +45528,17 @@
  fi
  
  
@@ -105732,7 +106236,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101533,54 +45223,28 @@
+@@ -102232,54 +45556,28 @@
    return 0;
  }
  _ACEOF
@@ -105794,7 +106298,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -101597,24 +45261,17 @@
+@@ -102296,24 +45594,17 @@
  fi
  
  
@@ -105822,7 +106326,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101632,54 +45289,28 @@
+@@ -102331,54 +45622,28 @@
    return 0;
  }
  _ACEOF
@@ -105884,7 +106388,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -101696,24 +45327,17 @@
+@@ -102395,24 +45660,17 @@
  fi
  
  
@@ -105912,7 +106416,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101731,54 +45355,28 @@
+@@ -102430,54 +45688,28 @@
    return 0;
  }
  _ACEOF
@@ -105974,7 +106478,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -101795,24 +45393,17 @@
+@@ -102494,24 +45726,17 @@
  fi
  
  
@@ -106002,7 +106506,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101830,54 +45421,28 @@
+@@ -102529,54 +45754,28 @@
    return 0;
  }
  _ACEOF
@@ -106064,7 +106568,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -101892,12 +45457,9 @@
+@@ -102591,12 +45790,9 @@
  
  
  fi
@@ -106078,7 +106582,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -101915,9 +45477,7 @@
+@@ -102614,9 +45810,7 @@
  
  	else
  		if test x$use_netapi != xauto; then
@@ -106089,7 +106593,7 @@
  		fi
  	fi
  
-@@ -101958,19 +45518,17 @@
+@@ -102657,19 +45851,17 @@
  
  #################################################
  # check for pthread support
@@ -106113,7 +106617,7 @@
  		fi
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -101988,12 +45546,12 @@
+@@ -102687,12 +45879,12 @@
  
  	;;
  	*)
@@ -106128,7 +106632,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -102009,274 +45567,45 @@
+@@ -102708,274 +45900,45 @@
  
  
  
@@ -106416,7 +106920,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102294,54 +45623,28 @@
+@@ -102993,54 +45956,28 @@
    return 0;
  }
  _ACEOF
@@ -106478,7 +106982,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSETPROCTITLE 1
  _ACEOF
-@@ -102357,15 +45660,14 @@
+@@ -103056,15 +45993,14 @@
  
  fi
  
@@ -106496,7 +107000,7 @@
  $as_echo "yes" >&6; }
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102375,22 +45677,20 @@
+@@ -103074,22 +46010,20 @@
  \$enabled{\"SETPROCTITLE\"} = \"YES\";"
  
  
@@ -106523,7 +107027,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -102408,238 +45708,68 @@
+@@ -103107,238 +46041,68 @@
  
  
  
@@ -106792,7 +107296,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102657,46 +45787,15 @@
+@@ -103356,46 +46120,15 @@
    return 0;
  }
  _ACEOF
@@ -106843,7 +107347,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102714,65 +45813,32 @@
+@@ -103413,65 +46146,32 @@
    return 0;
  }
  _ACEOF
@@ -106917,7 +107421,7 @@
  /* end confdefs.h.  */
  /* Define blkid_get_cache to an innocuous variant, in case <limits.h> declares blkid_get_cache.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -102813,50 +45879,24 @@
+@@ -103512,50 +46212,24 @@
    return 0;
  }
  _ACEOF
@@ -106974,7 +107478,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  BLKID_LIBS = ${BLKID_LIBS}
  BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -102867,9 +45907,7 @@
+@@ -103566,9 +46240,7 @@
  
  if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
  
@@ -106985,7 +107489,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102897,102 +45935,12 @@
+@@ -103596,102 +46268,12 @@
  
  fi
  
@@ -107092,7 +107596,7 @@
  _ACEOF
  
  fi
-@@ -103002,151 +45950,12 @@
+@@ -103701,151 +46283,12 @@
  ###############################
  # start SMB_EXT_LIB_PAM
  # check for security/pam_appl.h and -lpam
@@ -107248,7 +107752,7 @@
  _ACEOF
  
  fi
-@@ -103155,23 +45964,17 @@
+@@ -103854,23 +46297,17 @@
  
  
  
@@ -107275,7 +107779,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103189,54 +45992,28 @@
+@@ -103888,54 +46325,28 @@
    return 0;
  }
  _ACEOF
@@ -107337,7 +107841,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -103251,7 +46028,6 @@
+@@ -103950,7 +46361,6 @@
  
  
  fi
@@ -107345,7 +107849,7 @@
  if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103277,23 +46053,17 @@
+@@ -103976,23 +46386,17 @@
  # test for where we get crypt() from
  
  
@@ -107372,7 +107876,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103311,54 +46081,28 @@
+@@ -104010,54 +46414,28 @@
    return 0;
  }
  _ACEOF
@@ -107434,7 +107938,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPT 1
  _ACEOF
-@@ -103374,7 +46118,6 @@
+@@ -104073,7 +46451,6 @@
  
  fi
  
@@ -107442,7 +107946,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  CRYPT_ENABLE = YES
  "
-@@ -103391,102 +46134,12 @@
+@@ -104090,102 +46467,12 @@
  
  
  
@@ -107550,7 +108054,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -103495,151 +46148,12 @@
+@@ -104194,151 +46481,12 @@
  done
  
  
@@ -107706,7 +108210,7 @@
  _ACEOF
  
  fi
-@@ -103648,23 +46162,17 @@
+@@ -104347,23 +46495,17 @@
  
  
  
@@ -107733,7 +108237,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103682,54 +46190,28 @@
+@@ -104381,54 +46523,28 @@
    return 0;
  }
  _ACEOF
@@ -107795,7 +108299,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSASL2 1
  _ACEOF
-@@ -103745,7 +46227,6 @@
+@@ -104444,7 +46560,6 @@
  
  fi
  
@@ -107803,7 +108307,7 @@
  if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103791,312 +46272,88 @@
+@@ -104490,312 +46605,88 @@
              ac_new_flags="$ac_new_flags$s$i";
          else
              ac_new_flags="$ac_new_flags$s$l $i";
@@ -108173,7 +108677,7 @@
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -104107,41 +46364,18 @@
+@@ -104806,41 +46697,18 @@
    return 0;
  }
  _ACEOF
@@ -108219,7 +108723,7 @@
  
   fi
  
-@@ -104185,17 +46419,13 @@
+@@ -104884,17 +46752,13 @@
  fi
  
  
@@ -108240,7 +108744,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -104206,56 +46436,29 @@
+@@ -104905,56 +46769,29 @@
    return 0;
  }
  _ACEOF
@@ -108304,7 +108808,7 @@
  /* end confdefs.h.  */
  #include <signal.h>
  int
-@@ -104266,41 +46469,18 @@
+@@ -104965,41 +46802,18 @@
    return 0;
  }
  _ACEOF
@@ -108350,7 +108854,7 @@
  
   fi
  
-@@ -104324,151 +46504,12 @@
+@@ -105023,151 +46837,12 @@
  
  fi
  
@@ -108507,7 +109011,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -104782,151 +46823,12 @@
+@@ -105481,151 +47156,12 @@
  
  
  
@@ -108663,7 +109167,7 @@
  _ACEOF
  
  fi
-@@ -104936,23 +46838,17 @@
+@@ -105635,23 +47171,17 @@
  
  
  
@@ -108690,7 +109194,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -104970,54 +46866,28 @@
+@@ -105669,54 +47199,28 @@
    return 0;
  }
  _ACEOF
@@ -108752,7 +109256,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -105033,18 +46903,13 @@
+@@ -105732,18 +47236,13 @@
  
  fi
  
@@ -108774,7 +109278,7 @@
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -105062,40 +46927,19 @@
+@@ -105761,40 +47260,19 @@
    return 0;
  }
  _ACEOF
@@ -108817,7 +109321,7 @@
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -105117,7 +46961,7 @@
+@@ -105816,7 +47294,7 @@
  
  
  # Check whether --enable-dmalloc was given.
@@ -108826,7 +109330,7 @@
    enableval=$enable_dmalloc;
  fi
  
-@@ -105125,14 +46969,10 @@
+@@ -105824,14 +47302,10 @@
  if test "x$enable_dmalloc" = xyes
  then
  
@@ -108843,7 +109347,7 @@
  
  	LIBS="$LIBS -ldmalloc"
  fi
-@@ -105230,87 +47070,54 @@
+@@ -105929,87 +47403,54 @@
  #################################################
  # Display summary of libraries detected
  
@@ -108947,7 +109451,7 @@
  if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes" -o x"$picky_developer" = x"yes"; then
      CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS)"
  fi
-@@ -105369,13 +47176,13 @@
+@@ -106068,13 +47509,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -108963,7 +109467,7 @@
        esac ;;
      esac
    done
-@@ -105383,8 +47190,8 @@
+@@ -106082,8 +47523,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -108974,7 +109478,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -105407,11 +47214,11 @@
+@@ -106106,11 +47547,11 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -108988,7 +109492,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -105431,8 +47238,8 @@
+@@ -106130,8 +47571,8 @@
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -108999,7 +109503,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -105456,9 +47263,10 @@
+@@ -106155,9 +47596,10 @@
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -109012,7 +109516,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -105468,17 +47276,18 @@
+@@ -106167,17 +47609,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -109038,7 +109542,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -105486,23 +47295,15 @@
+@@ -106185,23 +47628,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -109067,7 +109571,7 @@
  as_nl='
  '
  export as_nl
-@@ -105510,7 +47311,13 @@
+@@ -106209,7 +47644,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -109082,7 +109586,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -105521,7 +47328,7 @@
+@@ -106220,7 +47661,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -109091,7 +109595,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -105544,13 +47351,6 @@
+@@ -106243,13 +47684,6 @@
    }
  fi
  
@@ -109105,7 +109609,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -105560,15 +47360,15 @@
+@@ -106259,15 +47693,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -109124,7 +109628,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -105580,12 +47380,16 @@
+@@ -106279,12 +47713,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -109145,7 +109649,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -105597,7 +47401,89 @@
+@@ -106296,7 +47734,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -109236,7 +109740,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -105611,8 +47497,12 @@
+@@ -106310,8 +47830,12 @@
    as_basename=false
  fi
  
@@ -109250,7 +109754,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -105632,76 +47522,25 @@
+@@ -106331,76 +47855,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -109338,7 +109842,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -105730,8 +47569,56 @@
+@@ -106429,8 +47902,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -109396,7 +109900,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -105750,10 +47637,10 @@
+@@ -106449,10 +47970,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -109409,7 +109913,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -105768,13 +47655,19 @@
+@@ -106467,13 +47988,19 @@
  
  
  exec 6>&1
@@ -109431,7 +109935,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -105806,13 +47699,15 @@
+@@ -106505,13 +48032,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -109450,7 +109954,7 @@
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -105831,16 +47726,17 @@
+@@ -106530,16 +48059,17 @@
  Configuration commands:
  $config_commands
  
@@ -109472,7 +109976,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -105875,6 +47771,8 @@
+@@ -106574,6 +48104,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -109481,7 +109985,7 @@
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -105882,20 +47780,19 @@
+@@ -106581,20 +48113,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -109506,7 +110010,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -105903,11 +47800,10 @@
+@@ -106602,11 +48133,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -109521,7 +110025,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -106000,9 +47896,7 @@
+@@ -106699,9 +48229,7 @@
      "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
      "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
  
@@ -109532,7 +110036,7 @@
    esac
  done
  
-@@ -106029,7 +47923,7 @@
+@@ -106728,7 +48256,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -109541,7 +110045,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -106040,11 +47934,7 @@
+@@ -106739,11 +48267,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -109554,7 +110058,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -106052,10 +47942,16 @@
+@@ -106751,10 +48275,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -109574,7 +110078,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -106069,24 +47965,18 @@
+@@ -106768,24 +48298,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -109602,7 +110106,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -106108,7 +47998,7 @@
+@@ -106807,7 +48331,7 @@
  t delim
  :nl
  h
@@ -109611,7 +110115,7 @@
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -106122,7 +48012,7 @@
+@@ -106821,7 +48345,7 @@
  t nl
  :delim
  h
@@ -109620,7 +110124,7 @@
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -106175,9 +48065,7 @@
+@@ -106874,9 +48398,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -109631,7 +110135,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -106218,9 +48106,7 @@
+@@ -106917,9 +48439,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -109642,7 +110146,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -106305,9 +48191,7 @@
+@@ -107004,9 +48524,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -109653,7 +110157,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -106320,9 +48204,7 @@
+@@ -107019,9 +48537,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -109664,7 +110168,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -106350,12 +48232,10 @@
+@@ -107049,12 +48565,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -109679,7 +110183,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -106366,7 +48246,7 @@
+@@ -107065,7 +48579,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -109688,7 +110192,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -106379,9 +48259,7 @@
+@@ -107078,9 +48592,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -109699,7 +110203,7 @@
      esac
      ;;
    esac
-@@ -106409,47 +48287,7 @@
+@@ -107108,47 +48620,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -109748,7 +110252,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -106501,7 +48339,6 @@
+@@ -107200,7 +48672,6 @@
  # 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=
@@ -109756,7 +110260,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -106511,12 +48348,11 @@
+@@ -107210,12 +48681,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -109771,7 +110275,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -106526,7 +48362,7 @@
+@@ -107225,7 +48695,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -109780,7 +110284,7 @@
  esac
  _ACEOF
  
-@@ -106554,14 +48390,12 @@
+@@ -107253,14 +48723,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -109797,7 +110301,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -106571,9 +48405,7 @@
+@@ -107270,9 +48738,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -109808,7 +110312,7 @@
   ;;
    :H)
    #
-@@ -106584,29 +48416,23 @@
+@@ -107283,29 +48749,23 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -109843,7 +110347,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -106632,15 +48458,12 @@
+@@ -107331,15 +48791,12 @@
  done # for ac_tag
  
  
@@ -109861,7 +110365,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -106661,10 +48484,10 @@
+@@ -107360,10 +48817,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -109874,7 +110378,7 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-@@ -106675,8 +48498,8 @@
+@@ -107374,8 +48831,8 @@
  # Print very concise instructions on building/use
  if test "x$enable_dmalloc" = xyes
  then

Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch	2010-03-02 20:50:43 UTC (rev 3359)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch	2010-03-02 20:51:18 UTC (rev 3360)
@@ -13,12 +13,12 @@
 ===================================================================
 --- experimental.orig/source3/Makefile.in
 +++ experimental/source3/Makefile.in
-@@ -2259,7 +2259,7 @@
+@@ -2281,7 +2281,7 @@
  
- $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
  	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
-+	@$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
+-	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
++	@$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
  		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) \
  		@SONAMEFLAG@`basename $@`




More information about the Pkg-samba-maint mailing list