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

bubulle at alioth.debian.org bubulle at alioth.debian.org
Tue Aug 3 23:35:09 UTC 2010


Author: bubulle
Date: 2010-08-03 23:34:48 +0000 (Tue, 03 Aug 2010)
New Revision: 3553

Modified:
   branches/samba/experimental/debian/patches/autoconf.patch
   branches/samba/experimental/debian/patches/documentation.patch
   branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
   branches/samba/experimental/debian/patches/smbtar-bashism.patch
Log:
Adapt patches to 3.6.0per1

Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch	2010-08-03 23:30:47 UTC (rev 3552)
+++ branches/samba/experimental/debian/patches/autoconf.patch	2010-08-03 23:34:48 UTC (rev 3553)
@@ -25,10 +25,10 @@
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: experimental/source3/configure
+Index: samba-3.6.0pre1/source3/configure
 ===================================================================
---- experimental.orig/source3/configure
-+++ experimental/source3/configure
+--- samba-3.6.0pre1.orig/source3/configure
++++ samba-3.6.0pre1/source3/configure
 @@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -838,7 +838,7 @@
  
  ac_unique_file="include/includes.h"
  ac_default_prefix=/usr/local/samba
-@@ -957,6 +914,7 @@
+@@ -930,6 +887,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -846,7 +846,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1183,8 +1141,7 @@
+@@ -1148,8 +1106,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
-@@ -1210,8 +1167,7 @@
+@@ -1175,8 +1132,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
-@@ -1415,8 +1371,7 @@
+@@ -1380,8 +1336,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
-@@ -1432,8 +1387,7 @@
+@@ -1397,8 +1352,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
-@@ -1463,17 +1417,17 @@
+@@ -1428,17 +1382,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 ;;
  
-@@ -1490,15 +1444,13 @@
+@@ -1455,15 +1409,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
-@@ -1521,8 +1473,7 @@
+@@ -1486,8 +1438,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'
-@@ -1552,11 +1503,9 @@
+@@ -1517,11 +1468,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.
-@@ -1595,13 +1544,11 @@
+@@ -1560,13 +1509,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
-@@ -1848,7 +1795,7 @@
+@@ -1802,7 +1749,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
-@@ -1935,178 +1882,863 @@
+@@ -1884,178 +1831,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'\''"
-@@ -2150,39 +2782,41 @@
+@@ -2099,39 +2731,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.
-@@ -2200,8 +2834,8 @@
+@@ -2149,8 +2783,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"
-@@ -2209,10 +2843,10 @@
+@@ -2158,10 +2792,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";;
-@@ -2220,7 +2854,7 @@
+@@ -2169,7 +2803,7 @@
      esac
    fi
  else
@@ -2069,7 +2069,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2235,11 +2869,11 @@
+@@ -2184,11 +2818,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=: ;;
      ,);;
-@@ -2249,17 +2883,17 @@
+@@ -2198,17 +2832,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
-@@ -2271,43 +2905,20 @@
+@@ -2220,43 +2854,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'
-@@ -2321,14 +2932,12 @@
+@@ -2270,14 +2881,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
-@@ -2360,24 +2969,16 @@
+@@ -2309,24 +2918,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2206,7 +2206,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2389,57 +2990,29 @@
+@@ -2338,57 +2939,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='-'
-@@ -2455,28 +3028,24 @@
+@@ -2404,28 +2977,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='-'
-@@ -2492,28 +3061,24 @@
+@@ -2441,28 +3010,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='-'
-@@ -2536,6 +3101,27 @@
+@@ -2485,6 +3050,27 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
@@ -2367,7 +2367,7 @@
  echo "LIBREPLACE_LOCATION_CHECKS: END"
  
  
-@@ -2564,7 +3150,7 @@
+@@ -2513,7 +3099,7 @@
  
  
  # Check whether --with-fhs was given.
@@ -2376,7 +2376,7 @@
    withval=$with_fhs;  case "$withval" in
    yes)
      lockdir="\${VARDIR}/lib/samba"
-@@ -2581,9 +3167,7 @@
+@@ -2530,9 +3116,7 @@
      cachedir="\${VARDIR}/lib/samba"
      ncalrpcdir="\${VARDIR}/ncalrpc"
  
@@ -2387,7 +2387,7 @@
  
      ;;
    esac
-@@ -2594,13 +3178,13 @@
+@@ -2543,13 +3127,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;}
    ;;
    * )
-@@ -2614,13 +3198,13 @@
+@@ -2563,13 +3147,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;}
    ;;
    * )
-@@ -2634,13 +3218,13 @@
+@@ -2583,13 +3167,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;}
    ;;
    * )
-@@ -2654,13 +3238,13 @@
+@@ -2603,13 +3187,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;}
    ;;
    * )
-@@ -2674,13 +3258,13 @@
+@@ -2623,13 +3207,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;}
    ;;
    * )
-@@ -2694,13 +3278,13 @@
+@@ -2643,13 +3227,13 @@
  # set pid directory location
  
  # Check whether --with-piddir was given.
@@ -2483,7 +2483,7 @@
  $as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2714,13 +3298,13 @@
+@@ -2663,13 +3247,13 @@
  # set ncalrpc directory location
  
  # Check whether --with-ncalrpcdir was given.
@@ -2499,7 +2499,7 @@
  $as_echo "$as_me: WARNING: --with-ncalrpcdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2734,13 +3318,13 @@
+@@ -2683,13 +3267,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;}
    ;;
    * )
-@@ -2754,13 +3338,13 @@
+@@ -2703,13 +3287,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;}
    ;;
    * )
-@@ -2774,13 +3358,13 @@
+@@ -2723,13 +3307,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;}
    ;;
    * )
-@@ -2795,13 +3379,13 @@
+@@ -2744,13 +3328,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;}
    ;;
    * )
-@@ -2815,13 +3399,13 @@
+@@ -2764,13 +3348,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;}
    ;;
    * )
-@@ -2835,13 +3419,13 @@
+@@ -2784,13 +3368,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;}
    ;;
    * )
-@@ -2855,13 +3439,13 @@
+@@ -2804,13 +3388,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;}
    ;;
    *)
-@@ -2875,13 +3459,13 @@
+@@ -2824,13 +3408,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;}
    ;;
    * )
-@@ -2915,10 +3499,10 @@
+@@ -2864,10 +3448,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;}
    ;;
    * )
-@@ -2935,10 +3519,10 @@
+@@ -2884,10 +3468,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;}
    ;;
    * )
-@@ -2957,19 +3541,15 @@
+@@ -2906,19 +3490,15 @@
  
  
  # Check whether --with-smbtorture4_path was given.
@@ -2676,7 +2676,7 @@
      fi
      smbtorture4_option="-t $withval"
    ;;
-@@ -2984,19 +3564,15 @@
+@@ -2933,19 +3513,15 @@
  
  
  # Check whether --with-selftest_custom_conf was given.
@@ -2699,7 +2699,7 @@
      fi
      selftest_custom_conf="-c $withval"
    ;;
-@@ -3009,7 +3585,7 @@
+@@ -2958,7 +3534,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
-@@ -3019,7 +3595,7 @@
+@@ -2968,7 +3544,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
-@@ -3029,7 +3605,7 @@
+@@ -2978,7 +3554,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
-@@ -3040,7 +3616,7 @@
+@@ -2989,7 +3565,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
-@@ -3051,7 +3627,7 @@
+@@ -3000,7 +3576,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.
-@@ -3148,9 +3724,9 @@
+@@ -3097,9 +3673,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
-@@ -3161,24 +3737,24 @@
+@@ -3110,24 +3686,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2786,7 +2786,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3188,9 +3764,9 @@
+@@ -3137,9 +3713,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
-@@ -3201,24 +3777,24 @@
+@@ -3150,24 +3726,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2828,7 +2828,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3227,7 +3803,7 @@
+@@ -3176,7 +3752,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
-@@ -3241,9 +3817,9 @@
+@@ -3190,9 +3766,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
-@@ -3254,24 +3830,24 @@
+@@ -3203,24 +3779,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2879,7 +2879,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3281,9 +3857,9 @@
+@@ -3230,9 +3806,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
-@@ -3295,18 +3871,18 @@
+@@ -3244,18 +3820,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
-@@ -3325,10 +3901,10 @@
+@@ -3274,10 +3850,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2926,7 +2926,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3340,9 +3916,9 @@
+@@ -3289,9 +3865,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
-@@ -3353,24 +3929,24 @@
+@@ -3302,24 +3878,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2968,7 +2968,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3384,9 +3960,9 @@
+@@ -3333,9 +3909,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
-@@ -3397,24 +3973,24 @@
+@@ -3346,24 +3922,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3010,7 +3010,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3427,7 +4003,7 @@
+@@ -3376,7 +3952,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
-@@ -3438,57 +4014,37 @@
+@@ -3387,57 +3963,37 @@
  fi
  
  
@@ -3097,7 +3097,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3504,8 +4060,8 @@
+@@ -3453,8 +4009,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:
-@@ -3521,17 +4077,17 @@
+@@ -3470,17 +4026,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,
-@@ -3548,7 +4104,7 @@
+@@ -3497,7 +4053,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -3140,7 +3140,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3567,84 +4123,42 @@
+@@ -3516,84 +4072,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
-@@ -3659,32 +4173,83 @@
+@@ -3608,32 +4122,83 @@
    esac
  done
  else
@@ -3346,7 +3346,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3696,17 +4261,17 @@
+@@ -3645,17 +4210,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
-@@ -3719,31 +4284,23 @@
+@@ -3668,31 +4233,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -3408,7 +3408,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3757,37 +4314,16 @@
+@@ -3706,37 +4263,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
-@@ -3796,20 +4332,16 @@
+@@ -3745,20 +4281,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3473,7 +3473,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3820,35 +4352,11 @@
+@@ -3769,35 +4301,11 @@
    return 0;
  }
  _ACEOF
@@ -3512,7 +3512,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3859,36 +4367,12 @@
+@@ -3808,36 +4316,12 @@
    return 0;
  }
  _ACEOF
@@ -3553,7 +3553,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3899,42 +4383,17 @@
+@@ -3848,42 +4332,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
-@@ -3951,18 +4410,14 @@
+@@ -3900,18 +4359,14 @@
      CFLAGS=
    fi
  fi
@@ -3620,7 +3620,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -4019,32 +4474,9 @@
+@@ -3968,32 +4423,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
-@@ -4055,17 +4487,19 @@
+@@ -4004,17 +4436,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3677,7 +3677,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4076,18 +4510,14 @@
+@@ -4025,18 +4459,14 @@
  CFLAGS=$savedCFLAGS
  
  if test x"$GCC" != x"yes" ; then
@@ -3699,7 +3699,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdbool.h>
-@@ -4229,32 +4659,9 @@
+@@ -4178,32 +4608,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
-@@ -4265,26 +4672,28 @@
+@@ -4214,26 +4621,28 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c99" in
    x)
@@ -3767,7 +3767,7 @@
  $as_echo "${GCC_VERSION}" >&6; }
  fi
  
-@@ -4293,14 +4702,14 @@
+@@ -4242,14 +4651,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
-@@ -4315,11 +4724,7 @@
+@@ -4264,11 +4673,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>
-@@ -4328,78 +4733,34 @@
+@@ -4277,78 +4682,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -3881,7 +3881,7 @@
    break
  fi
  
-@@ -4411,7 +4772,7 @@
+@@ -4360,7 +4721,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
-@@ -4422,11 +4783,7 @@
+@@ -4371,11 +4732,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>
-@@ -4435,87 +4792,40 @@
+@@ -4384,87 +4741,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -4000,7 +4000,7 @@
  fi
  
  ac_ext=c
-@@ -4525,9 +4835,9 @@
+@@ -4474,9 +4784,9 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -4012,7 +4012,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4538,7 +4848,7 @@
+@@ -4487,7 +4797,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
-@@ -4558,7 +4868,7 @@
+@@ -4507,7 +4817,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"
-@@ -4573,26 +4883,24 @@
+@@ -4522,26 +4832,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
-@@ -4606,7 +4914,7 @@
+@@ -4555,7 +4863,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
-@@ -4626,7 +4934,7 @@
+@@ -4575,7 +4883,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"
-@@ -4641,12 +4949,10 @@
+@@ -4590,12 +4898,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -4095,7 +4095,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4654,21 +4960,17 @@
+@@ -4603,21 +4909,17 @@
  
     fi
  fi
@@ -4121,7 +4121,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4683,48 +4985,23 @@
+@@ -4632,48 +4934,23 @@
    return 0;
  }
  _ACEOF
@@ -4175,7 +4175,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4734,18 +5011,14 @@
+@@ -4683,18 +4960,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
-@@ -4755,14 +5028,10 @@
+@@ -4704,14 +4977,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>
-@@ -4789,118 +5058,34 @@
+@@ -4738,118 +5007,34 @@
    return 0;
  }
  _ACEOF
@@ -4346,7 +4346,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4911,139 +5096,8 @@
+@@ -4860,139 +5045,8 @@
  
  
  
@@ -4488,7 +4488,7 @@
    MINIX=yes
  else
    MINIX=
-@@ -5052,34 +5106,23 @@
+@@ -5001,34 +5055,23 @@
  
    if test "$MINIX" = yes; then
  
@@ -4529,7 +4529,7 @@
  /* end confdefs.h.  */
  
  #	  define __EXTENSIONS__ 1
-@@ -5092,71 +5135,35 @@
+@@ -5041,71 +5084,35 @@
    return 0;
  }
  _ACEOF
@@ -4612,7 +4612,7 @@
  /* end confdefs.h.  */
  #ifndef __APPLE_CC__
  	       not a universal capable compiler
-@@ -5164,46 +5171,34 @@
+@@ -5113,46 +5120,34 @@
  	     typedef int dummy;
  
  _ACEOF
@@ -4681,7 +4681,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  	     #include <sys/param.h>
-@@ -5221,30 +5216,9 @@
+@@ -5170,30 +5165,9 @@
    return 0;
  }
  _ACEOF
@@ -4714,7 +4714,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  		#include <sys/param.h>
-@@ -5260,49 +5234,18 @@
+@@ -5209,49 +5183,18 @@
    return 0;
  }
  _ACEOF
@@ -4767,7 +4767,7 @@
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5317,30 +5260,9 @@
+@@ -5266,30 +5209,9 @@
    return 0;
  }
  _ACEOF
@@ -4800,7 +4800,7 @@
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5355,51 +5277,20 @@
+@@ -5304,51 +5226,20 @@
    return 0;
  }
  _ACEOF
@@ -4856,7 +4856,7 @@
  /* end confdefs.h.  */
  short int ascii_mm[] =
  		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -5425,24 +5316,7 @@
+@@ -5374,24 +5265,7 @@
    return 0;
  }
  _ACEOF
@@ -4882,7 +4882,7 @@
    if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
  	      ac_cv_c_bigendian=yes
  	    fi
-@@ -5454,20 +5328,10 @@
+@@ -5403,20 +5277,10 @@
  		ac_cv_c_bigendian=unknown
  	      fi
  	    fi
@@ -4904,7 +4904,7 @@
  /* end confdefs.h.  */
  $ac_includes_default
  int
-@@ -5487,81 +5351,43 @@
+@@ -5436,81 +5300,43 @@
    return 0;
  }
  _ACEOF
@@ -4998,7 +4998,7 @@
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -5570,41 +5396,17 @@
+@@ -5519,41 +5345,17 @@
  #endif
  
  _ACEOF
@@ -5042,7 +5042,7 @@
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
-@@ -5624,14 +5426,10 @@
+@@ -5573,14 +5375,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
-@@ -5644,45 +5442,20 @@
+@@ -5593,45 +5391,20 @@
    return 0;
  }
  _ACEOF
@@ -5110,7 +5110,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5695,45 +5468,20 @@
+@@ -5644,45 +5417,20 @@
    return 0;
  }
  _ACEOF
@@ -5161,7 +5161,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5746,45 +5494,20 @@
+@@ -5695,45 +5443,20 @@
    return 0;
  }
  _ACEOF
@@ -5212,7 +5212,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5797,45 +5520,20 @@
+@@ -5746,45 +5469,20 @@
    return 0;
  }
  _ACEOF
@@ -5263,7 +5263,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5848,34 +5546,13 @@
+@@ -5797,34 +5495,13 @@
    return 0;
  }
  _ACEOF
@@ -5301,7 +5301,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5894,7 +5571,7 @@
+@@ -5843,7 +5520,7 @@
  else
      CFLAGS="$saved_CFLAGS"
      saved_CFLAGS=""
@@ -5310,7 +5310,7 @@
  $as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
  fi
  
-@@ -5913,10 +5590,10 @@
+@@ -5862,10 +5539,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
-@@ -5924,11 +5601,11 @@
+@@ -5873,11 +5550,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.
-@@ -5965,7 +5642,7 @@
+@@ -5914,7 +5591,7 @@
      ;;
  esac
  
@@ -5348,7 +5348,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -5981,7 +5658,7 @@
+@@ -5930,7 +5607,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}.
-@@ -5993,17 +5670,13 @@
+@@ -5942,17 +5619,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.
-@@ -6028,54 +5701,27 @@
+@@ -5977,54 +5650,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
-@@ -6083,7 +5729,6 @@
+@@ -6032,7 +5678,6 @@
  
  
  
@@ -5449,7 +5449,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE_EXTENDED
  #define _XOPEN_SOURCE_EXTENDED 1
-@@ -6092,15 +5737,15 @@
+@@ -6041,15 +5686,15 @@
  
  
  # Check whether --enable-largefile was given.
@@ -5468,7 +5468,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
-@@ -6109,11 +5754,7 @@
+@@ -6058,11 +5703,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.
-@@ -6132,60 +5773,14 @@
+@@ -6081,60 +5722,14 @@
    return 0;
  }
  _ACEOF
@@ -5544,7 +5544,7 @@
  rm -f core conftest.err conftest.$ac_objext
  	 break
         done
-@@ -6193,23 +5788,19 @@
+@@ -6142,23 +5737,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.
-@@ -6228,38 +5819,11 @@
+@@ -6177,38 +5768,11 @@
    return 0;
  }
  _ACEOF
@@ -5613,7 +5613,7 @@
  /* end confdefs.h.  */
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -6279,38 +5843,15 @@
+@@ -6228,38 +5792,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) ;;
-@@ -6322,17 +5863,13 @@
+@@ -6271,17 +5812,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.
-@@ -6351,38 +5888,11 @@
+@@ -6300,38 +5837,11 @@
    return 0;
  }
  _ACEOF
@@ -5716,7 +5716,7 @@
  /* end confdefs.h.  */
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -6402,38 +5912,15 @@
+@@ -6351,38 +5861,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) ;;
-@@ -6457,31 +5944,25 @@
+@@ -6406,31 +5893,25 @@
  	*hpux*)
  		# mmap on HPUX is completely broken...
  
@@ -5794,7 +5794,7 @@
  
  		if test "${GCC}" != "yes"; then
  			## for funky AIX compiler using strncpy()
-@@ -6493,7 +5974,6 @@
+@@ -6442,7 +5923,6 @@
  
  
  
@@ -5802,7 +5802,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 600
-@@ -6503,7 +5983,6 @@
+@@ -6452,7 +5932,6 @@
  
  
  
@@ -5810,7 +5810,7 @@
   cat >>confdefs.h <<\EOF
  #ifndef _OSF_SOURCE
  #define _OSF_SOURCE 1
-@@ -6520,9 +5999,7 @@
+@@ -6469,9 +5948,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
  
@@ -5821,7 +5821,7 @@
  
  				;;
  		esac
-@@ -6531,9 +6008,7 @@
+@@ -6480,9 +5957,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_SYSV"
  
@@ -5832,7 +5832,7 @@
  
  				;;
  		esac
-@@ -6542,978 +6017,385 @@
+@@ -6491,978 +5966,374 @@
  
  
  
@@ -6410,8 +6410,8 @@
 -  ac_lo=$ac_mid; break
 +
 +
-+ac_fn_c_check_type "$LINENO" "uint_t" "ac_cv_type_uint_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default"
++if test "x$ac_cv_type_int8_t" = x""yes; then :
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -6424,15 +6424,15 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
 +cat >>confdefs.h <<_ACEOF
-+#define uint_t unsigned int
++#define int8_t char
 +_ACEOF
 +
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
-+ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int8_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default"
++if test "x$ac_cv_type_uint8_t" = x""yes; then :
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -6441,7 +6441,7 @@
 -	ac_lo= ac_hi=
 -fi
 +cat >>confdefs.h <<_ACEOF
-+#define int8_t char
++#define uint8_t unsigned char
 +_ACEOF
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6463,8 +6463,8 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 -test_array [0] = 0
-+ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint8_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
++if test "x$ac_cv_type_int16_t" = x""yes; then :
  
 -  ;
 -  return 0;
@@ -6495,7 +6495,7 @@
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
 +cat >>confdefs.h <<_ACEOF
-+#define uint8_t unsigned char
++#define int16_t short
 +_ACEOF
 +
  fi
@@ -6516,15 +6516,15 @@
 -     ac_cv_sizeof_int=0
 -   fi ;;
 -esac
-+ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int16_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
++if test "x$ac_cv_type_uint16_t" = x""yes; then :
 +
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +
 +cat >>confdefs.h <<_ACEOF
-+#define int16_t short
++#define uint16_t unsigned short
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -6560,8 +6560,10 @@
 -  return ferror (f) || fclose (f) != 0;
 +fi
 +
-+ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint16_t" = x""yes; then :
++
++if test $ac_cv_sizeof_int -eq 4 ; then
++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
++if test "x$ac_cv_type_int32_t" = x""yes; then :
  
 -  ;
 -  return 0;
@@ -6613,29 +6615,28 @@
 -fi
 -rm -f conftest.val
 +cat >>confdefs.h <<_ACEOF
-+#define uint16_t unsigned short
++#define int32_t int
 +_ACEOF
 +
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -$as_echo "$ac_cv_sizeof_int" >&6; }
  
++ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
++if test "x$ac_cv_type_uint32_t" = x""yes; then :
  
-+if test $ac_cv_sizeof_int -eq 4 ; then
-+ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int32_t" = x""yes; then :
-+
 +else
  
  cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_INT $ac_cv_sizeof_int
-+#define int32_t int
++#define uint32_t unsigned int
  _ACEOF
  
 +fi
 +
-+ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint32_t" = x""yes; then :
++elif test $ac_cv_size_long -eq 4 ; then
++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
++if test "x$ac_cv_type_int32_t" = x""yes; then :
  
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -6688,7 +6689,7 @@
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +cat >>confdefs.h <<_ACEOF
-+#define uint32_t unsigned int
++#define int32_t long
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -6725,9 +6726,8 @@
 -  ac_hi=$ac_mid; break
 +fi
 +
-+elif test $ac_cv_size_long -eq 4 ; then
-+ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int32_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
++if test "x$ac_cv_type_uint32_t" = x""yes; then :
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -6740,25 +6740,22 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
 +cat >>confdefs.h <<_ACEOF
-+#define int32_t long
++#define uint32_t unsigned long
 +_ACEOF
 +
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
-+ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint32_t" = x""yes; then :
-+
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++as_fn_error "LIBREPLACE no 32-bit type found" "$LINENO" 5
++fi
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define uint32_t unsigned long
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -6768,6 +6765,8 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
 -test_array [0] = 0
++ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
++if test "x$ac_cv_type_int64_t" = x""yes; then :
  
 -  ;
 -  return 0;
@@ -6805,12 +6804,14 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
 -test_array [0] = 0
-+fi
++else
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define int64_t long long
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -6830,23 +6831,22 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
-+as_fn_error "LIBREPLACE no 32-bit type found" "$LINENO" 5
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
-+ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int64_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
++if test "x$ac_cv_type_uint64_t" = x""yes; then :
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -6855,7 +6855,7 @@
 -	ac_lo= ac_hi=
 -fi
 +cat >>confdefs.h <<_ACEOF
-+#define int64_t long long
++#define uint64_t unsigned long long
 +_ACEOF
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6877,8 +6877,6 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
 -test_array [0] = 0
-+ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uint64_t" = x""yes; then :
  
 -  ;
 -  return 0;
@@ -6903,13 +6901,16 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid
++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
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
 +cat >>confdefs.h <<_ACEOF
-+#define uint64_t unsigned long long
++#define size_t unsigned int
 +_ACEOF
 +
  fi
@@ -6930,16 +6931,15 @@
 -     ac_cv_sizeof_char=0
 -   fi ;;
 -esac
++ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
++if test "x$ac_cv_type_ssize_t" = x""yes; then :
 +
-+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 >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +
 +cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
++#define ssize_t int
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -6978,14 +6978,7 @@
 -  ;
 -  return 0;
 -}
-+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ssize_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ssize_t int
- _ACEOF
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -7010,9 +7003,6 @@
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_char=`cat conftest.val`
 +
-+fi
-+
-+
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -7066,7 +7056,7 @@
  _ACEOF
  
  
-@@ -7521,32140 +6403,3100 @@
+@@ -7470,30906 +6341,2146 @@
  # 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.
@@ -7231,10 +7221,7 @@
 -  ;
 -  return 0;
 -}
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -7258,13 +7245,8 @@
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +
-+
-+
-+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 :
-+
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_INTPTR_T 1
++#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -7280,12 +7262,12 @@
 -  return 0;
 -}
 +
-+fi
-+ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
 +
++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 :
++
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_UINTPTR_T 1
++#define HAVE_INTPTR_T 1
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -7318,30 +7300,25 @@
 -			ac_mid=`expr 2 '*' $ac_mid`
 +
  fi
-+ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_PTRDIFF_T 1
-+_ACEOF
++ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
++if test "x$ac_cv_type_uintptr_t" = x""yes; then :
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++cat >>confdefs.h <<_ACEOF
++#define HAVE_UINTPTR_T 1
++_ACEOF
  
 -	ac_lo= ac_hi=
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test x"$ac_cv_type_long_long" != x"yes";then
-+	as_fn_error "LIBREPLACE needs type 'long long'" "$LINENO" 5
-+fi
-+if test $ac_cv_sizeof_long_long -lt 8;then
-+	as_fn_error "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
  fi
++ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
++if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
@@ -7349,45 +7326,23 @@
 -  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define HAVE_PTRDIFF_T 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+############################################
-+# check if the compiler can do immediate structures
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immediate structures" >&5
-+$as_echo_n "checking for immediate structures... " >&6; }
-+if test "${libreplace_cv_immediate_structures+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+
-+		#include <stdio.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 -test_array [0] = 0
-+
-+		typedef struct {unsigned x;} FOOBAR;
-+		#define X_FOOBAR(x) ((FOOBAR) { x })
-+		#define FOO_ONE X_FOOBAR(1)
-+		FOOBAR f = FOO_ONE;
-+		static const struct {
-+			FOOBAR y;
-+		} f2[] = {
-+			{FOO_ONE}
-+		};
-+		static const FOOBAR f3[] = {FOO_ONE};
  
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -7407,20 +7362,12 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_immediate_structures=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_immediate_structures=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
-+$as_echo "$libreplace_cv_immediate_structures" >&6; }
-+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
@@ -7438,22 +7385,41 @@
 -     ac_cv_sizeof_short=0
 -   fi ;;
 -esac
--else
++
++if test x"$ac_cv_type_long_long" != x"yes";then
++	as_fn_error "LIBREPLACE needs type 'long long'" "$LINENO" 5
++fi
++if test $ac_cv_sizeof_long_long -lt 8;then
++	as_fn_error "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
++fi
++
++############################################
++# check if the compiler can do immediate structures
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immediate structures" >&5
++$as_echo_n "checking for immediate structures... " >&6; }
++if test "${libreplace_cv_immediate_structures+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.  */
++
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -static long int longval () { return (long int) (sizeof (short)); }
 -static unsigned long int ulongval () { return (long int) (sizeof (short)); }
 -#include <stdio.h>
 -#include <stdlib.h>
--int
--main ()
--{
-+$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
++
++		#include <stdio.h>
++
+ int
+ main ()
+ {
  
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
@@ -7475,12 +7441,21 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
-+fi
++		typedef struct {unsigned x;} FOOBAR;
++		#define X_FOOBAR(x) ((FOOBAR) { x })
++		#define FOO_ONE X_FOOBAR(1)
++		FOOBAR f = FOO_ONE;
++		static const struct {
++			FOOBAR y;
++		} f2[] = {
++			{FOO_ONE}
++		};
++		static const FOOBAR f3[] = {FOO_ONE};
  
--  ;
--  return 0;
--}
--_ACEOF
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -7504,11 +7479,13 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_immediate_structures=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 )
 -if test "$ac_cv_type_short" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -7521,43 +7498,30 @@
 -   else
 -     ac_cv_sizeof_short=0
 -   fi
--fi
++  libreplace_cv_immediate_structures=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 conftest.val
-+echo "LIBREPLACE_CC_CHECKS: END"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+
-+
-+
-+
-+
-+if test x"$teventdir" = "x"; then
-+	teventdir=""
-+	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+	for d in $teventpaths; do
-+		if test -f "$d/tevent.c"; then
-+			teventdir="$d"
-+			break;
-+		fi
-+	done
-+	if test x"$teventdir" = "x"; then
-+	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
-+	fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
++$as_echo "$libreplace_cv_immediate_structures" >&6; }
++if test x"$libreplace_cv_immediate_structures" = x"yes"; then
  
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
++$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
  
++fi
  
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
  
++echo "LIBREPLACE_CC_CHECKS: END"
  
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -7582,7 +7546,6 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 -test_array [0] = 0
-+TEVENT_CFLAGS="-I$teventdir"
  
 -  ;
 -  return 0;
@@ -7620,21 +7583,11 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 -test_array [0] = 0
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
  
 -  ;
 -  return 0;
 -}
-+for ac_header in sys/epoll.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -7657,6 +7610,35 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++	case "$host_os" in
++		*linux*|*gnu*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++		;;
++		*bsd*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++		;;
++		*solaris*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++		;;
++		*hpux*)
++			LIB_PATH_VAR=SHLIB_PATH
++		;;
++		*osf*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++		;;
++		*aix*)
++			LIB_PATH_VAR=LIBPATH
++			;;
++		*irix*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++			;;
++		*darwin*)
++			LIB_PATH_VAR=DYLD_LIBRARY_PATH
++			;;
++		*)
++			LIB_PATH_VAR=LD_LIBRARY_PATH
++			;;
++	esac
  
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
@@ -7664,24 +7646,17 @@
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+done
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in epoll_create
-+do :
-+  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
-+if test "x$ac_cv_func_epoll_create" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EPOLL_CREATE 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -7728,8 +7703,6 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 -test_array [0] = 0
-+fi
-+done
  
 -  ;
 -  return 0;
@@ -7757,10 +7730,6 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+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"
-+
-+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
  
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
@@ -7768,6 +7737,19 @@
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
++
++if test x"$teventdir" = "x"; then
++	teventdir=""
++	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++	for d in $teventpaths; do
++		if test -f "$d/tevent.c"; then
++			teventdir="$d"
++			break;
++		fi
++	done
++	if test x"$teventdir" = "x"; then
++	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++	fi
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -7775,11 +7757,12 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=tevent.exports
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
  
 -	ac_lo= ac_hi=
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
@@ -7804,7 +7787,20 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++TEVENT_CFLAGS="-I$teventdir"
++
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
++
++for ac_header in sys/epoll.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 1
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -7827,30 +7823,12 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+	LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
-+
-+LIBS="${LIBS} ${TEVENT_LIBS}"
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
-+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-+
-+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-+
-+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
-+if test "x${srcdir-.}" != "x."; then
-+	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
+ done
 -case $ac_lo in
 -?*) ac_cv_sizeof_long=$ac_lo;;
 -'') if test "$ac_cv_type_long" = yes; then
@@ -7868,7 +7846,14 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++for ac_func in epoll_create
++do :
++  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
++if test "x$ac_cv_func_epoll_create" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_EPOLL_CREATE 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -7901,6 +7886,8 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
++fi
++done
  
 -  ;
 -  return 0;
@@ -7933,6 +7920,10 @@
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++if 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"
++
++$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
  
 -( exit $ac_status )
 -if test "$ac_cv_type_long" = yes; then
@@ -7946,12 +7937,38 @@
 -   else
 -     ac_cv_sizeof_long=0
 -   fi
--fi
+ fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++
++if test x"$VERSIONSCRIPT" != "x"; then
++    EXPORTSFILE=tevent.exports
++
+ fi
 -rm -f conftest.val
--fi
++
++
++
++LIBTEVENT_OBJ0=""
++for obj in ${TEVENT_OBJ}; do
++	LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
++done
++
++LIBS="${LIBS} ${TEVENT_LIBS}"
++
++SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
++
++SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
++
++## cleanup the $(srcdir) in the Makefile if we are outside of the tree
++if test "x${srcdir-.}" != "x."; then
++	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -$as_echo "$ac_cv_sizeof_long" >&6; }
  
@@ -8322,110 +8339,6 @@
  
  
  
--{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
--$as_echo_n "checking for uint_t... " >&6; }
--if test "${ac_cv_type_uint_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_type_uint_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (uint_t))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((uint_t)))
--	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_uint_t=yes
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
--$as_echo "$ac_cv_type_uint_t" >&6; }
--if test "x$ac_cv_type_uint_t" = x""yes; then
--  :
--else
- 
--cat >>confdefs.h <<_ACEOF
--#define uint_t unsigned int
--_ACEOF
- 
--fi
- 
 -{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
 -$as_echo_n "checking for int8_t... " >&6; }
 -if test "${ac_cv_type_int8_t+set}" = set; then
@@ -8504,18 +8417,18 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_int8_t=yes
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
@@ -8523,13 +8436,13 @@
 -if test "x$ac_cv_type_int8_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define int8_t char
 -_ACEOF
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
 -$as_echo_n "checking for uint8_t... " >&6; }
 -if test "${ac_cv_type_uint8_t+set}" = set; then
@@ -8608,18 +8521,18 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_uint8_t=yes
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
@@ -8627,13 +8540,13 @@
 -if test "x$ac_cv_type_uint8_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define uint8_t unsigned char
 -_ACEOF
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
 -$as_echo_n "checking for int16_t... " >&6; }
 -if test "${ac_cv_type_int16_t+set}" = set; then
@@ -8712,53 +8625,32 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_int16_t=yes
-+
-+# 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"
-+# if it has no value.  This prevent *very* large debug binaries from occurring
-+# by default.
-+if test "x$debug" = "xyes" ; then
-+	CFLAGS="${CFLAGS} -g"
-+fi
-+if test "x$CFLAGS" = x; then
-+  CFLAGS="-O"
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# 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
+-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
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
 -$as_echo_n "checking for uint16_t... " >&6; }
 -if test "${ac_cv_type_uint16_t+set}" = set; then
@@ -8837,46 +8729,33 @@
 -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"
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -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;
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
 -$as_echo "$ac_cv_type_uint16_t" >&6; }
 -if test "x$ac_cv_type_uint16_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define uint16_t unsigned short
 -_ACEOF
- 
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+	enable_nss_wrapper=yes
- fi
- 
-+if eval "test x$enable_nss_wrapper = xyes"; then
- 
+-
+-fi
+-
+-
 -if test $ac_cv_sizeof_int -eq 4 ; then
 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
 -$as_echo_n "checking for int32_t... " >&6; }
@@ -8956,23 +8835,18 @@
 -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"
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
@@ -8980,13 +8854,13 @@
 -if test "x$ac_cv_type_int32_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define int32_t int
 -_ACEOF
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
 -$as_echo_n "checking for uint32_t... " >&6; }
 -if test "${ac_cv_type_uint32_t+set}" = set; then
@@ -9065,30 +8939,18 @@
 -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_uint32_t=yes
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
+-
+-
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
@@ -9096,28 +8958,19 @@
 -if test "x$ac_cv_type_uint32_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define uint32_t unsigned int
 -_ACEOF
- 
+-
 -fi
- 
+-
 -elif test $ac_cv_size_long -eq 4 ; then
 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
 -$as_echo_n "checking for int32_t... " >&6; }
 -if test "${ac_cv_type_int32_t+set}" = set; then
-+# 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 +9011,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 +9021,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,38 +9041,21 @@
 -	 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
 -
 -	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
- 
+-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
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
@@ -9247,46 +9063,25 @@
 -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
- else
+-else
 -  ac_cv_type_uint32_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -9296,12 +9091,7 @@
 -  ;
 -  return 0;
 -}
-+
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -9355,73 +9145,41 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_uint32_t=yes
-+  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
- 
+-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
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
 -$as_echo "$ac_cv_type_uint32_t" >&6; }
 -if test "x$ac_cv_type_uint32_t" = x""yes; then
 -  :
 -else
-+{ $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 uint32_t unsigned long
 -_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
- 
-+       if test x"$picky_developer" = x"yes"; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+       fi
- fi
- 
+-
+-fi
+-
 -else
 -{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE no 32-bit type found" >&5
 -$as_echo "$as_me: error: LIBREPLACE no 32-bit type found" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+#################################################
-+# 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; }
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
 -$as_echo_n "checking for int64_t... " >&6; }
 -if test "${ac_cv_type_int64_t+set}" = set; then
@@ -9500,35 +9258,18 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Check whether --with-profiling-data was given.
-+if test "${with_profiling_data+set}" = set; then :
-+  withval=$with_profiling_data;  case "$withval" in
-+  yes)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
+-
 -	ac_cv_type_int64_t=yes
 -fi
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    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
+-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; }
- 
- fi
- 
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
@@ -9536,26 +9277,18 @@
 -if test "x$ac_cv_type_int64_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define int64_t long long
 -_ACEOF
-+merged_build_possible=yes
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
 -$as_echo_n "checking for uint64_t... " >&6; }
 -if test "${ac_cv_type_uint64_t+set}" = set; then
-+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.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_uint64_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -9626,49 +9359,21 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -	ac_cv_type_uint64_t=yes
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
- else
+-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; }
-+fi
- 
- 
+-
+-
 -fi
-+  test -n "$AWK" && break
-+done
-+
-+# Check for GNU make
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
@@ -9676,27 +9381,19 @@
 -if test "x$ac_cv_type_uint64_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define uint64_t unsigned long long
 -_ACEOF
- 
+-
 -fi
- 
- 
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
 -$as_echo_n "checking for size_t... " >&6; }
 -if test "${ac_cv_type_size_t+set}" = set; then
-+
-+for ac_prog in gmake make
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_size_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -9770,45 +9467,18 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  case $MAKE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -	ac_cv_type_size_t=yes
-+  ;;
-+esac
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+MAKE=$ac_cv_path_MAKE
-+if test -n "$MAKE"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-+$as_echo "$MAKE" >&6; }
- else
+-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; }
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -9816,23 +9486,18 @@
 -if test "x$ac_cv_type_size_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define size_t unsigned int
 -_ACEOF
-+  test -n "$MAKE" && break
-+done
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
 -$as_echo_n "checking for ssize_t... " >&6; }
 -if test "${ac_cv_type_ssize_t+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
-+$as_echo_n "checking whether we have GNU make... " >&6; }
-+if test "${samba_cv_gnu_make+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_ssize_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -9909,39 +9574,30 @@
 -
 -	ac_cv_type_ssize_t=yes
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-+then
-+	samba_cv_gnu_make=no
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
-+	samba_cv_gnu_make=yes
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 -$as_echo "$ac_cv_type_ssize_t" >&6; }
 -if test "x$ac_cv_type_ssize_t" = x""yes; then
 -  :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
-+$as_echo "$samba_cv_gnu_make" >&6; }
-+if test x$samba_cv_gnu_make = xyes; then
-+	true
- else
+-else
 -
 -cat >>confdefs.h <<_ACEOF
 -#define ssize_t int
 -_ACEOF
 -
-+	merged_build_possible=no
- fi
- 
- 
+-fi
+-
+-
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -10029,8 +9685,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Check for perl
- 
+-
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
 -			  ac_lo= ac_hi=
@@ -10038,13 +9693,13 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -10057,7 +9712,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -10094,7 +9749,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -10118,69 +9773,30 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
-+case "$host_os" in
-+	*irix*)
-+		# On IRIX, we prefer Freeware or Nekoware Perl, because the
-+		# system perl is so ancient.
-+		# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  case $PERL in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
-+for as_dir in $as_dummy
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
-+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+  ;;
-+esac
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_lo= ac_hi=
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 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
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -11460,9 +11076,42 @@
 -
 -
 -
+-	case "$host_os" in
+-		*linux*|*gnu*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-		;;
+-		*bsd*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-		;;
+-		*solaris*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-		;;
+-		*hpux*)
+-			LIB_PATH_VAR=SHLIB_PATH
+-		;;
+-		*osf*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-		;;
+-		*aix*)
+-			LIB_PATH_VAR=LIBPATH
+-			;;
+-		*irix*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-			;;
+-		*darwin*)
+-			LIB_PATH_VAR=DYLD_LIBRARY_PATH
+-			;;
+-		*)
+-			LIB_PATH_VAR=LD_LIBRARY_PATH
+-			;;
+-	esac
 -
 -
 -
+-
+-
+-
+-
 -if test x"$teventdir" = "x"; then
 -	teventdir=""
 -	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
@@ -11909,9 +11558,76 @@
 -
 -
 -
+-{ $as_echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
+-$as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
+-if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
 -
+-if test "$cross_compiling" = yes; then
+-  samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
+-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/time.h>
+-#include <unistd.h>
+-main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  samba_cv_HAVE_GETTIMEOFDAY_TZ=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_GETTIMEOFDAY_TZ=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
+-$as_echo "$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
+-if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTIMEOFDAY_TZ 1
+-_ACEOF
+-
+-fi
+-
+-
+-
+-
 -SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
 -SWAT_INSTALL_TARGETS=installswat
 -
@@ -11933,11 +11649,13 @@
 -
 -
 -
+-DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
+-
 -# 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"
+-	DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings"
 -	# Add -Wdeclaration-after-statement if compiler supports it
 -	{ $as_echo "$as_me:$LINENO: checking that the C compiler understands -Wdeclaration-after-statement" >&5
 -$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
@@ -12362,7 +12080,7 @@
 -if test x$samba_cv_gnu_make = xyes; then
 -	true
 -else
--	merged_build_possible=no
+-	true
 -fi
 -
 -
@@ -12602,7 +12320,7 @@
 -        else
 -           { $as_echo "$as_me:$LINENO: checking GNU ld release version" >&5
 -$as_echo_n "checking GNU ld release version... " >&6; }
--                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+-                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' | sed -n 's,\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
 -           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
 -           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
 -                      { $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr}" >&5
@@ -13505,9 +13223,62 @@
 -LDSHFLAGS_Z_NODEFS=
 -
 -
--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"
+-default_static_modules=""
+-default_static_modules="$default_static_modules pdb_smbpasswd"
+-default_static_modules="$default_static_modules pdb_tdbsam"
+-default_static_modules="$default_static_modules pdb_wbc_sam"
+-default_static_modules="$default_static_modules rpc_lsarpc"
+-default_static_modules="$default_static_modules rpc_samr"
+-default_static_modules="$default_static_modules rpc_winreg"
+-default_static_modules="$default_static_modules rpc_initshutdown"
+-default_static_modules="$default_static_modules rpc_dssetup"
+-default_static_modules="$default_static_modules rpc_wkssvc"
+-default_static_modules="$default_static_modules rpc_svcctl"
+-default_static_modules="$default_static_modules rpc_ntsvcs"
+-default_static_modules="$default_static_modules rpc_netlogon"
+-default_static_modules="$default_static_modules rpc_netdfs"
+-default_static_modules="$default_static_modules rpc_srvsvc"
+-default_static_modules="$default_static_modules rpc_spoolss"
+-default_static_modules="$default_static_modules rpc_eventlog"
+-default_static_modules="$default_static_modules auth_sam"
+-default_static_modules="$default_static_modules auth_unix"
+-default_static_modules="$default_static_modules auth_winbind"
+-default_static_modules="$default_static_modules auth_wbc"
+-default_static_modules="$default_static_modules auth_server"
+-default_static_modules="$default_static_modules auth_domain"
+-default_static_modules="$default_static_modules auth_builtin"
+-default_static_modules="$default_static_modules auth_netlogond"
+-default_static_modules="$default_static_modules vfs_default"
+-default_static_modules="$default_static_modules nss_info_template"
 -
--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"
+-default_shared_modules=""
+-default_shared_modules="$default_shared_modules vfs_recycle"
+-default_shared_modules="$default_shared_modules vfs_audit"
+-default_shared_modules="$default_shared_modules vfs_extd_audit"
+-default_shared_modules="$default_shared_modules vfs_full_audit"
+-default_shared_modules="$default_shared_modules vfs_netatalk"
+-default_shared_modules="$default_shared_modules vfs_fake_perms"
+-default_shared_modules="$default_shared_modules vfs_default_quota"
+-default_shared_modules="$default_shared_modules vfs_readonly"
+-default_shared_modules="$default_shared_modules vfs_cap"
+-default_shared_modules="$default_shared_modules vfs_expand_msdfs"
+-default_shared_modules="$default_shared_modules vfs_shadow_copy"
+-default_shared_modules="$default_shared_modules vfs_shadow_copy2"
+-default_shared_modules="$default_shared_modules charset_CP850"
+-default_shared_modules="$default_shared_modules charset_CP437"
+-default_shared_modules="$default_shared_modules auth_script"
+-default_shared_modules="$default_shared_modules vfs_readahead"
+-default_shared_modules="$default_shared_modules vfs_xattr_tdb"
+-default_shared_modules="$default_shared_modules vfs_streams_xattr"
+-default_shared_modules="$default_shared_modules vfs_streams_depot"
+-default_shared_modules="$default_shared_modules vfs_acl_xattr"
+-default_shared_modules="$default_shared_modules vfs_acl_tdb"
+-default_shared_modules="$default_shared_modules vfs_smb_traffic_analyzer"
+-default_shared_modules="$default_shared_modules vfs_preopen"
+-default_shared_modules="$default_shared_modules vfs_catia"
+-default_shared_modules="$default_shared_modules vfs_scannedonly"
+-default_shared_modules="$default_shared_modules vfs_crossrename"
+-default_shared_modules="$default_shared_modules vfs_linux_xfs_sgid"
 -
 -if test "x$developer" = xyes; then
 -   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
@@ -14018,64 +13789,6 @@
 -
 -LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
 -
--{ $as_echo "$as_me:$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 >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
--#include <signal.h>
--
--int
--main ()
--{
--return *(signal (0, 0)) (0) == 1;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_signal=int
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_signal=void
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--$as_echo "$ac_cv_type_signal" >&6; }
--
--cat >>confdefs.h <<_ACEOF
--#define RETSIGTYPE $ac_cv_type_signal
--_ACEOF
--
--
 -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 -if test "${ac_cv_type_uid_t+set}" = set; then
@@ -16965,7 +16678,8 @@
 -
 -
 -
--for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
+-
+-for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror strerror_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
@@ -17285,7 +16999,9 @@
 -
 -
 -
--for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
+-
+-
+-for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2 dprintf vdprintf
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -17392,7 +17108,8 @@
 -
 -
 -
--for ac_func in isatty chown lchown link readlink symlink realpath
+-
+-for ac_func in isatty chown lchown link readlink symlink realpath fdatasync
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -17493,6 +17210,107 @@
 -done
 -
 -
+-for ac_func in get_current_dir_name
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
 - { $as_echo "$as_me:$LINENO: checking for setresuid declaration" >&5
 -$as_echo_n "checking for setresuid declaration... " >&6; }
 -if test "${ac_cv_have_setresuid_decl+set}" = set; then
@@ -19311,6 +19129,108 @@
 -done
 -
 -
+-
+-for ac_func in memmem
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
 -# this test disabled as we don't actually need __VA_ARGS__ yet
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -19958,7 +19878,8 @@
 -
 -
 -
--for ac_header in sys/acl.h acl/libacl.h
+-
+-for ac_header in sys/acl.h acl/libacl.h sys/file.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
@@ -29261,8 +29182,83 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
 -$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
+-
 -if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+-	# getaddrinfo is broken on some AIX systems
+-	# see bug 5910, use our replacements if we detect
+-	# a broken system.
+-	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; }; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
+-		#include <stddef.h>
+-		#include <sys/types.h>
+-		#include <sys/socket.h>
+-		#include <netdb.h>
+-		int main(int argc, const char *argv[])
+-		{
+-			struct addrinfo hints = {0,};
+-			struct addrinfo *ppres;
+-			const char hostname[] = "0.0.0.0";
+-			hints.ai_socktype = SOCK_STREAM;
+-			hints.ai_family = AF_INET;
+-			hints.ai_flags =
+-				AI_NUMERICHOST|AI_PASSIVE|AI_ADDRCONFIG;
+-			return getaddrinfo(hostname, NULL, &hints, &ppres) != 0 ? 1 : 0;
+-		}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  libreplace_cv_HAVE_GETADDRINFO=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 )
+-libreplace_cv_HAVE_GETADDRINFO=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+-if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETADDRINFO 1
 -_ACEOF
@@ -34440,7 +34436,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34467,7 +34463,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
 -			  ac_lo= ac_hi=
@@ -34475,13 +34471,13 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -34494,7 +34490,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34531,7 +34527,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34558,7 +34554,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
@@ -34566,19 +34562,19 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo= ac_hi=
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -34595,7 +34591,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34622,10 +34618,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -34657,7 +34653,7 @@
 -int
 -main ()
 -{
--
+ 
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -34678,7 +34674,7 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34710,7 +34706,7 @@
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -( exit $ac_status )
 -if test "$ac_cv_type_long" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -34731,14 +34727,14 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -$as_echo "$ac_cv_sizeof_long" >&6; }
--
--
--
+ 
+ 
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG $ac_cv_sizeof_long
 -_ACEOF
--
--
+ 
+ 
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -34762,7 +34758,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34799,7 +34795,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34826,7 +34822,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
 -			  ac_lo= ac_hi=
@@ -34834,13 +34830,13 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -34853,7 +34849,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34890,7 +34886,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34917,14 +34913,21 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
--fi
++# 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"
++# if it has no value.  This prevent *very* large debug binaries from occurring
++# by default.
++if test "x$debug" = "xyes" ; then
++	CFLAGS="${CFLAGS} -g"
+ fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
@@ -34933,11 +34936,16 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_lo= ac_hi=
--fi
--
++if test "x$CFLAGS" = x; then
++  CFLAGS="-O"
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++  enableval=$enable_socket_wrapper;
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -34954,7 +34962,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -34981,10 +34989,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
+ 
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
++if eval "test x$developer = xyes"; then
++	enable_socket_wrapper=yes
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -35016,7 +35028,8 @@
 -int
 -main ()
 -{
--
++if eval "test x$enable_socket_wrapper = xyes"; then
+ 
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -35037,7 +35050,8 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
--
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
+ 
 -  ;
 -  return 0;
 -}
@@ -35069,7 +35083,9 @@
 -  $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
--
++	DEFAULT_TEST_OPTIONS=--socket-wrapper
++	HAVE_SOCKET_WRAPPER=yes
+ 
 -( exit $ac_status )
 -if test "$ac_cv_type_long_long" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -35082,22 +35098,44 @@
 -   else
 -     ac_cv_sizeof_long_long=0
 -   fi
--fi
++	# this is only used for samba3
++	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
+ 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
++
++
++
++
++
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++  enableval=$enable_nss_wrapper;
+ fi
 -rm -f conftest.val
--fi
++
++
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++	enable_nss_wrapper=yes
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 -$as_echo "$ac_cv_sizeof_long_long" >&6; }
--
--
--
+ 
++if eval "test x$enable_nss_wrapper = xyes"; then
+ 
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 -_ACEOF
--
--
++	HAVE_NSS_WRAPPER=yes
+ 
++	# this is only used for samba3
++	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
++fi
+ 
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -35105,8 +35143,14 @@
 -{ $as_echo "$as_me:$LINENO: checking size of short" >&5
 -$as_echo_n "checking size of short... " >&6; }
 -if test "${ac_cv_sizeof_short+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes tz argument" >&5
++$as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
++if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  if test "$cross_compiling" = yes; then
 -  # Depending upon the size, compute the lo and hi bounds.
 -cat >conftest.$ac_ext <<_ACEOF
@@ -35121,7 +35165,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -35151,18 +35195,25 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
--_ACEOF
++#include <sys/time.h>
++#include <unistd.h>
++main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -35182,24 +35233,35 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid; break
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  samba_cv_HAVE_GETTIMEOFDAY_TZ=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_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
++$as_echo "$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
++if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_GETTIMEOFDAY_TZ 1" >>confdefs.h
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -35212,7 +35274,8 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
 -test_array [0] = 0
--
++fi
+ 
 -  ;
 -  return 0;
 -}
@@ -35249,7 +35312,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -35276,7 +35339,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
@@ -35284,19 +35347,30 @@
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
+ 
 -	ac_lo= ac_hi=
 -fi
--
++# 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
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -35313,7 +35387,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -35337,13 +35411,30 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid
--else
++
++
++
++
++
++DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
++
++# 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="${DEVELOPER_CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings"
++	# 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 "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -35360,13 +35451,25 @@
 -     ac_cv_sizeof_short=0
 -   fi ;;
 -esac
--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
 -  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.  */
 -$ac_includes_default
 -static long int longval () { return (long int) (sizeof (short)); }
 -static unsigned long int ulongval () { return (long int) (sizeof (short)); }
@@ -35396,11 +35499,15 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
--
+ 
 -  ;
 -  return 0;
 -}
--_ACEOF
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -35424,7 +35531,9 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=yes
+ else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -35441,35 +35550,57 @@
 -   else
 -     ac_cv_sizeof_short=0
 -   fi
--fi
++  samba_cv_HAVE_Wdeclaration_after_statement=no
+ fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
 -rm -f conftest.val
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
 -
--
--
+ 
++	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
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
--
--
--
+ 
++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; }
+ 
++	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++	fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 -if test "${ac_cv_c_const+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++	#-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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
@@ -35497,7 +35628,7 @@
 -  { /* SCO 3.2v4 cc rejects this.  */
 -    char *t;
 -    char const *s = 0 ? (char *) 0 : (char const *) 0;
--
+ 
 -    *t++ = 0;
 -    if (s) return 0;
 -  }
@@ -35522,46 +35653,35 @@
 -  }
 -  return !cs[0] && !zero.x;
 -#endif
-+		;;
-+	*)
-+		# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+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
 +else
-+  case $PERL in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+  ;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -35575,22 +35695,47 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_const=yes
-+fi
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
++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;
++
+ 
 -	ac_cv_c_const=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
  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
--fi
++	# 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_const" >&5
 -$as_echo "$ac_cv_c_const" >&6; }
 -if test $ac_cv_c_const = no; then
@@ -35598,31 +35743,48 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define const /**/
 -_ACEOF
-+		;;
-+esac
- 
-+if test x"$PERL" = x""; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
-+$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
-+	merged_build_possible=no
++#################################################
++# 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
++  yes)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define WITH_PROFILE 1" >>confdefs.h
++
++    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
-+	if test x"$debug" = x"yes";then
-+		PERL="$PERL -W"
-+	fi
-+	export PERL
-+	true
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
  fi
  
 -{ $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
 +
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
++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.
++set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
++if test "${ac_cv_prog_AWK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_cv_c_inline=no
@@ -35638,24 +35800,7 @@
 -static $ac_kw foo_t static_foo () {return 0; }
 -$ac_kw foo_t foo () {return 0; }
 -#endif
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -35676,36 +35821,12 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_inline=$ac_kw
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
  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; }
-+fi
- 
- 
- fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  test "$ac_cv_c_inline" != no && break
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
@@ -35713,28 +35834,37 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
++    ac_cv_prog_AWK="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
- done
++done
 +  done
 +IFS=$as_save_IFS
  
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--$as_echo "$ac_cv_c_inline" >&6; }
--
 +fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
 +else
 +  { $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
+-  test "$ac_cv_c_inline" != no && break
++
++  test -n "$AWK" && break
+ done
+ 
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
++# Check for GNU make
+ 
+ 
 -case $ac_cv_c_inline in
 -  inline | yes) ;;
 -  *)
@@ -35748,28 +35878,21 @@
 -#endif
 -_ACEOF
 -    ;;
-+  if test "x$ac_ct_AR" = x; then
-+    AR=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
- esac
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
+-esac
  
  
 - { $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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker used by compiler is GNU ld" >&5
-+$as_echo_n "checking if the linker used by compiler is GNU ld... " >&6; }
-+if test "${ac_cv_prog_gnu_ld+set}" = set; then :
++
++
++for ac_prog in gmake make
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MAKE+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_cv_c_bigendian=unknown
@@ -35784,14 +35907,34 @@
 -	       not a universal capable compiler
 -	     #endif
 -	     typedef int dummy;
--
++  case $MAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -_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
++  ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -35811,56 +35954,18 @@
 -	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
 -	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
 -	esac
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $CC -Wl,-v /dev/null 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
++fi
++MAKE=$ac_cv_path_MAKE
++if test -n "$MAKE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
++$as_echo "$MAKE" >&6; }
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_prog_gnu_ld=no
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
-+$as_echo "$ac_cv_prog_gnu_ld" >&6; }
- 
- 
-+if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1`
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
-+$as_echo_n "checking GNU ld release date... " >&6; }
-+		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
-+$as_echo "${ac_cv_gnu_ld_date}" >&6; }
-+        if test -n "$ac_cv_gnu_ld_date"; then
-+ 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
-+ 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+ 	fi
-+	if test "$ac_cv_gnu_ld_date" -gt 20030101; then
-+		ac_cv_gnu_ld_version_script=yes
-+	fi
-+        else
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
-+$as_echo_n "checking GNU ld release version... " >&6; }
-+                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
-+           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
-+           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
-+                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
-+$as_echo_n "checking GNU ld release version major... " >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
-+$as_echo_n "checking GNU ld release version minor... " >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
-+           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
-+             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+           fi
-+           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
-+             ac_cv_gnu_ld_version_script=yes
-+           fi
-+        fi
+-
+-
++  { $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
@@ -35871,57 +35976,33 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+if test "x$CC" != xcc; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-+fi
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <sys/types.h>
 -	     #include <sys/param.h>
- 
- int
- main ()
- {
+-
+-int
+-main ()
+-{
 -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 -		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
 -		     && LITTLE_ENDIAN)
 -	      bogus endian macros
 -	     #endif
  
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
-+# Make sure it works both with $CC and with simple cc.
-+# We do the test twice because some compilers refuse to overwrite an
-+# existing .o file with -o, though they will create one.
-+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+rm -f conftest2.*
-+if { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -35939,14 +36020,16 @@
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -		#include <sys/param.h>
--
++  test -n "$MAKE" && break
++done
+ 
 -int
 -main ()
 -{
 -#if BYTE_ORDER != BIG_ENDIAN
 -		 not big endian
 -		#endif
--
+ 
 -  ;
 -  return 0;
 -}
@@ -35954,19 +36037,13 @@
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } &&
-+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -35976,21 +36053,38 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_bigendian=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
++$as_echo_n "checking whether we have GNU make... " >&6; }
++if test "${samba_cv_gnu_make+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_c_bigendian=no
--fi
--
++if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
++then
++	samba_cv_gnu_make=no
++else
++	samba_cv_gnu_make=yes
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
++$as_echo "$samba_cv_gnu_make" >&6; }
++if test x$samba_cv_gnu_make = xyes; then
++	true
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
++	true
++fi
+ 
+ 
 -fi
--
++# Check for perl
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    fi
 -    if test $ac_cv_c_bigendian = unknown; then
@@ -36002,14 +36096,14 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
--
+ 
 -int
 -main ()
 -{
 -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 -	      bogus endian macros
 -	     #endif
--
+ 
 -  ;
 -  return 0;
 -}
@@ -36017,24 +36111,13 @@
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; };
-+then
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-+  if test "x$CC" != xcc; then
-+    # Test first that cc exists at all.
-+    if { ac_try='cc -c conftest.$ac_ext >&5'
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36051,14 +36134,14 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
--
+ 
 -int
 -main ()
 -{
 -#ifndef _BIG_ENDIAN
 -		 not big endian
 -		#endif
--
+ 
 -  ;
 -  return 0;
 -}
@@ -36066,31 +36149,13 @@
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+      rm -f conftest2.*
-+      if { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } &&
-+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36100,39 +36165,58 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_bigendian=yes
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; };
-+      then
-+	# cc works too.
-+	:
-+      else
-+	# cc exists but doesn't like -o.
-+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+      fi
-+    fi
-+  fi
++case "$host_os" in
++	*irix*)
++		# On IRIX, we prefer Freeware or Nekoware Perl, because the
++		# system perl is so ancient.
++		# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  case $PERL in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -	ac_cv_c_bigendian=no
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
++  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
++  ;;
++esac
  fi
-+rm -f core conftest*
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
  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; }
- 
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
- 
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -36146,34 +36230,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+      BROKEN_CC=
-+else
-+      BROKEN_CC=#
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
-+$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
-+if test "${samba_cv_HAVE_Werror+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+	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.  */
+-/* end confdefs.h.  */
 -short int ascii_mm[] =
 -		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 -		short int ascii_ii[] =
@@ -36197,11 +36254,7 @@
 -  ;
 -  return 0;
 -}
-+  int main(void)
-+  {
-+  	return 0;
-+  }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36231,39 +36284,47 @@
 -		ac_cv_c_bigendian=unknown
 -	      fi
 -	    fi
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror=yes
++		;;
++	*)
++		# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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
+-
++  case $PERL in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
- 
++  ;;
++esac
  fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $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
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -36275,6 +36336,9 @@
 -int
 -main ()
 -{
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -	     /* Are we little or big endian?  From Harbison&Steele.  */
 -	     union
@@ -36304,7 +36368,8 @@
 -  { (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_try") 2>&5
@@ -36312,53 +36377,30 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_bigendian=no
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -w2";
-+	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_w2=cross
- 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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -( exit $ac_status )
 -ac_cv_c_bigendian=yes
-+  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
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
  
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
- 
+-
 -    fi
++if test x"$PERL" = x""; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
++$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
++	merged_build_possible=no
++else
++	if test x"$debug" = x"yes";then
++		PERL="$PERL -W"
++	fi
++	export PERL
++	true
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -36384,56 +36426,36 @@
 - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 -   { (exit 1); exit 1; }; } ;;
 - esac
-+{ $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
  
  
 -{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
 -$as_echo_n "checking whether char is unsigned... " >&6; }
 -if test "${ac_cv_c_char_unsigned+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+	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
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
+   $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.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -static int test_array [1 - 2 * !(((char) -1) < 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
-+   int main(void)
-+   {
-+	return 0;
-+   }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36453,19 +36475,40 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_char_unsigned=no
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_errwarn=yes
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -	ac_cv_c_char_unsigned=yes
-+  samba_cv_HAVE_errwarn=no
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++  { $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
-+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_char_unsigned" >&5
 -$as_echo "$ac_cv_c_char_unsigned" >&6; }
@@ -36473,55 +36516,57 @@
 -  cat >>confdefs.h <<\_ACEOF
 -#define __CHAR_UNSIGNED__ 1
 -_ACEOF
-+
-+	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_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+   Werror_FLAGS="-errwarn=%all"
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -qhalt" >&5
-+$as_echo_n "checking that the C compiler understands -qhalt... " >&6; }
-+if test "${samba_cv_HAVE_qhalt+set}" = set; then :
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
- 
+ fi
+-
+-
 -{ $as_echo "$as_me:$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
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -qhalt=w";
-+	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_qhalt=cross
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&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.  */
+-/* end confdefs.h.  */
 -#include <sys/types.h>
 -#include <signal.h>
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -int
 -main ()
@@ -36530,17 +36575,21 @@
 -  ;
 -  return 0;
 -}
-+   int main(void)
-+   {
-+	return 0;
-+   }
- _ACEOF
+-_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
++  if test "x$ac_ct_AR" = x; then
++    AR=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -36554,57 +36603,32 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_type_signal=int
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_qhalt=yes
++    AR=$ac_ct_AR
++  fi
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_signal=void
-+  samba_cv_HAVE_qhalt=no
- fi
+-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
++  AR="$ac_cv_prog_AR"
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 -$as_echo "$ac_cv_type_signal" >&6; }
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define RETSIGTYPE $ac_cv_type_signal
 -_ACEOF
-+	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_qhalt" >&5
-+$as_echo "$samba_cv_HAVE_qhalt" >&6; }
-+if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
-+   Werror_FLAGS="-qhalt=w"
-+fi
-+fi
-+fi
-+fi
  
 -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 -if test "${ac_cv_type_uid_t+set}" = set; then
-+############################################
-+# 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 "$as_me:${as_lineno-$LINENO}: checking if the linker used by compiler is GNU ld" >&5
++$as_echo_n "checking if the linker used by compiler is GNU ld... " >&6; }
++if test "${ac_cv_prog_gnu_ld+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -36614,101 +36638,130 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <sys/types.h>
- 
+-
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "uid_t" >/dev/null 2>&1; then
 -  ac_cv_type_uid_t=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; }
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $CC -Wl,-v /dev/null 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  ac_cv_prog_gnu_ld=yes
  else
 -  ac_cv_type_uid_t=no
--fi
++  ac_cv_prog_gnu_ld=no
+ fi
 -rm -f conftest*
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--fi
+-
+ fi
 -{ $as_echo "$as_me:$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
-+	#include <stdio.h>
-+	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-+	int main(void) {
-+		enum negative_values v1 = NEGATIVE_VALUE;
-+		unsigned v2 = NEGATIVE_VALUE;
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
++$as_echo "$ac_cv_prog_gnu_ld" >&6; }
  
 -cat >>confdefs.h <<\_ACEOF
 -#define uid_t int
 -_ACEOF
-+		if (v1 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v1);
-+			return 1;
-+		}
-+		if (v2 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v2);
-+			return 1;
-+		}
++
++if test "$ac_cv_prog_gnu_ld" = "yes"; then
++	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1`
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
++$as_echo_n "checking GNU ld release date... " >&6; }
++		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
++$as_echo "${ac_cv_gnu_ld_date}" >&6; }
++        if test -n "$ac_cv_gnu_ld_date"; then
++ 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
++ 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ 	fi
++	if test "$ac_cv_gnu_ld_date" -gt 20030101; then
++		ac_cv_gnu_ld_version_script=yes
++	fi
++        else
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
++$as_echo_n "checking GNU ld release version... " >&6; }
++                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' | sed -n 's,\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
++           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
++                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
++$as_echo_n "checking GNU ld release version major... " >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
++$as_echo_n "checking GNU ld release version minor... " >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
++           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
++             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++           fi
++           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++             ac_cv_gnu_ld_version_script=yes
++           fi
++        fi
++fi
  
-+		return 0;
-+	}
  
 -cat >>confdefs.h <<\_ACEOF
 -#define gid_t int
- _ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-+else
-+  samba_cv__CC_NEGATIVE_ENUM_VALUES=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
+-_ACEOF
  
++if test "x$CC" != xcc; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
-+$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
-+if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
-+$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
-+	PIDL_ARGS="$PIDL_ARGS --uint-enums"
-+fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
 -$as_echo_n "checking for mode_t... " >&6; }
 -if test "${ac_cv_type_mode_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++set dummy $CC; ac_cc=`$as_echo "$2" |
++		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_mode_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++
+ int
+ main ()
+ {
 -if (sizeof (mode_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   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
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) 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=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36722,40 +36775,33 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+saved_CFLAGS="$CFLAGS";
-+c99_init=no
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
-+$as_echo_n "checking for C99 designated initializers... " >&6; }
-+    CFLAGS="$saved_CFLAGS";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof ((mode_t)))
 -	  return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } &&
++   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36773,20 +36819,15 @@
 -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
- else
+-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; }
- 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: $ac_cv_type_mode_t" >&5
 -$as_echo "$ac_cv_type_mode_t" >&6; }
 -if test "x$ac_cv_type_mode_t" = x""yes; then
@@ -36810,36 +36851,38 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
-+$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -AC99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof (off_t))
 -       return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++then
++  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++  if test "x$CC" != xcc; then
++    # Test first that cc exists at all.
++    if { ac_try='cc -c conftest.$ac_ext >&5'
++  { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36853,45 +36896,35 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+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
-+else
-+  { $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
-+fi
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof ((off_t)))
 -	  return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++      rm -f conftest2.*
++      if { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) 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=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36901,71 +36934,94 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } &&
++	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++      then
++	# cc works too.
++	:
++      else
++	# cc exists but doesn't like -o.
++	eval ac_cv_prog_cc_${ac_cc}_c_o=no
++      fi
++    fi
++  fi
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_off_t=yes
--fi
--
++  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
++rm -f core conftest*
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_compile "$LINENO"; then :
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++$as_echo "yes" >&6; }
  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; }
+ 
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+ 
  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_type_off_t" >&5
 -$as_echo "$ac_cv_type_off_t" >&6; }
 -if test "x$ac_cv_type_off_t" = x""yes; then
 -  :
--else
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
++      BROKEN_CC=
+ else
 -
 -cat >>confdefs.h <<_ACEOF
 -#define off_t long int
 -_ACEOF
 -
--fi
--
++      BROKEN_CC=#
+ fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
 -$as_echo_n "checking for size_t... " >&6; }
 -if test "${ac_cv_type_size_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
++$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
++if test "${samba_cv_HAVE_Werror+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_size_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof (size_t))
 -       return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36989,35 +37045,17 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+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
-+else
-+  { $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
-+fi
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
-+$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -c99"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof ((size_t)))
 -	  return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37037,82 +37075,81 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+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
- else
+-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; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
  
 -	ac_cv_type_size_t=yes
-+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
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test x"$c99_init" = x"yes"; then
-+    saved_CFLAGS=""
-+
++	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
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    CFLAGS="$saved_CFLAGS"
-+    saved_CFLAGS=""
-+    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
-+fi
+-
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
- 
--fi
-+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; }
- 
++  int main(void)
++  {
++  	return 0;
++  }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Werror=yes
++else
++  samba_cv_HAVE_Werror=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: $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
-+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; }
  
 -cat >>confdefs.h <<_ACEOF
 -#define size_t unsigned int
 -_ACEOF
-+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; }
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
--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; }
- 
+ fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
 -$as_echo_n "checking for pid_t... " >&6; }
 -if test "${ac_cv_type_pid_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++{ $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
 -  ac_cv_type_pid_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -37153,7 +37190,22 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -w2";
++	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_w2=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -37163,27 +37215,18 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++  int main(void)
++  {
++  	return 0;
++  }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+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
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -37197,130 +37240,105 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_w2=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_pid_t=yes
--fi
-+DYNEXP=
-+
-+LDSHFLAGS_Z_DEFS=
-+
-+LDSHFLAGS_Z_NODEFS=
-+
-+
-+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"
-+
-+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"
-+
-+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"
++  samba_cv_HAVE_w2=no
 +fi
-+
-+#
-+# 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 USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
-+
-+		;;
-+      esac
-+      ;;
-+
-+#
-+# 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="
-+	  ;;
-+
-+#
-+# 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 _LARGE_FILES 1" >>confdefs.h
++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
-+      ;;
-+#
-+# 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*)
+-
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
-+$as_echo "#define SYSV 1" >>confdefs.h
+ 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
  
--fi
-+		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"
- 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 -$as_echo "$ac_cv_type_pid_t" >&6; }
 -if test "x$ac_cv_type_pid_t" = x""yes; then
 -  :
--else
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>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.  */
  
 -cat >>confdefs.h <<_ACEOF
 -#define pid_t int
--_ACEOF
-+						;;
-+					*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+						LDFLAGS="$LDFLAGS -lthread"
++   int main(void)
++   {
++	return 0;
++   }
+ _ACEOF
+-
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_errwarn=yes
++else
++  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
  
--fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
 -{ $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
--else
++	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_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++   Werror_FLAGS="-errwarn=%all"
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -37357,7 +37375,11 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -qhalt" >&5
++$as_echo_n "checking that the C compiler understands -qhalt... " >&6; }
++if test "${samba_cv_HAVE_qhalt+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37366,7 +37388,21 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -qhalt=w";
++	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_qhalt=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -37377,7 +37413,12 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++   int main(void)
++   {
++	return 0;
++   }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37397,25 +37438,41 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_qhalt=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++  samba_cv_HAVE_qhalt=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
-+						;;
-+				esac
-+			else
-+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+				LDFLAGS="$LDFLAGS -lthread"
- 
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_qhalt" >&5
++$as_echo "$samba_cv_HAVE_qhalt" >&6; }
++if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
++   Werror_FLAGS="-qhalt=w"
++fi
++fi
+ fi
+-
 -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
@@ -37423,92 +37480,99 @@
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_STAT_ST_RDEV 1
 -_ACEOF
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++############################################
++# 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;
++
++		if (v1 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v1);
++			return 1;
++		}
++		if (v2 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v2);
++			return 1;
++		}
  
-+			fi
-+			;;
-+		esac
-+		;;
-+#
-+# IRIX uses SYSV printing.  Make sure to set that here
-+#
-+	*irix*)
++		return 0;
++	}
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_ST_RDEV 1
--_ACEOF
-+$as_echo "#define SYSV 1" >>confdefs.h
+ _ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
++else
++  samba_cv__CC_NEGATIVE_ENUM_VALUES=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
-+		;;
-+	*freebsd*|*dragonfly*)
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
++$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
++if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
++$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
++	PIDL_ARGS="$PIDL_ARGS --uint-enums"
++fi
  
-+$as_echo "#define FREEBSD 1" >>confdefs.h
  
 -{ $as_echo "$as_me:$LINENO: checking for d_off in dirent" >&5
 -$as_echo_n "checking for d_off in dirent... " >&6; }
 -if test "${ac_cv_dirent_d_off+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+		;;
-+#
-+# 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.  */
  
- #include <unistd.h>
+-#include <unistd.h>
 -#include <sys/types.h>
 -#include <dirent.h>
--int
--main ()
--{
++saved_CFLAGS="$CFLAGS";
++c99_init=no
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
++$as_echo_n "checking for C99 designated initializers... " >&6; }
++    CFLAGS="$saved_CFLAGS";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
+ int
+ main ()
+ {
 -struct dirent d; d.d_off;
--  ;
--  return 0;
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
@@ -37530,34 +37594,30 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_dirent_d_off=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  SINIX_LFS_SUPPORT=yes
++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
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_dirent_d_off=no
-+  SINIX_LFS_SUPPORT=no
++  { $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
-+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:$LINENO: result: $ac_cv_dirent_d_off" >&5
 -$as_echo "$ac_cv_dirent_d_off" >&6; }
 -if test $ac_cv_dirent_d_off = yes; then
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_DIRENT_D_OFF 1
 -_ACEOF
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$SINIX_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
- 
+-
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
 -$as_echo_n "checking for ssize_t... " >&6; }
 -if test "${ac_cv_type_ssize_t+set}" = set; then
@@ -37569,17 +37629,26 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
++$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++    CFLAGS="$saved_CFLAGS -AC99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof (ssize_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37603,17 +37672,35 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++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
++else
++  { $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
++fi
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof ((ssize_t)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37636,79 +37723,68 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+          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
-+    ;;
- 
+-
 -	ac_cv_type_ssize_t=yes
 -fi
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++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
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
- 
--fi
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+-
+-
++  { $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
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 -$as_echo "$ac_cv_type_ssize_t" >&6; }
 -if test "x$ac_cv_type_ssize_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define ssize_t int
 -_ACEOF
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- 
+-
 -fi
-+	;;
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
 -$as_echo_n "checking for wchar_t... " >&6; }
 -if test "${ac_cv_type_wchar_t+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
 -  ac_cv_type_wchar_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
++    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof (wchar_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37732,18 +37808,35 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >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
++else
++  { $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
++fi
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
++$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
++    CFLAGS="$saved_CFLAGS -c99"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof ((wchar_t)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37766,84 +37859,55 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_wchar_t=yes
 -fi
-+#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;
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++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
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+       /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
-+
-+       if (libc_major < 2)
-+              exit(1);
-+       if (libc_minor < 2)
-+              exit(1);
-+#endif
- 
-+       /* Ensure this is kernel 2.4 or higher */
- 
--fi
-+       uname(&uts);
-+       release = strdup(uts.release);
-+       major = atoi(strsep(&release, "."));
-+       minor = atoi(strsep(&release, "."));
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+-
+-
++  { $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
+ 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
-+       if (major > 2 || (major == 2 && minor > 3))
-+               exit(0);
-+       exit(1);
-+#else
-+       exit(1);
-+#endif
-+}
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define wchar_t unsigned short
- _ACEOF
+-_ACEOF
 -
-+if ac_fn_c_try_run "$LINENO"; then :
-+  LINUX_LFS_SUPPORT=yes
-+else
-+  LINUX_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
+-fi
+-
  
-+	CPPFLAGS="$old_CPPFLAGS"
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- 
 -############################################
 -# for cups support we need libcups, and a handful of header files
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -# Check whether --enable-cups was given.
 -if test "${enable_cups+set}" = set; then
 -  enableval=$enable_cups;
--fi
++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 "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++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.
@@ -37872,7 +37936,7 @@
 -done
 -done
 -IFS=$as_save_IFS
- 
+-
 -  ;;
 -esac
 -fi
@@ -37880,36 +37944,36 @@
 -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
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++    CFLAGS="$saved_CFLAGS"
++    saved_CFLAGS=""
++    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
  
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+	;;
  
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+    *darwin*)
++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
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
- 
+-
 -		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; }
  
-+# Add a system specific charset module.
-+	default_shared_modules="$default_shared_modules charset_macosxfs"
- 
 -for ac_header in cups/cups.h cups/language.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37923,15 +37987,7 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&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
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -37940,20 +37996,10 @@
 -_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
 -#include <$ac_header>
-+
-+#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
@@ -37973,25 +38019,31 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=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
--
++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
-+  GLIBC_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
+-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; }
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++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
@@ -38008,7 +38060,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
@@ -38025,15 +38085,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -  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; }
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++DYNEXP=
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -38063,10 +38122,7 @@
 -## ---------------------------------------- ##
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-     ;;
+-    ;;
 -esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
@@ -38079,7 +38135,8 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
++LDSHFLAGS_Z_DEFS=
+ 
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
@@ -38087,66 +38144,146 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+    *qnx*)
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++LDSHFLAGS_Z_NODEFS=
  
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -done
-+        ;;
++default_static_modules=""
++default_static_modules="$default_static_modules pdb_smbpasswd"
++default_static_modules="$default_static_modules pdb_tdbsam"
++default_static_modules="$default_static_modules pdb_wbc_sam"
++default_static_modules="$default_static_modules rpc_lsarpc"
++default_static_modules="$default_static_modules rpc_samr"
++default_static_modules="$default_static_modules rpc_winreg"
++default_static_modules="$default_static_modules rpc_initshutdown"
++default_static_modules="$default_static_modules rpc_dssetup"
++default_static_modules="$default_static_modules rpc_wkssvc"
++default_static_modules="$default_static_modules rpc_svcctl"
++default_static_modules="$default_static_modules rpc_ntsvcs"
++default_static_modules="$default_static_modules rpc_netlogon"
++default_static_modules="$default_static_modules rpc_netdfs"
++default_static_modules="$default_static_modules rpc_srvsvc"
++default_static_modules="$default_static_modules rpc_spoolss"
++default_static_modules="$default_static_modules rpc_eventlog"
++default_static_modules="$default_static_modules auth_sam"
++default_static_modules="$default_static_modules auth_unix"
++default_static_modules="$default_static_modules auth_winbind"
++default_static_modules="$default_static_modules auth_wbc"
++default_static_modules="$default_static_modules auth_server"
++default_static_modules="$default_static_modules auth_domain"
++default_static_modules="$default_static_modules auth_builtin"
++default_static_modules="$default_static_modules auth_netlogond"
++default_static_modules="$default_static_modules vfs_default"
++default_static_modules="$default_static_modules nss_info_template"
  
 -		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
 -		        x"$ac_cv_header_cups_language_h" = xyes; then
-+esac
++default_shared_modules=""
++default_shared_modules="$default_shared_modules vfs_recycle"
++default_shared_modules="$default_shared_modules vfs_audit"
++default_shared_modules="$default_shared_modules vfs_extd_audit"
++default_shared_modules="$default_shared_modules vfs_full_audit"
++default_shared_modules="$default_shared_modules vfs_netatalk"
++default_shared_modules="$default_shared_modules vfs_fake_perms"
++default_shared_modules="$default_shared_modules vfs_default_quota"
++default_shared_modules="$default_shared_modules vfs_readonly"
++default_shared_modules="$default_shared_modules vfs_cap"
++default_shared_modules="$default_shared_modules vfs_expand_msdfs"
++default_shared_modules="$default_shared_modules vfs_shadow_copy"
++default_shared_modules="$default_shared_modules vfs_shadow_copy2"
++default_shared_modules="$default_shared_modules charset_CP850"
++default_shared_modules="$default_shared_modules charset_CP437"
++default_shared_modules="$default_shared_modules auth_script"
++default_shared_modules="$default_shared_modules vfs_readahead"
++default_shared_modules="$default_shared_modules vfs_xattr_tdb"
++default_shared_modules="$default_shared_modules vfs_streams_xattr"
++default_shared_modules="$default_shared_modules vfs_streams_depot"
++default_shared_modules="$default_shared_modules vfs_acl_xattr"
++default_shared_modules="$default_shared_modules vfs_acl_tdb"
++default_shared_modules="$default_shared_modules vfs_smb_traffic_analyzer"
++default_shared_modules="$default_shared_modules vfs_preopen"
++default_shared_modules="$default_shared_modules vfs_catia"
++default_shared_modules="$default_shared_modules vfs_scannedonly"
++default_shared_modules="$default_shared_modules vfs_crossrename"
++default_shared_modules="$default_shared_modules vfs_linux_xfs_sgid"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
++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
++#
++# 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)
  
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
  
-+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"
++		;;
++      esac
++      ;;
  
 -ac_check_lib_ext_save_LIBS=$LIBS
 -LIBS="-lcups $PRINT_LIBS  $LIBS"
-+		break;
-+	fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
-+fi
++#
++# 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="
++	  ;;
  
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
++#
++# 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 _LARGE_FILES 1" >>confdefs.h
  
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
++      ;;
++#
++# 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 "$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
+-  $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 <signal.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
@@ -38155,15 +38292,14 @@
 -extern "C"
 -#endif
 -char httpConnectEncrypt ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -return httpConnectEncrypt ();
-+return *(signal (0, 0)) (0) == 1;
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -38187,58 +38323,62 @@
 -       }; then
 -  ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
 -		  ac_cv_lib_ext_cups=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_type_signal=int
- 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
-+  ac_cv_type_signal=void
- fi
--
+-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
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
+-_ACEOF
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -fi
  
 -LIBS=$ac_check_lib_ext_save_LIBS
-+{ $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 :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
++$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
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "uid_t" >/dev/null 2>&1; then :
-+  ac_cv_type_uid_t=yes
-+else
-+  ac_cv_type_uid_t=no
-+fi
-+rm -f conftest*
+-_ACEOF
++						;;
++				esac
++			else
++				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++				LDFLAGS="$LDFLAGS -lthread"
  
 -		case "$PRINT_LIBS" in
 -		    *-lcups*)
@@ -38247,14 +38387,11 @@
 -			PRINT_LIBS="-lcups $PRINT_LIBS"
 -			;;
 -		esac
-+fi
-+{ $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
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
-+$as_echo "#define uid_t int" >>confdefs.h
  
 -fi
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -		else
 -			{ $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
@@ -38263,48 +38400,63 @@
 -			LDFLAGS=$ac_save_LDFLAGS
 -			PRINT_LIBS=$ac_save_PRINT_LIBS
 -		fi
-+$as_echo "#define gid_t int" >>confdefs.h
++			fi
++			;;
++		esac
++		;;
++#
++# IRIX uses SYSV printing.  Make sure to set that here
++#
++	*irix*)
  
 -	elif test x"$enable_cups" = x"yes"; then
 -		{ { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&5
 -$as_echo "$as_me: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&2;}
 -   { (exit 1); exit 1; }; }
 -        fi
- fi
+-fi
++$as_echo "#define SYSV 1" >>confdefs.h
  
 -# Check whether --enable-iprint was given.
 -if test "${enable_iprint+set}" = set; then
 -  enableval=$enable_iprint;
-+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 :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
-+_ACEOF
-+
- fi
+-fi
++		;;
++	*freebsd*|*dragonfly*)
  
-+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 :
++$as_echo "#define FREEBSD 1" >>confdefs.h
  
 -if test x$enable_iprint != xno; then
 -	if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+else
++		;;
++#
++# 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"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_IPRINT 1
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
- _ACEOF
+-_ACEOF
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
  
 -	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
+-fi
++		;;
++    esac
++    case "$CPPFLAGS" in
++	  *-D_SYSV*|*-D_SVID_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_SYSV"
  
 -############################################
 -# check if the compiler will optimize out function calls
@@ -38312,41 +38464,53 @@
 -$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
-+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
+-else
++$as_echo "#define _SYSV 1" >>confdefs.h
  
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end 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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
 -#include <stdio.h>
 -int
 -main ()
 -{
-+fi
- 
+-
 -		if (0) {
 -		   this_function_does_not_exist();
 -		} else {
 -		  return 1;
 -		}
-+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 :
- 
-+else
- 
+-
+-
 -  ;
 -  return 0;
--}
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -38370,33 +38534,34 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  samba_cv_optimize_out_funcation_calls=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  SINIX_LFS_SUPPORT=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	samba_cv_optimize_out_funcation_calls=no
++  SINIX_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
 -{ $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
-+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 :
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
- _ACEOF
+-_ACEOF
  
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
- fi
+-fi
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$SINIX_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
  
 -#############################################
 -# check for fd passing struct via msg_control
@@ -38404,20 +38569,23 @@
 -$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
-+
-+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
+-else
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++          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
++    ;;
  
 -#include <sys/types.h>
 -#include <stdlib.h>
@@ -38427,7 +38595,10 @@
 -int
 -main ()
 -{
-+fi
++# Systems with LFS support.
++#
++    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
 -	struct msghdr msg;
 -	union {
@@ -38436,8 +38607,7 @@
 -	} control_un;
 -	msg.msg_control = control_un.control;
 -	msg.msg_controllen = sizeof(control_un.control);
-+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 :
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -  ;
 -  return 0;
@@ -38462,45 +38632,43 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_control=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	samba_cv_msghdr_msg_control=no
 -fi
-+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
-+_ACEOF
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_CONTROL 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
+-_ACEOF
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
- fi
+-fi
++	;;
  
 -#############################################
 -# check for fd passing struct via msg_acctrights
 -{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_acctrights" >&5
 -$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
 -if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-+$as_echo_n "checking for working memcmp... " >&6; }
-+if test "${ac_cv_func_memcmp_working+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $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
 -
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -38508,54 +38676,39 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_memcmp_working=no
-+else
 +  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>
-+$ac_includes_default
- int
- main ()
- {
+-int
+-main ()
+-{
++main() {
++#if _LFS64_LARGEFILE == 1
++       struct utsname uts;
++       char *release;
++       int major, minor;
  
 -	struct msghdr msg;
 -	int fd;
 -	msg.msg_acctrights = (caddr_t) &fd;
 -	msg.msg_acctrightslen = sizeof(fd);
-+  /* Some versions of memcmp are not 8-bit clean.  */
-+  char c0 = '\100', c1 = '\200', c2 = '\201';
-+  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+    return 1;
-+
-+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+     or more and with at least one buffer not starting on a 4-byte boundary.
-+     William Lewis provided this test program.   */
-+  {
-+    char foo[21];
-+    char bar[21];
-+    int i;
-+    for (i = 0; i < 4; i++)
-+      {
-+	char *a = foo + i;
-+	char *b = bar + i;
-+	strcpy (a, "--------01111111");
-+	strcpy (b, "--------10000000");
-+	if (memcmp (a, b, 16) >= 0)
-+	  return 1;
-+      }
-+    return 0;
-+  }
++       /* 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
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38575,62 +38728,53 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_acctrights=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_memcmp_working=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_func_memcmp_working=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
++       if (libc_major < 2)
++              exit(1);
++       if (libc_minor < 2)
++              exit(1);
++#endif
  
 -	samba_cv_msghdr_msg_acctrights=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-+$as_echo "$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+  *" memcmp.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
-+esac
-+
-+
-+
-+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
+-fi
++       /* Ensure this is kernel 2.4 or higher */
  
 -rm -f core conftest.err conftest.$ac_objext 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
-+done
-+
++       uname(&uts);
++       release = strdup(uts.release);
++       major = atoi(strsep(&release, "."));
++       minor = atoi(strsep(&release, "."));
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
-+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
+-_ACEOF
++       if (major > 2 || (major == 2 && minor > 3))
++               exit(0);
++       exit(1);
++#else
++       exit(1);
++#endif
++}
  
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  LINUX_LFS_SUPPORT=yes
++else
++  LINUX_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
  
-+done
++	CPPFLAGS="$old_CPPFLAGS"
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
 -for ac_func in dirfd
 -do
@@ -38642,34 +38786,26 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+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
+-_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 _LARGEFILE64_SOURCE 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
-+done
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -#undef $ac_func
  
@@ -38686,9 +38822,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+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"
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -int
 -main ()
@@ -38720,18 +38854,26 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=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"
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++	;;
  
 -	eval "$as_ac_var=no"
 -fi
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++    *darwin*)
  
 -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
@@ -38742,6 +38884,7 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
  
 -fi
 -done
@@ -38749,38 +38892,41 @@
 -if test x"$ac_cv_func_dirfd" = x"yes"; then
 -	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
 -fi
++# Add a system specific charset module.
++	default_shared_modules="$default_shared_modules charset_macosxfs"
  
 -{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
 -$as_echo_n "checking for struct sigevent type... " >&6; }
 -if test "${samba_cv_struct_sigevent+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+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"
-+
++	;;
++    *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
-+   ac_config_commands="$ac_config_commands mk-stdbool.h"
- 
+-
 -    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/types.h>
 -#if STDC_HEADERS
 -#include <stdlib.h>
 -#include <stddef.h>
-+fi
-+
-+
-+
-+
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
  #endif
 -#include <signal.h>
 -int
@@ -38789,8 +38935,8 @@
 -struct sigevent s;
 -  ;
 -  return 0;
--}
--_ACEOF
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38810,31 +38956,19 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_struct_sigevent=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
- 
+-
 -	samba_cv_struct_sigevent=no
-+"
-+if test "x$ac_cv_type_bool" = x""yes; then :
-+
-+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
-+
++  GLIBC_LFS_SUPPORT=no
  fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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
-+
++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_struct_sigevent" >&5
 -$as_echo "$samba_cv_struct_sigevent" >&6; }
@@ -38843,15 +38977,15 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_SIGEVENT 1
 -_ACEOF
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$GLIBC_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
  
 -   { $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; }
 -if test "${ac_cv_member_struct_sigevent_sigev_value_sival_ptr+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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -38859,6 +38993,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <signal.h>
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -int
 -main ()
@@ -38889,21 +39024,19 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_MMAP=cross
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <signal.h>
--
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+ 
 -int
 -main ()
 -{
@@ -38913,8 +39046,7 @@
 -  ;
 -  return 0;
 -}
-+#include "$libreplacedir/test/shared_mmap.c"
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38934,47 +39066,51 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_MMAP=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++        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"
+ 
 -	ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
-+  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
+-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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
++        ;;
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&5
 -$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&6; }
 -if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then
++esac
++
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
  
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
 -_ACEOF
  
-+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
++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"
  
++		break;
++	fi
++done
++if test x"$libreplacedir" = "x"; then
++	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
  fi
 -{ $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sigval_ptr" >&5
 -$as_echo_n "checking for struct sigevent.sigev_value.sigval_ptr... " >&6; }
@@ -38983,18 +39119,7 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.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"
-+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
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -39009,19 +39134,7 @@
 -  ;
 -  return 0;
 -}
-+fi
-+
-+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
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39044,22 +39157,11 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++LIBREPLACEOBJ="$libreplacedir/replace.o"
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.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
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -39074,29 +39176,7 @@
 -  ;
 -  return 0;
 -}
-+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 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
@@ -39116,106 +39196,69 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
--else
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
++
++{ $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 :
++  $as_echo_n "(cached) " >&6
+ 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.  */
++#include <sys/types.h>
  
 -	ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "uid_t" >/dev/null 2>&1; then :
++  ac_cv_type_uid_t=yes
++else
++  ac_cv_type_uid_t=no
  fi
++rm -f conftest*
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+
-+
-+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
-+
  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
++{ $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
+-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
-+done
++$as_echo "#define uid_t int" >>confdefs.h
  
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+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
+-_ACEOF
  
-+fi
-+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
++$as_echo "#define gid_t int" >>confdefs.h
  
  fi
-+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_func" | $as_tr_cpp` 1
-+_ACEOF
  
- fi
-+done
+-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 "$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
+-  $as_echo_n "(cached) " >&6
  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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
+-/* end confdefs.h.  */
+ 
 -#include <sys/types.h>
 -#if STDC_HEADERS
 -#include <stdlib.h>
@@ -39231,17 +39274,19 @@
 -#  include <time.h>
 -# endif
 -#endif
--
-+#include <unistd.h>
- int
- main ()
- {
++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 ()
+-{
 -struct timespec ts;
-+int i = (int)setresuid
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39261,65 +39306,59 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_struct_timespec=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresuid_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	samba_cv_struct_timespec=no
-+  ac_cv_have_setresuid_decl=no
+-fi
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
++_ACEOF
+ 
+-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_struct_timespec" >&5
 -$as_echo "$samba_cv_struct_timespec" >&6; }
 -if test x"$samba_cv_struct_timespec" = x"yes"; then
-+{ $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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_TIMESPEC 1
--_ACEOF
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++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 size_t unsigned int
+ _ACEOF
  
--fi
-+ fi
+ fi
  
 -# and glibc has setresuid under linux but the function does
 -# nothing until kernel 2.1.44! very dumb.
 -{ $as_echo "$as_me:$LINENO: checking for real setresuid" >&5
 -$as_echo_n "checking for real setresuid... " >&6; }
 -if test "${samba_cv_have_setresuid+set}" = set; then
-+
-+ { $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
+-  $as_echo_n "(cached) " >&6
+-else
++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
--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.  */
 -#include <errno.h>
 -main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
-+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresgid
-+  ;
-+  return 0;
-+}
++
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -39344,70 +39383,72 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  samba_cv_have_setresuid=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresgid_decl=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
--
+ 
 -( exit $ac_status )
 -samba_cv_have_setresuid=no
-+  ac_cv_have_setresgid_decl=no
- fi
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core 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
++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 :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_RDEV 1
++_ACEOF
++
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
  
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
 -$as_echo "$samba_cv_have_setresuid" >&6; }
 -if test x"$samba_cv_have_setresuid" = x"yes"; then
--
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESUID 1
--_ACEOF
-+ fi
++
++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 ino_t unsigned
+ _ACEOF
  
--fi
+ fi
  
 -# Do the same check for setresguid...
 -#
 -{ $as_echo "$as_me:$LINENO: checking for real setresgid" >&5
 -$as_echo_n "checking for real setresgid... " >&6; }
 -if test "${samba_cv_have_setresgid+set}" = set; then
-+ { $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
+-  $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
--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.  */
 -#include <unistd.h>
- #include <errno.h>
+-#include <errno.h>
 -main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
-+int
-+main ()
-+{
-+int i = (int)errno
-+  ;
-+  return 0;
-+}
++
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -39432,52 +39473,46 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  samba_cv_have_setresgid=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_errno_decl=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
--
+ 
 -( exit $ac_status )
 -samba_cv_have_setresgid=no
-+  ac_cv_have_errno_decl=no
- fi
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core 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
++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
 -{ $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
--_ACEOF
-+ fi
++cat >>confdefs.h <<_ACEOF
++#define offset_t loff_t
+ _ACEOF
  
--fi
+ fi
  
 -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
--$as_echo_n "checking for working memcmp... " >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+ $as_echo_n "checking for working memcmp... " >&6; }
 -if test "${ac_cv_func_memcmp_working+set}" = set; then
-+{ $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 :
++if test "${ac_cv_func_memcmp_working+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  if test "$cross_compiling" = yes; then
--  ac_cv_func_memcmp_working=no
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=cross
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_memcmp_working=no
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -39486,50 +39521,10 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--
--  /* Some versions of memcmp are not 8-bit clean.  */
--  char c0 = '\100', c1 = '\200', c2 = '\201';
--  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
--    return 1;
--
--  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
--     or more and with at least one buffer not starting on a 4-byte boundary.
--     William Lewis provided this test program.   */
--  {
--    char foo[21];
--    char bar[21];
--    int i;
--    for (i = 0; i < 4; i++)
--      {
--	char *a = foo + i;
--	char *b = bar + i;
--	strcpy (a, "--------01111111");
--	strcpy (b, "--------10000000");
--	if (memcmp (a, b, 16) >= 0)
--	  return 1;
--      }
--    return 0;
--  }
--
--  ;
--  return 0;
-+#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);
+ $ac_includes_default
+ int
+@@ -38404,44 +8515,17 @@
+   return 0;
  }
  _ACEOF
 -rm -f conftest$ac_exeext
@@ -39554,9 +39549,8 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_memcmp_working=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
+   ac_cv_func_memcmp_working=yes
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
@@ -39564,7 +39558,7 @@
 -
 -( exit $ac_status )
 -ac_cv_func_memcmp_working=no
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=no
++  ac_cv_func_memcmp_working=no
  fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -39575,26 +39569,32 @@
 -
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--$as_echo "$ac_cv_func_memcmp_working" >&6; }
--test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
--  *" memcmp.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-- ;;
--esac
--
--
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+ $as_echo "$ac_cv_func_memcmp_working" >&6; }
+ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+   *" memcmp.$ac_objext "* ) ;;
+@@ -38451,166 +8535,154 @@
+ 
+ 
+ 
 -###############################################
 -# Readline included by default unless explicitly asked not to
 -test "${with_readline+set}" != "set" && with_readline=yes
-+{ $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
++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; }
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
++fi
++done
  
 -# Check whether --with-readline was given.
 -if test "${with_readline+set}" = set; then
@@ -39602,9 +39602,8 @@
 -  yes)
 -    { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
-+fi
  
-+for ac_header in stdio.h strings.h
++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"
@@ -39613,11 +39612,21 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
  
 +done
  
++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
+ 
 -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`
@@ -39626,14 +39635,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
+ 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_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
++
++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"
++
  else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
@@ -39646,12 +39660,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39671,21 +39680,30 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+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
++   ac_config_commands="$ac_config_commands mk-stdint.h"
++
++
++fi
++
++
++
++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
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++   ac_config_commands="$ac_config_commands mk-stdbool.h"
++
+ 
 -	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; }
--
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39694,10 +39712,49 @@
 -_ACEOF
 -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
++#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_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
++
++
++{ $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>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
++#include "$libreplacedir/test/shared_mmap.c"
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -39717,21 +39774,28 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+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
++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
-+  ac_have_decl=0
  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: )
@@ -39766,44 +39830,54 @@
 -$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
-+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
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+  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; }
++
++
++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
+ 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 HAVE_DECL_VASPRINTF $ac_have_decl
-+_ACEOF
 +
-+for ac_func in snprintf vsnprintf asprintf vasprintf
++done
++
++for ac_header in sys/time.h time.h
 +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
++  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
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
+@@ -38619,149 +8691,285 @@
  
- fi
--
  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
  
 -for ac_header in readline/history.h
 -do
@@ -39812,28 +39886,137 @@
 -  { $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 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
+-  $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; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++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
 -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 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 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
++
++fi
++
++done
++
++
++for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror strerror_r
++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 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
++
++fi
++done
++
++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
++
++fi
++done
++
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2 dprintf vdprintf
++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 isatty chown lchown link readlink symlink realpath fdatasync
++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 get_current_dir_name
++do :
++  ac_fn_c_check_func "$LINENO" "get_current_dir_name" "ac_cv_func_get_current_dir_name"
++if test "x$ac_cv_func_get_current_dir_name" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GET_CURRENT_DIR_NAME 1
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39853,47 +40036,108 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_C99_VSNPRINTF=cross
- else
+-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
-+#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;
+ 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
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    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
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+       va_start(ap, format);
-+       len = vsnprintf(buf, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(1);
++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
  
 -# 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
++$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
 -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_setresgid_decl=yes
++else
++  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
++
++ 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 :
++  $as_echo_n "(cached) " >&6
++else
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++#include <errno.h>
++int
++main ()
++{
++int i = (int)errno
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39912,25 +40156,69 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_errno_decl=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+       va_start(ap, format);
-+       len = vsnprintf(0, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(2);
++  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
++
++
++{ $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
++fi
  
 -  ac_header_preproc=no
--fi
-+       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
+ 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; }
-+       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);
++$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
@@ -39966,44 +40254,49 @@
 -$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
-+       exit(0);
-+}
-+main() { foo("hello"); }
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_C99_VSNPRINTF=yes
- else
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+  libreplace_cv_HAVE_C99_VSNPRINTF=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_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
++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
+@@ -38770,797 +8978,575 @@
  
- fi
-+{ $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
+ done
  
--done
--
-+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
++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
  
++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
++else
++  ac_have_decl=0
 +fi
  
- 
+-
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40011,38 +40304,53 @@
 -  { $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 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
--fi
+-  $as_echo_n "(cached) " >&6
++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
 -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; }
++
++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
 -  # 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
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
+ _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
 -#include <$ac_header>
-+#include <stdarg.h>
-+va_list ap1,ap2;
-+int
-+main ()
-+{
-+va_copy(ap1,ap2);
-+  ;
-+  return 0;
-+}
++
++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
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -40063,34 +40371,17 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  libreplace_cv_HAVE_VA_COPY=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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
-+
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
  
 -	ac_header_compiler=no
  fi
++done
  
 -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"$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
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40100,18 +40391,51 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++{ $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
++else
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_C99_VSNPRINTF=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <$ac_header>
++
++#include <sys/types.h>
++#include <stdio.h>
 +#include <stdarg.h>
-+va_list ap1,ap2;
-+int
-+main ()
-+{
-+__va_copy(ap1,ap2);
-+  ;
-+  return 0;
++#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);
 +}
++main() { foo("hello"); }
++
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -40131,20 +40455,28 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  libreplace_cv_HAVE___VA_COPY=yes
++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
-+  libreplace_cv_HAVE___VA_COPY=no
  fi
--
++{ $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; }
--
++$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
 -  yes:no: )
@@ -40178,21 +40510,45 @@
 -{ $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
++fi
++
++
++{ $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
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdarg.h>
++va_list ap1,ap2;
++int
++main ()
++{
++va_copy(ap1,ap2);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  libreplace_cv_HAVE_VA_COPY=yes
++else
++  libreplace_cv_HAVE_VA_COPY=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; }
-+{ $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
++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
 +
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -40201,16 +40557,16 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+fi
  
 -      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 "$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 :
++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
@@ -40231,12 +40587,13 @@
 -char tgetent ();
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <stdio.h>
++#include <stdarg.h>
++va_list ap1,ap2;
  int
  main ()
  {
 -return tgetent ();
-+printf("%s\n", __FUNCTION__);
++__va_copy(ap1,ap2);
    ;
    return 0;
  }
@@ -40263,20 +40620,28 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_Lib=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_FUNCTION_MACRO=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"
--fi
--
++  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
++
++$as_echo "#define HAVE___VA_COPY 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
-+  libreplace_cv_HAVE_FUNCTION_MACRO=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
 -		 $as_echo "$as_val"'`
@@ -40286,22 +40651,15 @@
 -		 $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
  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
  
 -      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_FUNCTION_MACRO 1" >>confdefs.h
-+
-+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 __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
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40320,14 +40678,14 @@
 -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 <stdio.h>
  int
  main ()
  {
 -return rl_callback_handler_install ();
-+printf("%s\n", __func__);
++printf("%s\n", __FUNCTION__);
    ;
    return 0;
  }
@@ -40355,13 +40713,13 @@
 -       }; then
 -  ac_cv_lib_readline_rl_callback_handler_install=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_func_MACRO=yes
++  libreplace_cv_HAVE_FUNCTION_MACRO=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_readline_rl_callback_handler_install=no
-+  libreplace_cv_HAVE_func_MACRO=no
++  libreplace_cv_HAVE_FUNCTION_MACRO=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -40374,21 +40732,51 @@
 -$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"
-+{ $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 "$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_LIBREADLINE 1
 -_ACEOF
-+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
  
 -       break
--else
+ else
 -  TERMLIBS=
-+    fi
++        { $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
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++printf("%s\n", __func__);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_HAVE_func_MACRO=yes
++else
++  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
++
 +for ac_header in sys/param.h limits.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40398,7 +40786,7 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
-+
+ 
  fi
  
  done
@@ -40499,7 +40887,11 @@
  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
++{ $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
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40510,7 +40902,19 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++$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
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40532,17 +40936,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
  fi
-+{ $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
++done
  
 -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_SETENV_DECL 1" >>confdefs.h
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40577,66 +40978,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_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
- 
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+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_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
--
- done
- 
- 
--for ac_header in readline/history.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 "$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
+-  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; }
- 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
-+
+ 
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
++/* end confdefs.h.  */
 +#include <unistd.h>
 +int
 +main ()
@@ -40645,132 +41000,26 @@
 +  ;
 +  return 0;
 +}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
++_ACEOF
 +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_header_compiler=no
++else
 +  ac_cv_have_environ_decl=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
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++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
- 
--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_ENVIRON_DECL 1" >>confdefs.h
- 
--# 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
- 
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
 +
++
 +for ac_func in strnlen
 +do :
 +  ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
@@ -40784,10 +41033,17 @@
 -
  done
  
--
--
--
--for ac_header in readline.h readline/readline.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
+ 
+-for ac_header in readline/history.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
@@ -40795,7 +41051,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
@@ -40812,14 +41068,15 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
++done
++
++
++for ac_func in memmem
 +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" "memmem" "ac_cv_func_memmem"
++if test "x$ac_cv_func_memmem" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_MEMMEM 1
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -40864,7 +41121,11 @@
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++
++#define eprintf(...) fprintf(stderr, __VA_ARGS__)
++eprintf("bla", "bar");
++
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40886,17 +41147,16 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
  
 -  ac_header_preproc=no
 -fi
-+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
-+eprintf("bla", "bar");
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
  
--rm -f conftest.err conftest.$ac_ext
++fi
+ rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40931,134 +41191,81 @@
 -{ $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
++
++{ $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
 -  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; }
-+$as_echo "#define HAVE__VA_ARGS__MACRO 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
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+rm -f conftest.err conftest.$ac_ext
- 
--      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
-+
-+{ $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_check_lib_save_LIBS=$LIBS
--LIBS="-l${termlib}  $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.  */
++/* 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"
 +#include <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
- #endif
--char tgetent ();
++#endif
 +#include <signal.h>
- int
- main ()
- {
--return tgetent ();
++int
++main ()
++{
 +sig_atomic_t i = 0
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_Lib=yes"
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_sig_atomic_t=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Lib=no"
++else
 +  libreplace_cv_sig_atomic_t=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_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Lib'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Lib'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  TERMLIBS="-l${termlib}"; break
++fi
 +{ $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
-+
+ 
+-done
+-
 +$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
-+
- 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
-+
++fi
+ 
+ 
+-for ac_header in readline.h readline/readline.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 "$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
+-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
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMLIBS $LIBS"
+-  # 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
@@ -41067,35 +41274,30 @@
 +
 +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"
+-$ac_includes_default
+-#include <$ac_header>
++
 +#include <unistd.h>
 +#ifdef HAVE_FCNTL_H
 +#include <fcntl.h>
- #endif
--char rl_callback_handler_install ();
- int
- main ()
- {
--return rl_callback_handler_install ();
++#endif
++int
++main ()
++{
 +int fd = open("/dev/null", O_DIRECT);
-   ;
-   return 0;
- }
++  ;
++  return 0;
++}
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -41104,161 +41306,129 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_lib_readline_rl_callback_handler_install=yes
--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
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
--$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
--if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
--  TERMLDFLAGS="-L$with_readline/lib"
--       TERMCPPFLAGS="-I$with_readline/include"
--       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
--       TERMLIBS="-lreadline $TERMLIBS"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBREADLINE 1
--_ACEOF
--
--       break
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
  else
--  TERMLIBS= CPPFLAGS=$_cppflags
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  libreplace_cv_HAVE_OPEN_O_DIRECT=no
- fi
--
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
 +{ $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
- 
--done
--
--
--    LDFLAGS=$_ldflags
--    ;;
--  esac
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++
 +$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
  
+-	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; }
  
--
--
--# 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 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
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMLIBS $LIBS"
+-# 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.  */
- 
--/* 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 rl_completion_matches ();
++{ $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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-#include <$ac_header>
 +#include <sys/types.h>
- int
- main ()
- {
--return rl_completion_matches ();
++int
++main ()
++{
 +volatile int i = 0
-   ;
-   return 0;
- }
++  ;
++  return 0;
++}
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-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_link") 2>conftest.er1
+-  (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); } && {
--	 test -z "$ac_c_werror_flag" ||
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$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_lib_readline_rl_completion_matches=yes
+-  ac_header_preproc=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_volatile=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_readline_rl_completion_matches=no
+-  ac_header_preproc=no
 +  libreplace_cv_volatile=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  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_volatile" >&5
 +$as_echo "$libreplace_cv_volatile" >&6; }
 +if test x"$libreplace_cv_volatile" = x"yes"; then
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
+-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_VOLATILE 1" >>confdefs.h
  
- fi
- 
--
--# 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
+-# 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
++fi
++
 +# filesys
 +ac_header_dirent=no
 +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -41268,90 +41438,54 @@
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  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; }
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <readline/readline.h>
++/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <$ac_hdr>
  
- int
- main ()
- {
--#ifndef rl_event_hook
--  (void) rl_event_hook;
--#endif
--
++int
++main ()
++{
 +if ((DIR *) 0)
 +return 0;
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_rl_event_hook=yes
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  eval "$as_ac_Header=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_rl_event_hook=no
++else
 +  eval "$as_ac_Header=no"
- fi
--
- 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
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 1
--_ACEOF
--
--
--else
 +fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +eval ac_res=\$$as_ac_Header
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 0
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
  
--
+-      for termlib in ncurses curses termcap terminfo termlib; do
+-       as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
 +ac_header_dirent=$ac_hdr; break
- fi
- 
--
--{ $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
++fi
++
 +done
 +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 +if test $ac_header_dirent = dirent.h; then
@@ -41361,7 +41495,7 @@
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMLIBS $LIBS"
+-LIBS="-l${termlib}  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -41372,16 +41506,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -39663,73 +9505,55 @@
+@@ -39569,72 +9555,55 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char history_list ();
+-char tgetent ();
 +char opendir ();
  int
  main ()
  {
--return history_list ();
+-return tgetent ();
 +return opendir ();
    ;
    return 0;
@@ -41408,12 +41542,12 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_readline_history_list=yes
+-  eval "$as_ac_Lib=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_readline_history_list=no
+-	eval "$as_ac_Lib=no"
 +for ac_lib in '' dir; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -41424,29 +41558,29 @@
 +  if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search_opendir=$ac_res
  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
 +  if test "${ac_cv_search_opendir+set}" = set; then :
 +  break
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
--$as_echo "$ac_cv_lib_readline_history_list" >&6; }
--if test "x$ac_cv_lib_readline_history_list" = x""yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_HISTORY_LIST 1
--_ACEOF
++fi
 +done
 +if test "${ac_cv_search_opendir+set}" = set; 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
 +else
 +  ac_cv_search_opendir=no
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  TERMLIBS="-l${termlib}"; break
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
  fi
@@ -41456,53 +41590,46 @@
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-      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
 +fi
- 
--###############################################
--# 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 library containing opendir" >&5
 +$as_echo_n "checking for library containing opendir... " >&6; }
 +if test "${ac_cv_search_opendir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   ac_func_search_save_LIBS=$LIBS
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++  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.
-@@ -39738,168 +9562,148 @@
+@@ -39643,591 +9612,461 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char yp_get_default_domain ();
+-char rl_callback_handler_install ();
 +char opendir ();
  int
  main ()
  {
--return yp_get_default_domain ();
+-return rl_callback_handler_install ();
 +return opendir ();
    ;
    return 0;
  }
  _ACEOF
--for ac_lib in '' nsl; do
-+for ac_lib in '' x; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-     ac_res=-l$ac_lib
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-   fi
--  rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41523,61 +41650,57 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_search_yp_get_default_domain=$ac_res
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
+-  ac_cv_lib_readline_rl_callback_handler_install=yes
++for ac_lib in '' x; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
 +  if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search_opendir=$ac_res
- 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
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then :
-   break
- fi
- done
--if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
--  :
++  break
++fi
++done
 +if test "${ac_cv_search_opendir+set}" = set; then :
 +
  else
--  ac_cv_search_yp_get_default_domain=no
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_search_opendir=no
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
--$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
--ac_res=$ac_cv_search_yp_get_default_domain
--if test "$ac_res" != no; then
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
 +$as_echo "$ac_cv_search_opendir" >&6; }
 +ac_res=$ac_cv_search_opendir
 +if test "$ac_res" != no; then :
-   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-	ac_cv_lib_readline_rl_callback_handler_install=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
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
+-  TERMLDFLAGS="-L$with_readline/lib"
+-       TERMCPPFLAGS="-I$with_readline/include"
+-       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
+-       TERMLIBS="-lreadline $TERMLIBS"
  
--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.  */
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBREADLINE 1
 +for ac_header in fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -41587,28 +41710,15 @@
 +  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.  */
-+fi
+-       break
+-else
+-  TERMLIBS= CPPFLAGS=$_cppflags
+ fi
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
 +done
- 
--#undef $ac_func
-+for ac_header in sys/acl.h acl/libacl.h
++
++for ac_header in sys/acl.h acl/libacl.h sys/file.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"
@@ -41617,25 +41727,18 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $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
-+
-+
+ fi
+ 
+ done
+ 
+ 
+-    LDFLAGS=$_ldflags
+-    ;;
+-  esac
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 +# select
 +for ac_header in sys/select.h
 +do :
@@ -41644,12 +41747,12 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_SELECT_H 1
 +_ACEOF
-+
-+fi
-+
+ 
+ fi
+ 
 +done
-+
-+
+ 
+ 
 +# time
 +for ac_header in sys/time.h utime.h
 +do :
@@ -41660,7 +41763,13 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
-+
+ 
+-# 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
 +fi
 +
 +done
@@ -41668,18 +41777,32 @@
 +{ $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 :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $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.  */
+ /* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <sys/time.h>
 +#include <time.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 rl_completion_matches ();
  int
  main ()
  {
--return $ac_func ();
+-return rl_completion_matches ();
 +if ((struct tm *) 0)
 +return 0;
    ;
@@ -41707,18 +41830,18 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_readline_rl_completion_matches=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_header_time=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_readline_rl_completion_matches=no
 +  ac_cv_header_time=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: $ac_cv_header_time" >&5
 +$as_echo "$ac_cv_header_time" >&6; }
 +if test $ac_cv_header_time = yes; then
@@ -41728,36 +41851,32 @@
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
  fi
--ac_res=`eval 'as_val=${'$as_ac_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_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
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NEW_LIBREADLINE 1
 +for ac_func in 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
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -39908,211 +9712,170 @@
- done
  
+ fi
++done
  
--# 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
+ 
+-# 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
 +# wait
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
@@ -41771,47 +41890,23 @@
 -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"
+-#include <readline/readline.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
 +#ifndef WEXITSTATUS
 +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #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
 +#ifndef WIFEXITED
 +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
++#endif
  
  int
  main ()
  {
--return $ac_func ();
+-#ifndef rl_event_hook
+-  (void) rl_event_hook;
+-#endif
+-
 +  int s;
 +  wait (&s);
 +  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
@@ -41819,15 +41914,15 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -41836,161 +41931,187 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_have_decl_rl_event_hook=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_header_sys_wait_h=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_have_decl_rl_event_hook=no
 +  ac_cv_header_sys_wait_h=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_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_header_sys_wait_h" >&5
 +$as_echo "$ac_cv_header_sys_wait_h" >&6; }
 +if test $ac_cv_header_sys_wait_h = yes; then
-+
-+$as_echo "#define HAVE_SYS_WAIT_H 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
--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 HAVE_DECL_RL_EVENT_HOOK 1
+-_ACEOF
++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 +
-+
++fi
+ 
+ 
+-else
 +# capability
 +for ac_header in sys/capability.h
 +do :
 +  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 :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_DECL_RL_EVENT_HOOK 0
 +#define HAVE_SYS_CAPABILITY_H 1
  _ACEOF
  
+-
  fi
--done
  
--if test x"$ac_cv_func_execl" = x"no"; then
--    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
--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
++
 +case "$host_os" in
 +*linux*)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
 +$as_echo_n "checking for broken RedHat 7.2 system header files... " >&6; }
 +if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $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.  */
+ /* 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 history_list ();
 +	#ifdef HAVE_SYS_VFS_H
 +	#include <sys/vfs.h>
 +	#endif
 +	#ifdef HAVE_SYS_CAPABILITY_H
 +	#include <sys/capability.h>
 +	#endif
- 
-+int
-+main ()
-+{
- 
++
+ int
+ main ()
+ {
+-return history_list ();
++
 +	int i;
- 
--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_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+  ;
-+  return 0;
-+}
++
+   ;
+   return 0;
+ }
  _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
+-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_lib_readline_history_list=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  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
+-	ac_cv_lib_readline_history_list=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
+-$as_echo "$ac_cv_lib_readline_history_list" >&6; }
+-if test "x$ac_cv_lib_readline_history_list" = x""yes; then
 +{ $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
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_HISTORY_LIST 1
+-_ACEOF
 +$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
  
--#undef $ac_func
-+fi
+ fi
  
+-
+-###############################################
+-# 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
++{ $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
+-  ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   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 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.  */
-+
+-char yp_get_default_domain ();
 +	#ifdef HAVE_SYS_CAPABILITY_H
 +	#include <sys/capability.h>
 +	#endif
 +	#include <linux/types.h>
- 
++
  int
  main ()
  {
--return $ac_func ();
+-return yp_get_default_domain ();
 +
 +	__s8 i;
 +
@@ -41998,7 +42119,14 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' nsl; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42019,7 +42147,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_search_yp_get_default_domain=$ac_res
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=no
  else
@@ -42033,10 +42161,9 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5
 +$as_echo "$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&6; }
 +if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
-+
+ 
 +$as_echo "#define BROKEN_RHEL5_SYS_CAP_HEADER 1" >>confdefs.h
  
--	eval "$as_ac_var=no"
  fi
 +;;
 +esac
@@ -42054,17 +42181,25 @@
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-  break
  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
+ done
+-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-  :
+-else
+-  ac_cv_search_yp_get_default_domain=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
+-$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
+-ac_res=$ac_cv_search_yp_get_default_domain
+-if test "$ac_res" != no; then
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 +
 +for ac_func in getpwnam_r getpwuid_r getpwent_r
 +do :
@@ -42072,14 +42207,15 @@
 +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
-@@ -40121,201 +9884,139 @@
- done
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
  
+ fi
++done
  
--for ac_func in strtol
+ 
+-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
@@ -42167,25 +42303,10 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=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
++fi
 +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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++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
@@ -42217,7 +42338,7 @@
 +
 +		}
 +
- _ACEOF
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
 +		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
@@ -42226,25 +42347,41 @@
 +
 +		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
  
+-	eval "$as_ac_var=no"
  fi
--done
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ 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: $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 :
  
+-fi
+-done
  
 +$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
  
--for ac_func in strchr chflags
+-# 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
-+
 +fi
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
@@ -42342,17 +42479,8 @@
 -	eval "$as_ac_var=no"
 +		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_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_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then :
-+
-+
-+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
-+
++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 \
@@ -42365,7 +42493,16 @@
 -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_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then :
 +
++
++$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
++
++
++fi
++
 +for ac_func in getgrnam_r getgrgid_r getgrent_r
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42375,22 +42512,58 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40324,252 +10025,221 @@
+@@ -40235,352 +10074,222 @@
+ fi
  done
  
+-if test x"$ac_cv_func_execl" = x"no"; then
+-    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+-fi
  
--
--
--
--for ac_func in getrlimit fsync fdatasync setpgid
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
++$as_echo_n "checking for getgrent_r declaration... " >&6; }
++if test "${ac_cv_have_getgrent_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 <grp.h>
+ 
++int
++main ()
++{
++int i = (int)getgrent_r
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_getgrent_r_decl=yes
++else
++  ac_cv_have_getgrent_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_getgrent_r_decl" >&5
++$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
++ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
+ 
++$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
+ 
++ fi
+ 
+-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 for getgrent_r declaration" >&5
-+$as_echo_n "checking for getgrent_r declaration... " >&6; }
-+if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
++{ $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 :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -42398,25 +42571,29 @@
 -_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.  */
--
++		$ac_includes_default
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++	#include <unistd.h>
++	#include <grp.h>
  
 -#undef $ac_func
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++		struct group *getgrent_r(struct group *src, char *buf, int buflen)
++		{
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -42431,17 +42608,20 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	#include <unistd.h>
-+	#include <grp.h>
++	#ifndef HAVE_GETGRENT_R_DECL
++	#error missing getgrent_r prototype
++	#endif
++	return NULL;
++
++		}
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return $ac_func ();
-+int i = (int)getgrent_r
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -42466,19 +42646,22 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_getgrent_r_decl=yes
++
++		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
++
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
-+  ac_cv_have_getgrent_r_decl=no
++		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
+ 
 -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"'`
@@ -42489,68 +42672,25 @@
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5
-+$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
+-_ACEOF
++{ $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 HAVE_GETGRENT_R_DECL 1" >>confdefs.h
 +
-+ fi
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
 +
-+{ $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 :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+		$ac_includes_default
-+
-+	#include <unistd.h>
-+	#include <grp.h>
-+
-+		struct group *getgrent_r(struct group *src, char *buf, int buflen)
-+		{
-+
-+	#ifndef HAVE_GETGRENT_R_DECL
-+	#error missing getgrent_r prototype
-+	#endif
-+	return NULL;
-+
-+		}
-+
- _ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
-+
-+else
-+
-+		ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
  
  fi
 -done
-+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
- 
- 
-+fi
- 
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-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
 -$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 prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
 +$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
 +if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
@@ -42646,8 +42786,17 @@
 -	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
++
+ 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 :
++
++
++$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 \
@@ -42660,16 +42809,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_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 :
 +
-+
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-+
-+
-+fi
-+
 +for ac_func in getgrouplist
 +do :
 +  ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
@@ -42683,6 +42823,17 @@
  done
  
  
+-
+-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
+-$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.  */
 +# locale
 +for ac_header in ctype.h locale.h langinfo.h
 +do :
@@ -42692,13 +42843,50 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 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
+-
+-/* 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
 +fi
  
+-#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
+-   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 :
@@ -42706,23 +42894,42 @@
 +if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_FNMATCH_H 1
-+_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
+-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
  
-+fi
+-	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
 +done
- 
--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
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
 +
++
 +# shmem
 +for ac_header in sys/ipc.h sys/mman.h sys/shm.h
 +do :
@@ -42732,20 +42939,17 @@
 +   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.  */
-+fi
++_ACEOF
 +
+ 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
 +
 +
@@ -42756,38 +42960,60 @@
 +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
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
  
--#undef $ac_func
-+
+ 
 +save_LIBS="$LIBS"
 +LIBS=""
-+
+ 
+-for ac_func in getrlimit fsync setpgid
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +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
+   $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_func_search_save_LIBS=$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.  */
+-
+-#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
-@@ -40577,106 +10247,85 @@
+@@ -40588,100 +10297,85 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -42831,11 +43057,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
--
--	eval "$as_ac_var=no"
 +for ac_lib in '' dl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -42845,7 +43066,7 @@
 +  fi
 +  if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search_dlopen=$ac_res
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if test "${ac_cv_search_dlopen+set}" = set; then :
@@ -42853,23 +43074,12 @@
 +fi
 +done
 +if test "${ac_cv_search_dlopen+set}" = set; then :
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+else
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_search_dlopen=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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
@@ -42879,10 +43089,13 @@
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-	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
++
 +for ac_header in dlfcn.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
@@ -42890,28 +43103,35 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_DLFCN_H 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
- 
++
 +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 initgroups select poll rdchk getgrnam getgrent pathconf
+-for ac_func in fdatasync
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -42950,7 +43170,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -40684,937 +10333,612 @@
+@@ -40689,846 +10383,612 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43061,10 +43281,10 @@
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
-+else
+ else
 +  libreplace_cv_shl=yes
- fi
- done
++fi
++done
  
  
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
@@ -43075,6 +43295,8 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS  $LIBS"
 +		$ac_includes_default
  
 +	#include <dlfcn.h>
@@ -43084,65 +43306,34 @@
  
 +	return 0;
  
-+		}
- 
--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
+-        { $as_echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
+-$as_echo_n "checking for fdatasync in -lrt... " >&6; }
+-if test "${ac_cv_lib_ext_rt_fdatasync+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
- _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
--
--/* 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 ac_fn_c_try_compile "$LINENO"; then :
++		}
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
- 
--#undef $ac_func
-+else
- 
 -/* 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
-+		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
- 
+-char fdatasync ();
 -int
 -main ()
 -{
--return $ac_func ();
+-return fdatasync ();
 -  ;
 -  return 0;
 -}
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -43164,44 +43355,61 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
--else
+-  ac_cv_lib_ext_rt_fdatasync=yes;
+-		  ac_cv_lib_ext_rt=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
++
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_ext_rt_fdatasync=no;
+-		  ac_cv_lib_ext_rt=no
++		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
- 
--	eval "$as_ac_var=no"
++
  fi
 +{ $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
-+
  
 -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:$LINENO: result: $ac_cv_lib_ext_rt_fdatasync" >&5
+-$as_echo "$ac_cv_lib_ext_rt_fdatasync" >&6; }
+-    if test $ac_cv_lib_ext_rt_fdatasync = yes; then
 -  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_FDATASYNC 1
 -_ACEOF
- 
++$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
 +
+ 
+ fi
+ 
+-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
 +if test x"${libreplace_cv_dlfcn}" = x"yes";then
 +	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
- fi
--done
++fi
  
+-		case "$LIBS" in
+-		    *-lrt*)
+-			;;
+-		    *)
+-			LIBS="-lrt $LIBS"
+-			;;
+-		esac
 +LIBDL="$LIBS"
  
 +LIBS="$save_LIBS"
@@ -43209,12 +43417,13 @@
 +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
+ fi
  
 +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
+-done
  
 +if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
  
@@ -43223,14 +43432,19 @@
  
 +$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
  
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
++else
+ 
+-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
 -$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"
++{ $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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -43246,17 +43460,12 @@
 -    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"
@@ -43321,34 +43530,49 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +CPPFLAGS="$SAVE_CPPFLAGS"
-+
-+fi
+ 
+-	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
-+
+ 
+-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_GETPASS 1" >>confdefs.h
 +
 +	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
-+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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ 
+ fi
+-done
+ 
 +{ $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
-+
+ 
 +	if test "$cross_compiling" = yes; then :
 +  libreplace_cv_STRPTIME_OK="assuming not"
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+
+ 
 +		#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
 +		#include "$libreplacedir/test/strptime.c"
-+
+ 
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_STRPTIME_OK=yes
@@ -43358,88 +43582,59 @@
 +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_STRPTIME_OK" >&5
 +$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
 +if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
  
--	eval "$as_ac_var=no"
--fi
 +$as_echo "#define REPLACE_STRPTIME 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/strptime.o"
- 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 :
-+  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
++fi
  
- fi
--done
--
--
--
--
- 
-+done
- 
- 
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-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
-+#######################################
-+# Check for mkdir mode
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
-+$as_echo_n "checking whether mkdir supports mode... " >&6; }
-+if test "${libreplace_cv_mkdir_has_mode+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_header in direct.h windows.h winsock2.h ws2tcpip.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
 -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
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++done
+ 
 -#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.  */
@@ -43453,6 +43648,15 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++#######################################
++# Check for mkdir mode
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
++$as_echo_n "checking whether mkdir supports mode... " >&6; }
++if test "${libreplace_cv_mkdir_has_mode+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
 +		#include <stdio.h>
 +		#ifdef HAVE_DIRECT_H
@@ -43567,7 +43771,8 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
 +$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
  
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+-
+-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
@@ -43666,13 +43871,12 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_have_dirfd_decl=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_ext
++  ac_cv_have_dirfd_decl=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -43681,15 +43885,24 @@
 -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
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-done
+-
+-
 +{ $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
-+
+ 
 +$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
-+
+ 
 + fi
-+
-+
+ 
+ 
 +#
 +# try to replace with getdirentries() if needed
 +#
@@ -43698,16 +43911,14 @@
 +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
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETDIRENTRIES 1
- _ACEOF
++_ACEOF
  
- fi
- done
++fi
++done
  
--
--for ac_func in getpwent_r
+-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
@@ -43802,10 +44013,8 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
+-fi
 +		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=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 \
@@ -43821,19 +44030,25 @@
 -  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_long_telldir_const_DIR_pdir_" >&5
 +$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
 +if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
-+
-+
+ 
+ 
 +$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
-+
  
- fi
--done
  
++fi
  
--for ac_func in getdents64
+ 
+-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
@@ -43949,6 +44164,8 @@
  
  fi
 -done
+-
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
 +$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
 +if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
@@ -43959,7 +44176,7 @@
  
 +fi
  
--for ac_func in setenv strcasecmp fcvt fcvtl
+-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
@@ -44102,25 +44319,11 @@
  fi
  done
  
--
--
--
--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 "$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
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++  $as_echo_n "(cached) " >&6
++else
 +
 +	if test "$cross_compiling" = yes; then :
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -44129,15 +44332,8 @@
 +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.  */
++/* end confdefs.h.  */
++
 +#define _LIBREPLACE_REPLACE_H
 +#error _donot_use_getdents_replacement_anymore
 +#include "$libreplacedir/repdir_getdents.c"
@@ -44152,79 +44348,30 @@
 +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
  
--/* 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"
 +$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
+-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
 +{ $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
@@ -44232,17 +44379,19 @@
 +$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
+ 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
- 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
 +
 +###############################################
 +# test for where we get crypt() from
@@ -44250,48 +44399,28 @@
 +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
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_CRYPT_H 1
- _ACEOF
++_ACEOF
  
- fi
--done
--
- 
-+done
- 
--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 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
--/* 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.  */
--
++fi
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++done
++
++{ $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
  
 -#undef $ac_func
 +ac_func_search_ext_save_LIBS=$LIBS
@@ -44301,7 +44430,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41622,100 +10946,25 @@
+@@ -41536,100 +10996,25 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44373,7 +44502,7 @@
 -done
 -
 -
--for ac_func in nanosleep
+-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
@@ -44412,7 +44541,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41723,1488 +10972,666 @@
+@@ -41637,1175 +11022,666 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44503,42 +44632,54 @@
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
- else
++else
 +  as_fn_error "Required function not found" "$LINENO" 5
-+fi
-+done
+ 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.  */
 +echo "LIBREPLACE_BROKEN_CHECKS: END"
- 
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS  $LIBS"
--
++
 +for ac_func in syslog
 +do :
 +  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 HAVE_SYSLOG 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
  
+-/* 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
 +  as_fn_error "Required function not found" "$LINENO" 5
 +fi
 +done
  
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
  
--        { $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_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.  */
+-#undef $ac_func
 +echo "LIBREPLACE_NETWORK_CHECKS: START"
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -44547,11 +44688,18 @@
 -#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
+ 
 -int
 -main ()
 -{
--return nanosleep ();
+-return $ac_func ();
 -  ;
 -  return 0;
 -}
@@ -44577,27 +44725,28 @@
 -	 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"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
  
--	ac_cv_lib_ext_rt_nanosleep=no;
--		  ac_cv_lib_ext_rt=no
+-	eval "$as_ac_var=no"
 -fi
-+$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
++LIBREPLACE_NETWORK_OBJS=""
++LIBREPLACE_NETWORK_LIBS=""
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
- 
 -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_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44605,38 +44754,25 @@
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define HAVE_NANOSLEEP 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
++
+ done
  
--LIBS=$ac_check_lib_ext_save_LIBS
-+done
- 
--if test $ac_cv_lib_ext_rt = yes; then
 +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_LIBRT 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_NETINET_IN_SYSTM_H 1
- _ACEOF
++_ACEOF
  
--		case "$LIBS" in
--		    *-lrt*)
--			;;
--		    *)
--			LIBS="-lrt $LIBS"
--			;;
--		esac
--
--
- fi
++fi
  
--fi
- done
++done
  
 +for ac_header in netinet/ip.h
 +do :
@@ -44649,7 +44785,7 @@
 +	#include <netinet/in_systm.h>
 +	#endif
  
--for ac_func in utimensat
+-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
@@ -44675,13 +44811,13 @@
 -    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
 +fi
  
@@ -44780,13 +44916,13 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_UIO_H 1
 +_ACEOF
- 
++
 +fi
  
 +done
  
  
--for ac_func in mlock munlock mlockall munlockall
+-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
@@ -44802,24 +44938,43 @@
 -_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.  */
++		$ac_includes_default
++		#if HAVE_SYS_SOCKET_H
++		# include <sys/socket.h>
++		#endif
++		#include <net/if.h>
++		int main(void) {return 0;}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_USABLE_NET_IF_H=yes
++else
++  libreplace_cv_USABLE_NET_IF_H=no
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
 -#undef $ac_func
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5
++$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
++if test x"$libreplace_cv_USABLE_NET_IF_H" = 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.  */
@@ -44833,22 +44988,31 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
++
++fi
++
++
++
++cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
++$as_echo_n "checking for socklen_t... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
--int
--main ()
--{
++$ac_includes_default
++#include <sys/socket.h>
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
-+		$ac_includes_default
-+		#if HAVE_SYS_SOCKET_H
-+		# include <sys/socket.h>
-+		#endif
-+		#include <net/if.h>
-+		int main(void) {return 0;}
++socklen_t foo;
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -44873,15 +45037,30 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_USABLE_NET_IF_H=yes
++  eval "ac_cv_type_$cv=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_USABLE_NET_IF_H=no
++  eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
++if test "x$ac_cv_type_socklen_t" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKLEN_T 1
++_ACEOF
++
  
 -	eval "$as_ac_var=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 \
@@ -44896,28 +45075,25 @@
 -   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_USABLE_NET_IF_H" >&5
-+$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
-+if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
++
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
+ _ACEOF
  
--fi
+ fi
 -done
-+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
  
-+fi
  
  
- 
--for ac_func in memalign posix_memalign hstrerror
+-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
-+cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
-+$as_echo_n "checking for socklen_t... " >&6; }
++cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
++$as_echo_n "checking for sa_family_t... " >&6; }
 +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -44965,7 +45141,7 @@
  main ()
  {
 -return $ac_func ();
-+socklen_t foo;
++sa_family_t foo;
    ;
    return 0;
  }
@@ -44997,30 +45173,15 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+	ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
-+if test "x$ac_cv_type_socklen_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKLEN_T 1
-+_ACEOF
-+
- 
+-
 -	eval "$as_ac_var=no"
++  eval "ac_cv_type_$cv=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"'`
@@ -45031,65 +45192,101 @@
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
++if test "x$ac_cv_type_sa_family_t" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++#define HAVE_SA_FAMILY_T 1
  _ACEOF
  
++
  fi
 -done
  
++fi
  
--for ac_header in sys/mman.h
+-for ac_func in nanosleep
 -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
-+
-+cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
-+$as_echo_n "checking for sa_family_t... " >&6; }
-+if { as_var=ac_cv_type_$cv; 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
+-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 <<_ACEOF
++#define $ac_tr_hdr 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.  */
++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
++cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
++$as_echo_n "checking for struct addrinfo... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+
- $ac_includes_default
--#include <$ac_header>
-+#include <sys/socket.h>
-+int
-+main ()
-+{
-+sa_family_t foo;
-+  ;
-+  return 0;
-+}
++/* end confdefs.h.  */
+ 
++$ac_includes_default
++#include <netdb.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++struct addrinfo foo;
+   ;
+   return 0;
+ }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -45098,142 +45295,70 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
+-       } && 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 :
 +  eval "ac_cv_type_$cv=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_header_compiler=no
+-	eval "$as_ac_var=no"
 +  eval "ac_cv_type_$cv=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; }
-+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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +ac_foo=`eval echo \\$ac_cv_type_$cv`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
 +$as_echo "$ac_foo" >&6; }
 +if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++  ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 +if false; then
-+	ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
-+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
- 
--# 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>
++	ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
++if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
++
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_SA_FAMILY_T 1
++#define HAVE_STRUCT_ADDRINFO 1
  _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; }
++fi
  
--# 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
  
- 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
-+
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS  $LIBS"
 +cat >>confdefs.h <<_ACEOF
 +#define $ac_tr_hdr 1
- _ACEOF
++_ACEOF
  
- fi
++fi
  
--done
--
--# setbuffer, shmget, shm_open are needed for smbtorture
  
  
--for ac_func in shmget shm_open
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
-+$as_echo_n "checking for struct addrinfo... " >&6; }
+-        { $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
++cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
++$as_echo_n "checking for struct sockaddr... " >&6; }
 +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -45244,44 +45369,21 @@
 -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 $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 ();
 +$ac_includes_default
-+#include <netdb.h>
++#include <sys/socket.h>
  int
  main ()
  {
--return $ac_func ();
-+struct addrinfo foo;
+-return nanosleep ();
++struct sockaddr foo;
    ;
    return 0;
  }
@@ -45307,65 +45409,82 @@
 -	 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 :
 +  eval "ac_cv_type_$cv=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
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-
 +  eval "ac_cv_type_$cv=no"
-+fi
+ 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
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_NANOSLEEP 1
+-_ACEOF
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
 +ac_foo=`eval echo \\$ac_cv_type_$cv`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
 +$as_echo "$ac_foo" >&6; }
 +if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++  ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 +if false; then
-+	ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
-+
++	ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
+ 
+-LIBS=$ac_check_lib_ext_save_LIBS
+-
+-if test $ac_cv_lib_ext_rt = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_ADDRINFO 1
-+_ACEOF
-+
++#define HAVE_STRUCT_SOCKADDR 1
+ _ACEOF
  
--	eval "$as_ac_var=no"
+-		case "$LIBS" in
+-		    *-lrt*)
+-			;;
+-		    *)
+-			LIBS="-lrt $LIBS"
+-			;;
+-		esac
+-
+ 
  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
-+
+-done
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define $ac_tr_hdr 1
- _ACEOF
++_ACEOF
  
- fi
--done
++fi
  
  
  
--for ac_func in gettext dgettext
+-for ac_func in lutimes futimes utimensat futimens
 -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
-+cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
-+$as_echo_n "checking for struct sockaddr... " >&6; }
++cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
++$as_echo_n "checking for struct sockaddr_storage... " >&6; }
 +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -45390,9 +45509,10 @@
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
--
++$ac_includes_default
+ 
 -/* 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.  */
@@ -45406,14 +45526,15 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
- 
-+$ac_includes_default
 +#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
+ 
  int
  main ()
  {
 -return $ac_func ();
-+struct sockaddr foo;
++struct sockaddr_storage foo;
    ;
    return 0;
  }
@@ -45445,30 +45566,15 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+	ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR 1
-+_ACEOF
-+
- 
+-
 -	eval "$as_ac_var=no"
++  eval "ac_cv_type_$cv=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"'`
@@ -45479,25 +45585,42 @@
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
  _ACEOF
  
++
++fi
++
  fi
 -done
  
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
++_ACEOF
  
++fi
  
--for ac_func in bindtextdomain textdomain
+ 
+ 
+-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
-+cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
++cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
++$as_echo_n "checking for struct sockaddr_in6... " >&6; }
 +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
@@ -45511,7 +45634,7 @@
 -/* 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
@@ -45522,7 +45645,7 @@
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
 +$ac_includes_default
  
@@ -45547,7 +45670,7 @@
  main ()
  {
 -return $ac_func ();
-+struct sockaddr_storage foo;
++struct sockaddr_in6 foo;
    ;
    return 0;
  }
@@ -45587,13 +45710,13 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
 +$as_echo "$ac_foo" >&6; }
 +if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++  ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 +if false; then
-+	ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
++	ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
++#define HAVE_STRUCT_SOCKADDR_IN6 1
 +_ACEOF
 +
  
@@ -45622,35 +45745,40 @@
 -done
  
  
--for ac_func in strupr
++if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
+ 
++"
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
+ 
+-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
-+
-+cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
-+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+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.  */
+-/* 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_SS_FAMILY 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
@@ -45658,7 +45786,11 @@
 -#endif
  
 -#undef $ac_func
-+$ac_includes_default
++if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -45673,15 +45805,36 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+#include <sys/socket.h>
++"
++if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
++
++$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
++
++fi
++
++fi
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
++$as_echo_n "checking for sin_len in sock... " >&6; }
++if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+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/socket.h>
 +#include <netinet/in.h>
  
  int
  main ()
  {
 -return $ac_func ();
-+struct sockaddr_in6 foo;
++
++struct sockaddr_in sock; sock.sin_len = sizeof(sock);
++
    ;
    return 0;
  }
@@ -45709,30 +45862,16 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "ac_cv_type_$cv=yes"
++
++		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
++
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+	ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_IN6 1
-+_ACEOF
-+
  
 -	eval "$as_ac_var=no"
- fi
+-fi
++		libreplace_cv_HAVE_SOCK_SIN_LEN=no
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -45747,27 +45886,18 @@
 -   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 $ac_tr_hdr 1
- _ACEOF
+-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
 -done
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
++$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
++if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
  
--# Find a method of generating a stack trace
++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
  
-+if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
- 
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
- 
--for ac_header in execinfo.h libexc.h libunwind.h
+-for ac_header in sys/mman.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
@@ -45775,12 +45905,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
+ 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
++
++############################################
++# check for unix domain sockets
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
++$as_echo_n "checking for unix domain sockets... " >&6; }
++if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -45789,7 +45926,9 @@
 -_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
@@ -45815,14 +45954,21 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
  
 -	ac_header_compiler=no
- fi
+-fi
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
  
 -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; }
++int
++main ()
++{
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45834,7 +45980,13 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++struct sockaddr_un sunaddr;
++sunaddr.sun_family = AF_UNIX;
++
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45853,24 +46005,23 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		libreplace_cv_HAVE_UNIXSOCKET=yes
++
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
  
 -  ac_header_preproc=no
 -fi
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
++		libreplace_cv_HAVE_UNIXSOCKET=no
  
 -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___SS_FAMILY 1" >>confdefs.h
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -45913,144 +46064,42 @@
 -		 $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_HAVE_UNIXSOCKET" >&5
++$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
++if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
++
++$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
  
  fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
- fi
- 
--done
--
--# libexecinfo provides backtrace_symbols on FreeBSD
--{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
--$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
--if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
-+$as_echo_n "checking for sin_len in sock... " >&6; }
-+if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
 +
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--/* Override any GCC internal prototype to avoid an error.
--   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 backtrace_symbols ();
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
- int
- main ()
- {
--return backtrace_symbols ();
-+
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+
-   ;
-   return 0;
- }
++for ac_func in connect
++do :
++  ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_CONNECT 1
  _ACEOF
--for ac_lib in '' execinfo; do
--  if test -z "$ac_lib"; then
--    ac_res="none required"
--  else
--    ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--  fi
--  rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_search_backtrace_symbols=$ac_res
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=no
- 
  fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ done
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext
--  if test "${ac_cv_search_backtrace_symbols+set}" = set; then
--  break
--fi
--done
--if test "${ac_cv_search_backtrace_symbols+set}" = set; then
--  :
--else
--  ac_cv_search_backtrace_symbols=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
--$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
--ac_res=$ac_cv_search_backtrace_symbols
--if test "$ac_res" != no; then
--  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
-+$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
-+if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
+-# setbuffer, shmget, shm_open are needed for smbtorture
++if test x"$ac_cv_func_connect" = x"no"; then
  
--fi
-+$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
  
-+fi
- 
--for ac_func in backtrace_symbols
+-for ac_func in shmget shm_open
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+############################################
-+# check for unix domain sockets
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
-+$as_echo_n "checking for unix domain sockets... " >&6; }
-+if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -46060,12 +46109,14 @@
 -/* 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="-lnsl_s $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
@@ -46073,15 +46124,20 @@
 -#endif
  
 -#undef $ac_func
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
++$as_echo_n "checking for connect in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_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
--   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
+@@ -42813,101 +11689,65 @@
+ #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
@@ -46089,20 +46145,13 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
- 
+-
++char connect ();
  int
  main ()
  {
 -return $ac_func ();
-+
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
-+
++return connect ();
    ;
    return 0;
  }
@@ -46129,17 +46178,26 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		libreplace_cv_HAVE_UNIXSOCKET=yes
-+
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_ext_nsl_s_connect=yes;
++		  ac_cv_lib_ext_nsl_s=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_ext_nsl_s_connect=no;
++		  ac_cv_lib_ext_nsl_s=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
  
 -	eval "$as_ac_var=no"
--fi
-+		libreplace_cv_HAVE_UNIXSOCKET=no
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
++    if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -46152,116 +46210,41 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++LIBS=$ac_check_lib_ext_save_LIBS
++
++if test $ac_cv_lib_ext_nsl_s = yes; then :
+   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: $libreplace_cv_HAVE_UNIXSOCKET" >&5
-+$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
-+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
- 
-+$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
- 
--{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
--$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
--if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lexc  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+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 trace_back_stack ();
--int
--main ()
--{
--return trace_back_stack ();
--  ;
--  return 0;
--}
-+for ac_func in connect
-+do :
-+  ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
++#define HAVE_LIBNSL_S 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
--  ac_cv_lib_exc_trace_back_stack=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--	ac_cv_lib_exc_trace_back_stack=no
++		case "$LIBREPLACE_NETWORK_LIBS" in
++		    *-lnsl_s*)
++			;;
++		    *)
++			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++			;;
++		esac
++
++
  fi
-+done
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
--$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
--if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBEXC 1
--_ACEOF
-+if test x"$ac_cv_func_connect" = x"no"; then
- 
--  LIBS="-lexc $LIBS"
- 
--fi
+-done
++
++
 +ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
  
--# check for sysctlbyname for BSD systems
  
--for ac_func in sysctlbyname
+-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 connect in -lnsl_s" >&5
-+$as_echo_n "checking for connect in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_connect+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
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -46290,7 +46273,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -43212,553 +11639,196 @@
+@@ -42915,101 +11755,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -46335,19 +46318,26 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_nsl_s_connect=yes;
-+		  ac_cv_lib_ext_nsl_s=yes
++  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
--
--	eval "$as_ac_var=no"
-+  ac_cv_lib_ext_nsl_s_connect=no;
-+		  ac_cv_lib_ext_nsl_s=no
- fi
++  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
  
+-	eval "$as_ac_var=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 -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -46359,224 +46349,86 @@
 -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_s_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
-+    if test $ac_cv_lib_ext_nsl_s_connect = 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
--_ACEOF
--
--fi
--done
--
--
--#############################
--# check if building with gpfs
--
--for ac_header in gpfs_gpl.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>
-+#define HAVE_CONNECT 1
++#define HAVE_LIBNSL 1
  _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; }
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LIBNSL_S 1
- _ACEOF
- 
 +		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lnsl_s*)
++		    *-lnsl*)
 +			;;
 +		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
 +
 +
  fi
- 
 -done
  
--if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+ 
 +ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GPFS 1
--_ACEOF
- 
--    default_shared_modules="$default_shared_modules vfs_gpfs"
--fi
- 
--#############################################
--# check if building on Isilon OneFS
--printf "%s" "checking for Isilon OneFS... "
--save_LIBS="$LIBS"
--LIBS="$LIBS -lisi_version"
--cat >conftest.$ac_ext <<_ACEOF
+-for ac_func in bindtextdomain textdomain
+-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 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 >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 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
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <isi_version/isi_version.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
+-/* 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
+@@ -43017,100 +11821,65 @@
+ #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 ()
  {
--get_isilon_copyright()
+-return $ac_func ();
 +return connect ();
    ;
    return 0;
@@ -46603,24 +46455,24 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  samba_cv_HAVE_ONEFS=yes
+-  eval "$as_ac_var=yes"
 +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
-+  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
  
--	samba_cv_HAVE_ONEFS=no
+-	eval "$as_ac_var=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 :
++{ $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
@@ -46628,103 +46480,94 @@
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--echo $samba_cv_HAVE_ONEFS
--if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
-+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
 +LIBS=$ac_check_lib_ext_save_LIBS
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ONEFS 1
-+if test $ac_cv_lib_ext_nsl = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
++
++if test $ac_cv_lib_ext_socket = yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LIBSOCKET 1
  _ACEOF
  
--    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"
 +		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lnsl*)
++		    *-lsocket*)
 +			;;
 +		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
 +
 +
  fi
+-done
  
--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:$LINENO: checking for libunwind" >&5
--$as_echo_n "checking for libunwind... " >&6; }
--save_LIBS=$LIBS
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_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
- 
--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
- 
--cat >conftest.$ac_ext <<_ACEOF
+-for ac_func in strupr
+-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
-+        { $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 :
+-/* 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.  */
++/* end confdefs.h.  */
  
--#ifdef HAVE_LIBUNWIND_H
--#include <libunwind.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"
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -43118,236 +11887,87 @@
+ #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 ()
  {
--
--	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 $ac_func ();
 +return connect ();
    ;
    return 0;
@@ -46751,29 +46594,61 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
--_ACEOF
--
--
--	# If we have libunwind, test whether we also have libunwind-ptrace
--	# which would let us unwind arbitrary processes.
--	save_LIBS=$LIBS
+-  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
-+  ac_cv_lib_ext_socket_connect=no;
-+		  ac_cv_lib_ext_socket=no
-+fi
++  ac_cv_lib_ext_inet_connect=yes;
++		  ac_cv_lib_ext_inet=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_inet_connect=no;
++		  ac_cv_lib_ext_inet=no
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
--for ac_header in libunwind-ptrace.h
+-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_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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_CONNECT 1
+ _ACEOF
+ 
+ fi
+-done
+-
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-# Find a method of generating a stack trace
++if test $ac_cv_lib_ext_inet = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBINET 1
++_ACEOF
+ 
++		case "$LIBREPLACE_NETWORK_LIBS" in
++		    *-linet*)
++			;;
++		    *)
++			LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
++			;;
++		esac
+ 
+ 
+-for ac_header in execinfo.h libexc.h libunwind.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
@@ -46798,12 +46673,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+{ $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
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -46826,15 +46696,22 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++			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
  
 -	ac_header_compiler=no
- fi
-+LIBS=$ac_check_lib_ext_save_LIBS
+-fi
++$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
  
 -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
++fi
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -46845,9 +46722,12 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+if test $ac_cv_lib_ext_socket = 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 HAVE_LIBSOCKET 1
++#define HAVE_GETHOSTBYNAME 1
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -46872,18 +46752,13 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -  ac_header_preproc=no
--fi
-+		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lsocket*)
-+			;;
-+		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
-+			;;
-+		esac
+ 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; }
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -46921,7 +46796,7 @@
 -  $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
@@ -46934,24 +46809,23 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
 -fi
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-linet $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
 -done
  
--	{ $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
--$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
--if test "${ac_cv_lib_unwind_ptrace__UPT_create+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 :
+-# libexecinfo provides backtrace_symbols on FreeBSD
+-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
+-$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
++        { $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
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lunwind-ptrace  $LIBS"
+-  ac_func_search_save_LIBS=$LIBS
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -46961,22 +46835,29 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -43767,349 +11837,220 @@
+@@ -43356,105 +11976,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char _UPT_create ();
-+char connect ();
+-char backtrace_symbols ();
++char gethostbyname ();
  int
  main ()
  {
--return _UPT_create ();
-+return connect ();
+-return backtrace_symbols ();
++return gethostbyname ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' execinfo; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46997,231 +46878,55 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_unwind_ptrace__UPT_create=yes
+-  ac_cv_search_backtrace_symbols=$ac_res
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_inet_connect=yes;
-+		  ac_cv_lib_ext_inet=yes
++  ac_cv_lib_ext_nsl_s_gethostbyname=yes;
++		  ac_cv_lib_ext_nsl_s=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_unwind_ptrace__UPT_create=no
-+  ac_cv_lib_ext_inet_connect=no;
-+		  ac_cv_lib_ext_inet=no
+-
++  ac_cv_lib_ext_nsl_s_gethostbyname=no;
++		  ac_cv_lib_ext_nsl_s=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
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
--$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
--if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
-+{ $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
- 
--		LIBUNWIND_PTRACE="-lunwind-ptrace";
-+fi
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND_PTRACE 1
-+if test $ac_cv_lib_ext_inet = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBINET 1
- _ACEOF
- 
-+		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-linet*)
-+			;;
-+		    *)
-+			LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
-+			;;
-+		esac
-+
- 
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+-  break
+-fi
+-done
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+-  :
 -else
--   LIBUNWIND_PTRACE=""
+-  ac_cv_search_backtrace_symbols=no
  fi
-+			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
- 
--	LIBS=$save_LIBS
-+	fi
-+fi
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+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
- 
-+fi
-+done
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--	LIBS=$save_LIBS
-+if test x"$ac_cv_func_gethostbyname" = x"no"; then
- 
--fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
- 
--# 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`
--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 "$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
--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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_nsl_s_gethostbyname=yes;
-+		  ac_cv_lib_ext_nsl_s=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_ext_nsl_s_gethostbyname=no;
-+		  ac_cv_lib_ext_nsl_s=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
--	ac_header_compiler=no
- fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
 +$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
 +    if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETHOSTBYNAME 1
 +_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
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
+-$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
+-ac_res=$ac_cv_search_backtrace_symbols
+-if test "$ac_res" != no; then
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 +LIBS=$ac_check_lib_ext_save_LIBS
- 
--# 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>
++
 +if test $ac_cv_lib_ext_nsl_s = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBNSL_S 1
- _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
++_ACEOF
++
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl_s*)
 +			;;
@@ -47229,105 +46934,70 @@
 +			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
++
  
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
+ fi
  
--# 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
+ 
+-for ac_func in backtrace_symbols
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 -else
--  eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
- 
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
- 
--fi
+-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="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
--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.  */
  
--    { $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
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
 +        { $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 :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
++/* end confdefs.h.  */
  
--#if HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--#if HAVE_SYS_PTRACE_H
--#include <sys/ptrace.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"
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -43462,82 +12042,64 @@
+ #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 gethostbyname ();
  int
  main ()
  {
--
--		pid_t me = (pid_t)-1;
--		ptrace(PTRACE_ATTACH, me, 0, 0);
--		ptrace(PTRACE_DETACH, me, 0, 0);
--		return 0;
--
+-return $ac_func ();
 +return gethostbyname ();
    ;
    return 0;
@@ -47354,36 +47024,20 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PTRACE 1
--_ACEOF
--
--
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_nsl_gethostbyname=yes;
 +		  ac_cv_lib_ext_nsl=yes
  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; }
--		LIBUNWIND_PTRACE=""
--
 +  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
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      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; }
@@ -47392,13 +47046,24 @@
 +#define HAVE_GETHOSTBYNAME 1
 +_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
+-$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
 +LIBS=$ac_check_lib_ext_save_LIBS
- 
++
 +if test $ac_cv_lib_ext_nsl = yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_LIBNSL 1
-+_ACEOF
+ _ACEOF
  
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl*)
@@ -47407,70 +47072,46 @@
 +			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
++
++
+ fi
+-done
  
  
-+fi
- 
- 
+-{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
+-$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
+-if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lsocket $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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
 +$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
 +if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lexc  $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.  */
--/* 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
-@@ -44117,106 +12058,87 @@
+@@ -43546,93 +12108,87 @@
  #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 trace_back_stack ();
 +char gethostbyname ();
  int
  main ()
  {
--return $ac_func ();
+-return trace_back_stack ();
 +return gethostbyname ();
    ;
    return 0;
@@ -47497,7 +47138,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_exc_trace_back_stack=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_socket_gethostbyname=yes;
 +		  ac_cv_lib_ext_socket=yes
@@ -47509,8 +47150,9 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+ 
+-	ac_cv_lib_exc_trace_back_stack=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 :
@@ -47518,27 +47160,23 @@
 +#define HAVE_GETHOSTBYNAME 1
 +_ACEOF
  
--	eval "$as_ac_var=no"
- 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
--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
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
+-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
++LIBS=$ac_check_lib_ext_save_LIBS
++
 +if test $ac_cv_lib_ext_socket = yes; then :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_LIBEXC 1
 +#define HAVE_LIBSOCKET 1
  _ACEOF
  
+-  LIBS="-lexc $LIBS"
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lsocket*)
 +			;;
@@ -47547,9 +47185,8 @@
 +			;;
 +		esac
 +
-+
+ 
  fi
--done
 +			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"
@@ -47557,66 +47194,66 @@
  
 +$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
  
+-# check for sysctlbyname for BSD systems
 +	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 __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+-for ac_func in sysctlbyname
 -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
-@@ -44224,3065 +12146,2377 @@
+@@ -43640,3908 +12196,2735 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47666,21 +47303,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_ipv6_if_nametoindex=no;
 +		  ac_cv_lib_ext_ipv6=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_ipv6_if_nametoindex" >&5
-+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
-+    if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_IF_NAMETOINDEX 1
-+_ACEOF
- 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -47692,14 +47322,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_ipv6 = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
++$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
++    if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBIPV6 1
++#define HAVE_IF_NAMETOINDEX 1
  _ACEOF
  
+ 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
++_ACEOF
++
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lipv6*)
 +			;;
@@ -47707,34 +47346,44 @@
 +			LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
+ 
+-#################################################
+-# Check to see if core dump directory is defined in linux
+-# with /proc/sys/kernel/core_pattern
+ 
+-{ $as_echo "$as_me:$LINENO: checking for /proc/sys/kernel/core_pattern" >&5
+-$as_echo_n "checking for /proc/sys/kernel/core_pattern... " >&6; }
+-if test "${ac_cv_file__proc_sys_kernel_core_pattern+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "/proc/sys/kernel/core_pattern"; then
+-  ac_cv_file__proc_sys_kernel_core_pattern=yes
+-else
+-  ac_cv_file__proc_sys_kernel_core_pattern=no
  fi
--done
 +			if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
 +	then
- 
++
 +$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
 +
 +	fi
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__proc_sys_kernel_core_pattern" >&5
+-$as_echo "$ac_cv_file__proc_sys_kernel_core_pattern" >&6; }
+-if test "x$ac_cv_file__proc_sys_kernel_core_pattern" = x""yes; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_KERNEL_PROC_CORE_PATTERN 1
 +# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
 +old_LIBS=$LIBS
 +LIBS="${LIBREPLACE_NETWORK_LIBS}"
 +libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS -I$libreplacedir"
- 
--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_n "(cached) " >&6
--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"
@@ -47742,61 +47391,50 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SOCKETPAIR 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.  */
 +else
 +  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
-+fi
+ fi
 +done
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
  
--#undef $ac_func
+-#############################
+-# check if building with gpfs
+-
+-for ac_header in gpfs_gpl.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 "$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
- 
--/* 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_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
++
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_REPLACE_INET_NTOA=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
+ /* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
++
 +#include <stdio.h>
 +#include <unistd.h>
 +#include <sys/types.h>
@@ -47809,15 +47447,15 @@
 +    strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
 +exit(1);}
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -47826,96 +47464,216 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_REPLACE_INET_NTOA=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_header_compiler=no
 +  libreplace_cv_REPLACE_INET_NTOA=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 -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
+-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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
 +$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&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>
 +for ac_func in inet_ntoa
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
 +if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_INET_NTOA 1
  _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
 +else
 +  libreplace_cv_REPLACE_INET_NTOA=yes
  fi
- done
++done
  
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
 +if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
  
+-# 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; }
 +$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
  
 +    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
-+fi
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +
 +for ac_func in inet_aton
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
 +if test "x$ac_cv_func_inet_aton" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_INET_ATON 1
-+_ACEOF
-+
+ _ACEOF
+ 
 +else
 +  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
-+fi
-+done
-+
-+
+ fi
+-
+ done
+ 
+-if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GPFS 1
 +for ac_func in inet_ntop
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
 +if test "x$ac_cv_func_inet_ntop" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_INET_NTOP 1
-+_ACEOF
+ _ACEOF
  
--for ac_func in __xstat __fxstat __lxstat
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
+-    default_shared_modules="$default_shared_modules vfs_gpfs"
+-fi
+-
+-#############################################
+-# check if building on Isilon OneFS
+-printf "%s" "checking for Isilon OneFS... "
+-save_LIBS="$LIBS"
+-LIBS="$LIBS -lisi_version"
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <isi_version/isi_version.h>
+-int
+-main ()
+-{
+-get_isilon_copyright()
+-  ;
+-  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
+-  samba_cv_HAVE_ONEFS=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	samba_cv_HAVE_ONEFS=no
 +  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
-+fi
+ fi
 +done
-+
-+
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-echo $samba_cv_HAVE_ONEFS
+-if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ONEFS 1
 +for ac_func in inet_pton
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
@@ -47923,63 +47681,83 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_INET_PTON 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.  */
+-    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"
 +else
 +  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
-+fi
+ fi
 +done
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+-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:$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
  
--#undef $ac_func
+-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 "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
 +$as_echo_n "checking for getaddrinfo... " >&6; }
 +if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
  
--/* 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 >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.  */
  
+-#ifdef HAVE_LIBUNWIND_H
+-#include <libunwind.h>
 +#include <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
-+#endif
+ #endif
+-
 +#include <sys/socket.h>
 +#include <netdb.h>
  int
  main ()
  {
--return $ac_func ();
-+
+ 
+-	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);
 +struct sockaddr sa;
 +struct addrinfo *ai = NULL;
 +int ret = getaddrinfo(NULL, NULL, NULL, &ai);
@@ -47991,7 +47769,7 @@
 +		NULL, 0,
 +		NULL, 0, 0);
 +
-+
+ 
    ;
    return 0;
  }
@@ -48017,29 +47795,159 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND 1
+-_ACEOF
+-
+-
+-	# If we have libunwind, test whether we also have libunwind-ptrace
+-	# which would let us unwind arbitrary processes.
+-	save_LIBS=$LIBS
+-
+-for ac_header in libunwind-ptrace.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
 +if ac_fn_c_try_link "$LINENO"; then :
 +  libreplace_cv_HAVE_GETADDRINFO=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
++else
 +  libreplace_cv_HAVE_GETADDRINFO=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 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
++	# getaddrinfo is broken on some AIX systems
++	# see bug 5910, use our replacements if we detect
++	# a broken system.
++	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
+-  # 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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
 +
++		#include <stddef.h>
++		#include <sys/types.h>
++		#include <sys/socket.h>
++		#include <netdb.h>
++		int main(int argc, const char *argv[])
++		{
++			struct addrinfo hints = {0,};
++			struct addrinfo *ppres;
++			const char hostname[] = "0.0.0.0";
++			hints.ai_socktype = SOCK_STREAM;
++			hints.ai_family = AF_INET;
++			hints.ai_flags =
++				AI_NUMERICHOST|AI_PASSIVE|AI_ADDRCONFIG;
++			return getaddrinfo(hostname, NULL, &hints, &ppres) != 0 ? 1 : 0;
++		}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_GETADDRINFO=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  libreplace_cv_HAVE_GETADDRINFO=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
+ 
+-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"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+ 
+-# 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
 +$as_echo "#define HAVE_GETADDRINFO 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
-+
+-  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; }
 +$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
 +
 +
@@ -48047,32 +47955,71 @@
 +
 +
 +$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-+
-+else
+ 
+-# 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"
 +	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
  fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
+ 
+-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 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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_IFADDRS_H 1
  _ACEOF
  
  fi
-+
+ 
  done
  
- 
+-	{ $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
+-$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
+-if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
++
 +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 :
@@ -48080,67 +48027,40 @@
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
 +_ACEOF
- 
- 
++
++
 +$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
- 
++
 +fi
- 
- 
--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 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 >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lunwind-ptrace  $LIBS"
+-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
++
 +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
 -   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
 +#include <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
  #endif
--
+-char _UPT_create ();
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
@@ -48149,7 +48069,7 @@
  int
  main ()
  {
--return $ac_func ();
+-return _UPT_create ();
 +
 +struct ifaddrs *ifp = NULL;
 +int ret = getifaddrs (&ifp);
@@ -48180,47 +48100,47 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_unwind_ptrace__UPT_create=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  libreplace_cv_HAVE_GETIFADDRS=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_unwind_ptrace__UPT_create=no
 +  libreplace_cv_HAVE_GETIFADDRS=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
--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:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
 +{ $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
+-		LIBUNWIND_PTRACE="-lunwind-ptrace";
 +$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND_PTRACE 1
+-_ACEOF
  
 +$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
  
+-else
+-   LIBUNWIND_PTRACE=""
+-fi
  
 +$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
  
+-	LIBS=$save_LIBS
 +fi
  
 +##################
@@ -48230,7 +48150,9 @@
 +$as_echo_n "checking for iface getifaddrs... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+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 :
 +  libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
@@ -48238,6 +48160,9 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-	LIBS=$save_LIBS
 +#define HAVE_IFACE_GETIFADDRS 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48258,31 +48183,45 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--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
-+fi
+ 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
-+
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +else
 +	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
 +fi
-+
-+
+ 
+-# 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`
+-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
 +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
+-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
--  cat >conftest.$ac_ext <<_ACEOF
+-  # 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
@@ -48293,14 +48232,9 @@
 +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.  */
+-$ac_includes_default
+-#include <$ac_header>
++
 +#define HAVE_IFACE_AIX 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48312,53 +48246,60 @@
 +#include "$libreplacedir/getifaddrs.c"
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
+ _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
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_AIX=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  libreplace_cv_HAVE_IFACE_AIX=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
-+fi
+-	ac_header_compiler=no
+ fi
 +{ $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
  
--#undef $ac_func
+-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
 +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;
--}
+-# 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
++
 +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; }
@@ -48370,7 +48311,8 @@
 +  libreplace_cv_HAVE_IFACE_IFCONF=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-#include <$ac_header>
 +
 +#define HAVE_IFACE_IFCONF 1
 +#define NO_CONFIG_H 1
@@ -48383,28 +48325,24 @@
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-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_link") 2>conftest.er1
+-  (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); } && {
--	 test -z "$ac_c_werror_flag" ||
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$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"
+-  ac_header_preproc=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_IFCONF=yes
  else
@@ -48416,7 +48354,7 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--	eval "$as_ac_var=no"
+-  ac_header_preproc=no
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
@@ -48424,35 +48362,59 @@
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFCONF 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
--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
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
 +fi
-+
++fi
+ 
+-# 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
 +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
+-  eval "$as_ac_Header=\$ac_header_preproc"
 +
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_IFREQ=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +#define HAVE_IFACE_IFREQ 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48472,86 +48434,67 @@
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
--done
--
--
--
--
+-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
+ 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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
 +if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
  
+ fi
 +fi
-+fi
  
--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
+-done
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY support" >&5
 +$as_echo_n "checking for IPV6_V6ONLY support... " >&6; }
 +if test "${libreplace_cv_HAVE_IPV6_V6ONLY+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
++  $as_echo_n "(cached) " >&6
++else
+ 
+-    { $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
 -/* 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
 +	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
--   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
+-#if HAVE_SYS_TYPES_H
 +#include <stdlib.h> /* for NULL */
 +#include <sys/socket.h>
-+#include <sys/types.h>
+ #include <sys/types.h>
+-#endif
+-#if HAVE_SYS_PTRACE_H
+-#include <sys/ptrace.h>
+-#endif
 +#include <netdb.h>
 +#include <netinet/in.h>
  
  int
  main ()
  {
--return $ac_func ();
-+
+ 
+-		pid_t me = (pid_t)-1;
+-		ptrace(PTRACE_ATTACH, me, 0, 0);
+-		ptrace(PTRACE_DETACH, me, 0, 0);
+-		return 0;
 +#ifndef IPV6_V6ONLY
 +#error no IPV6_V6ONLY
 +#endif
-+
+ 
    ;
    return 0;
  }
@@ -48577,166 +48520,72 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PTRACE 1
+-_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
-+
+ 
 +		libreplace_cv_HAVE_IPV6_V6ONLY=yes
-+
+ 
  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:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-		LIBUNWIND_PTRACE=""
 +		libreplace_cv_HAVE_IPV6_V6ONLY=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
  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
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--done
--
--
--
--
--
--
--
--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 "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6_V6ONLY" >&5
 +$as_echo "$libreplace_cv_HAVE_IPV6_V6ONLY" >&6; }
 +if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY in linux/in6.h" >&5
 +$as_echo_n "checking for IPV6_V6ONLY in linux/in6.h... " >&6; }
 +if test "${libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26+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
++  $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
--   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 <linux/in6.h>
- 
- int
- main ()
- {
--return $ac_func ();
 +
++int
++main ()
++{
+ 
 +	#if (IPV6_V6ONLY != 26)
 +	#error no linux IPV6_V6ONLY
 +	#endif
-+
-   ;
-   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"
+ 
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
-+
+ 
 +		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--	eval "$as_ac_var=no"
--fi
++else
+ 
 +		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no
  
--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
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- fi
--done
--
--
--
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&5
 +$as_echo "$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&6; }
 +	if test x"$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" = x"yes"; then
@@ -48746,7 +48595,7 @@
 +	fi
 +fi
  
--for ac_func in getdirentries _write __write _fork __fork
+-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
@@ -48766,7 +48615,7 @@
 -/* 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
@@ -48777,7 +48626,7 @@
 -#else
 -# include <assert.h>
 -#endif
- 
+-
 -#undef $ac_func
 +	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -48901,7 +48750,9 @@
  
 +LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
  
--for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
+ 
+-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
@@ -48918,19 +48769,18 @@
 -/* 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_OBJS="${LIBREPLACEOBJ}"
  
 -/* 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.  */
++LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
  
 -#undef $ac_func
  
@@ -48947,6 +48797,9 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
  
 -int
 -main ()
@@ -48955,7 +48808,16 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++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 conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -48981,12 +48843,9 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
  
 -	eval "$as_ac_var=no"
--fi
+ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -48999,7 +48858,9 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
++done
++
++for ac_header in unistd.h grp.h sys/id.h memory.h alloca.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"
@@ -49012,38 +48873,11 @@
  
  fi
 -done
+-
  
 +done
  
-+for ac_header in unistd.h grp.h sys/id.h memory.h alloca.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 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"
-+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_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-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
@@ -49053,7 +48887,7 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.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"
@@ -49068,29 +48902,17 @@
 -/* 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
-+
-+for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.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
  
 -#undef $ac_func
 +fi
@@ -49117,7 +48939,7 @@
 -  ;
 -  return 0;
 -}
-+for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
++for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49168,7 +48990,7 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
++for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.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"
@@ -49183,7 +49005,7 @@
 +
  done
  
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49197,19 +49019,7 @@
  
 +done
  
-+for ac_header in sys/sysmacros.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SYSMACROS_H 1
-+_ACEOF
- 
-+fi
- 
-+done
- 
--for ac_func in pread _pread __pread pread64 _pread64 __pread64
+-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
@@ -49219,7 +49029,7 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in sys/syslog.h syslog.h
++for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49249,7 +49059,7 @@
 +done
  
 -#undef $ac_func
-+for ac_header in langinfo.h locale.h
++for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49283,12 +49093,12 @@
 -}
 +done
 +
-+for ac_header in xfs/libxfs.h
++for ac_header in sys/sysmacros.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_XFS_LIBXFS_H 1
++#define HAVE_SYS_SYSMACROS_H 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -49332,39 +49142,48 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in netgroup.h
++for ac_header in sys/syslog.h syslog.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netgroup_h" = 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_NETGROUP_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
 +
  done
  
- 
-+for ac_header in rpcsvc/yp_prot.h
++for ac_header in langinfo.h locale.h
 +do :
-+  ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
-+#endif
- 
-+"
-+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = 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 HAVE_RPCSVC_YP_PROT_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
 +fi
  
 +done
  
++for ac_header in xfs/libxfs.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
++if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_XFS_LIBXFS_H 1
++_ACEOF
  
--for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++fi
+ 
++done
+ 
+-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
@@ -49374,13 +49193,12 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
++for ac_header in netgroup.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 :
++  ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
++if test "x$ac_cv_header_netgroup_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_MODE_H 1
++#define HAVE_NETGROUP_H 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -49388,21 +49206,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
@@ -49416,7 +49234,12 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
++for ac_header in rpcsvc/yp_prot.h
++do :
++  ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
++#if HAVE_RPC_RPC_H
++#include <rpc/rpc.h>
+ #endif
  
 -int
 -main ()
@@ -49425,15 +49248,10 @@
 -  ;
 -  return 0;
 -}
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+for ac_header in CoreFoundation/CFStringEncodingConverter.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
++"
++if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++#define HAVE_RPCSVC_YP_PROT_H 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -49460,9 +49278,9 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
--fi
+ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -49475,18 +49293,45 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_SYS_MODE_H 1
+ _ACEOF
+ 
+ fi
++
+ done
+ 
+ 
++# Look for Darwin headers
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-Iinclude $CPPFLAGS"
++for ac_header in CoreFoundation/CFStringEncodingConverter.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++_ACEOF
+ 
 +else
 +  for ac_header in CFStringEncodingConverter.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
 +if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
- _ACEOF
++_ACEOF
  
- fi
--done
++fi
  
 +done
  
@@ -49496,7 +49341,7 @@
  
 +CPPFLAGS="$old_CPPFLAGS"
  
--for ac_func in open64 _open64 __open64 creat64
+-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
@@ -49635,7 +49480,33 @@
  
 +done
  
--for ac_func in prctl
++for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++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 syscall.h sys/syscall.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
+ 
+-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
@@ -49645,36 +49516,26 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
+-_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
++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.  */
-+fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
-+
-+for ac_header in syscall.h sys/syscall.h
++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`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49709,16 +49570,7 @@
 -  ;
 -  return 0;
 -}
-+
-+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`
-+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
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -49744,6 +49596,15 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++for ac_header in sys/ea.h sys/proplist.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
  
 -	eval "$as_ac_var=no"
  fi
@@ -49761,7 +49622,8 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in sys/ea.h sys/proplist.h
++
++for ac_header in sys/cdefs.h glob.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"
@@ -49773,65 +49635,10 @@
  _ACEOF
  
  fi
-+
- done
+-done
  
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+for ac_header in sys/cdefs.h glob.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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#ifdef HAVE_SYS_PRCTL_H
--#include <sys/prctl.h>
--#endif
- 
--int
--main ()
--{
--int i; i = prtcl(0);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRCTL 1
--_ACEOF
 +done
  
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
 +# For experimental utmp support (lastlog on some BSD-like systems)
 +for ac_header in utmp.h utmpx.h lastlog.h
@@ -49844,21 +49651,17 @@
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
- fi
++fi
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +done
  
--#
--#
--#
--case "$host_os" in
--    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
--       # glibc <= 2.3.2 has a broken getgrouplist
--       { $as_echo "$as_me:$LINENO: checking for good getgrouplist" >&5
--$as_echo_n "checking for good getgrouplist... " >&6; }
--if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then
-+
+ 
+-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
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -49868,17 +49671,22 @@
 +if test "${ac_cv_sizeof_int+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test "$cross_compiling" = yes; then
--  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
 -  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
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+ 
+-/* 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
 +  if test "$ac_cv_type_int" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -49889,31 +49697,43 @@
 +     ac_cv_sizeof_int=0
 +   fi
 +fi
-+
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +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>
--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__;
+-#undef $ac_func
  
--       if (libc_major < 2)
--              exit(1);
--       if ((libc_major == 2) && (libc_minor <= 3))
--              exit(1);
+-/* 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
--       exit(0);
--}
+-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;
+-}
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
--rm -f conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -49921,23 +49741,41 @@
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  samba_cv_linux_getgrouplist_ok=yes
-+
-+
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
+-fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -49946,14 +49784,9 @@
 +$as_echo_n "checking size of long... " >&6; }
 +if test "${ac_cv_sizeof_long+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
  
--( exit $ac_status )
--samba_cv_linux_getgrouplist_ok=no
 +else
 +  if test "$ac_cv_type_long" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -49965,30 +49798,20 @@
 +     ac_cv_sizeof_long=0
 +   fi
  fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+
- fi
+-done
+ 
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
 +$as_echo "$ac_cv_sizeof_long" >&6; }
  
  
--fi
--{ $as_echo "$as_me:$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
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETGROUPLIST 1
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
++_ACEOF
  
--       fi
--       ;;
--    *)
  
--for ac_func in getgrouplist
+-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
@@ -50097,6 +49920,17 @@
 -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
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -50107,7 +49941,7 @@
 +  $as_echo_n "(cached) " >&6
 +else
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
-+
+ 
 +else
 +  if test "$ac_cv_type_short" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -50119,59 +49953,73 @@
 +     ac_cv_sizeof_short=0
 +   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
+ 
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
 +$as_echo "$ac_cv_sizeof_short" >&6; }
  
--       ;;
--esac
  
--#
--# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
--#
  
--if test x$ac_cv_func_stat64 = xno ; then
--  { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++_ACEOF
  
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
-+
-+
+ 
+ 
+-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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 +if test "${ac_cv_c_const+set}" = set; then :
-+  $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.  */
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
  
  int
  main ()
  {
--struct stat64 st64; exit(stat64(".",&st64));
+-return $ac_func ();
 +/* FIXME: Include the comments suggested by Paul. */
 +#ifndef __cplusplus
 +  /* Ultrix mips cc rejects this.  */
@@ -50247,30 +50095,44 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_func_stat64=yes
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_const=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  ac_cv_c_const=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
+-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
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-done
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 +$as_echo "$ac_cv_c_const" >&6; }
 +if test $ac_cv_c_const = no; then
  
 +$as_echo "#define const /**/" >>confdefs.h
  
- 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:$LINENO: result: $ac_cv_func_stat64" >&5
--$as_echo "$ac_cv_func_stat64" >&6; }
--  if test x$ac_cv_func_stat64 = xyes ; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 +$as_echo_n "checking for inline... " >&6; }
 +if test "${ac_cv_c_inline+set}" = set; then :
@@ -50286,33 +50148,18 @@
 +$ac_kw foo_t foo () {return 0; }
 +#endif
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT64 1
- _ACEOF
--
--  fi
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_inline=$ac_kw
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  test "$ac_cv_c_inline" != no && break
 +done
  
--if test x$ac_cv_func_lstat64 = xno ; then
--  { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 +$as_echo "$ac_cv_c_inline" >&6; }
  
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
 +case $ac_cv_c_inline in
 +  inline | yes) ;;
 +  *)
@@ -50323,72 +50170,51 @@
 +    cat >>confdefs.h <<_ACEOF
 +#ifndef __cplusplus
 +#define inline $ac_val
- #endif
--#include <sys/stat.h>
--
--int
--main ()
--{
--struct stat64 st64; exit(lstat64(".",&st64));
--  ;
--  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;;
++#endif
++_ACEOF
 +    ;;
- 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_lstat64=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++esac
  
--fi
+-for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 + { $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
+   $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_cv_c_bigendian=unknown
 +    # See if we're dealing with a universal compiler.
 +    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
 +#ifndef __APPLE_CC__
 +	       not a universal capable compiler
 +	     #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
+-/* 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
 +if ac_fn_c_try_compile "$LINENO"; then :
  
--  fi
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +	# Check for potential -arch flags.  It is not universal unless
 +	# there are at least two -arch flags with different values.
 +	ac_arch=
@@ -50410,7 +50236,7 @@
 +	   ac_prev=arch
 +	 fi
 +       done
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +    if test $ac_cv_c_bigendian = unknown; then
 +      # See if sys/param.h defines the BYTE_ORDER macro.
@@ -50419,11 +50245,7 @@
 +#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.  */
+-#undef $ac_func
 +int
 +main ()
 +{
@@ -50432,29 +50254,35 @@
 +		     && LITTLE_ENDIAN)
 +	      bogus endian macros
 +	     #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
 +  ;
 +  return 0;
 +}
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  # It does; now see whether it defined to BIG_ENDIAN or not.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
++/* end confdefs.h.  */
 +#include <sys/types.h>
 +		#include <sys/param.h>
  
  int
  main ()
  {
--struct stat64 st64; exit(fstat64(0,&st64));
+-return $ac_func ();
 +#if BYTE_ORDER != BIG_ENDIAN
 +		 not big endian
 +		#endif
@@ -50484,183 +50312,131 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_func_fstat64=yes
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_bigendian=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	eval "$as_ac_var=no"
+-fi
 -
-+  ac_cv_c_bigendian=no
- fi
--
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
--$as_echo "$ac_cv_func_fstat64" >&6; }
--  if test x$ac_cv_func_fstat64 = xyes ; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FSTAT64 1
++  ac_cv_c_bigendian=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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
--  fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-done
 -
--#################################################
--# Check whether struct stat has timestamps with sub-second resolution.
--#
 -
--samba_cv_stat_hires=no
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+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
+-
+-
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +    fi
 +    if test $ac_cv_c_bigendian = unknown; then
 +      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
++/* end confdefs.h.  */
 +#include <limits.h>
-+
- int
- main ()
- {
--static struct stat ac_aggr;
--if (ac_aggr.st_mtim.tv_nsec)
--return 0;
+ 
++int
++main ()
++{
 +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 +	      bogus endian macros
 +	     #endif
-+
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+ 
+-for ac_func in pread _pread __pread pread64 _pread64 __pread64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++  ;
++  return 0;
++}
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  # It does; now see whether it defined to _BIG_ENDIAN or not.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_includes_default
+-/* 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
 +#include <limits.h>
-+
- int
- main ()
- {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtim.tv_nsec)
--return 0;
+ 
+-#undef $ac_func
++int
++main ()
++{
 +#ifndef _BIG_ENDIAN
 +		 not big endian
 +		#endif
-+
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+ 
+-/* 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
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_bigendian=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
++else
 +  ac_cv_c_bigendian=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
--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
--
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
--$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtimensec+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
++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
 +    if test $ac_cv_c_bigendian = unknown; then
 +      # Compile a test program.
 +      if test "$cross_compiling" = yes; then :
 +  # Try to guess by grepping values from an object file.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
++/* end confdefs.h.  */
 +short int ascii_mm[] =
 +		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +		short int ascii_ii[] =
@@ -50676,37 +50452,16 @@
 +		  return ebcdic_mm[i] + ebcdic_ii[i];
 +		}
 +		extern int foo;
-+
+ 
  int
  main ()
  {
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimensec)
--return 0;
+-return $ac_func ();
 +return use_ascii (foo) == use_ebcdic (foo);
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtimensec=yes
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 +	      ac_cv_c_bigendian=yes
@@ -50721,24 +50476,13 @@
 +	    fi
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimensec)
--return 0;
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
 +
 +	     /* Are we little or big endian?  From Harbison&Steele.  */
 +	     union
@@ -50753,15 +50497,15 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -50770,29 +50514,45 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtimensec=yes
+-       } && 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 :
 +  ac_cv_c_bigendian=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_mtimensec=no
+-	eval "$as_ac_var=no"
 +  ac_cv_c_bigendian=yes
  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 *.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
+-$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
  
--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_mtimensec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
+-done
+-
+-
+-
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 +$as_echo "$ac_cv_c_bigendian" >&6; }
 + case $ac_cv_c_bigendian in #(
@@ -50803,23 +50563,20 @@
 +      ;; #(
 +   universal)
  
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
--_ACEOF
 +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  
--# BSD, if defined _POSIX_SOURCE
--	samba_cv_stat_hires=yes
--fi
 +     ;; #(
 +   *)
 +     as_fn_error "unknown endianness
 + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
 + esac
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
+-for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
 +$as_echo_n "checking whether char is unsigned... " >&6; }
 +if test "${ac_cv_c_char_unsigned+set}" = set; then :
@@ -50832,13 +50589,42 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
+-/* 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
+-
++$ac_includes_default
  int
  main ()
  {
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimespec.tv_nsec)
--return 0;
+-return $ac_func ();
 +static int test_array [1 - 2 * !(((char) -1) < 0)];
 +test_array [0] = 0
 +
@@ -50846,15 +50632,15 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -50863,61 +50649,117 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+-       } && 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_c_char_unsigned=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  ac_cv_c_char_unsigned=yes
-+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_ext
-+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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
 +$as_echo "$ac_cv_c_char_unsigned" >&6; }
 +if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
 +  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
  
--	cat >conftest.$ac_ext <<_ACEOF
+ fi
+-done
+-
+-
+-
+ 
+ 
+-for ac_func in open64 _open64 __open64 creat64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++{ $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 >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+fi
-+
-+
-+{ $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.  */
--$ac_includes_default
+-/* 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
 +#include <sys/types.h>
 +#include <signal.h>
-+
+ 
  int
  main ()
  {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimespec.tv_nsec)
--return 0;
+-return $ac_func ();
 +return *(signal (0, 0)) (0) == 1;
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -50926,122 +50768,389 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+-       } && 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_type_signal=int
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  ac_cv_type_signal=void
-+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_ext
-+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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
 +$as_echo "$ac_cv_type_signal" >&6; }
-+
+ 
+-fi
+-done
 +cat >>confdefs.h <<_ACEOF
 +#define RETSIGTYPE $ac_cv_type_signal
 +_ACEOF
-+
  
--	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
+ 
+-for ac_func in prctl
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +{ $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 :
-+  $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.  */
+ /* 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
 +#include <sys/types.h>
-+
-+_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 (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "uid_t" >/dev/null 2>&1; then :
 +  ac_cv_type_uid_t=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +  ac_cv_type_uid_t=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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
 +rm -f conftest*
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-done
 +{ $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
-+
+ 
 +$as_echo "#define uid_t int" >>confdefs.h
-+
-+
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-#ifdef HAVE_SYS_PRCTL_H
+-#include <sys/prctl.h>
+-#endif
 +$as_echo "#define gid_t int" >>confdefs.h
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
-+
+-int
+-main ()
+-{
+-int i; i = prtcl(0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRCTL 1
+-_ACEOF
 +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 :
-+
-+else
  
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
++cat >>confdefs.h <<_ACEOF
 +#define mode_t int
- _ACEOF
++_ACEOF
  
--# BSD, if not defined _POSIX_SOURCE
--	samba_cv_stat_hires=yes
  fi
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
--$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
--  $as_echo_n "(cached) " >&6
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +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 :
-+
+ 
+-#
+-#
+-#
+-case "$host_os" in
+-    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
+-       # glibc <= 2.3.2 has a broken getgrouplist
+-       { $as_echo "$as_me:$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 >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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);
+-}
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define off_t long int
  _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  samba_cv_linux_getgrouplist_ok=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_linux_getgrouplist_ok=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
++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 :
+ 
+-fi
+-{ $as_echo "$as_me:$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
++else
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETGROUPLIST 1
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
+ _ACEOF
+ 
+-       fi
+-       ;;
+-    *)
++fi
+ 
+-for ac_func in getgrouplist
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-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.  */
--$ac_includes_default
+-/* 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_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 :
+ 
+-/* 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
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
++_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.  */
+-#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
++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 :
+ 
 -int
 -main ()
 -{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtime_n)
--return 0;
+-return $ac_func ();
 -  ;
 -  return 0;
 -}
-+
-+fi
-+
-+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 size_t unsigned int
++#define HAVE_STRUCT_STAT_ST_RDEV 1
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -51050,41 +51159,52 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtime_n=yes
-+
-+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 :
-+
- else
+-       } && 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
  
--	cat >conftest.$ac_ext <<_ACEOF
+-	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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
+ 
+ fi
+-done
+-
+-       ;;
+-esac
+ 
+-#
+-# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
+-#
+ 
+-if test x$ac_cv_func_stat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
-+
-+fi
-+
-+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 :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
-+fi
-+
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
 +$as_echo_n "checking for d_off in dirent... " >&6; }
 +if test "${ac_cv_dirent_d_off+set}" = set; then :
@@ -51092,31 +51212,32 @@
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_includes_default
-+
-+#include <unistd.h>
+ 
+-#if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+-#endif
+-#include <sys/stat.h>
+-
 +#include <sys/types.h>
 +#include <dirent.h>
  int
  main ()
  {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtime_n)
--return 0;
+-struct stat64 st64; exit(stat64(".",&st64));
 +struct dirent d; d.d_off;
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -51125,92 +51246,138 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtime_n=yes
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_stat64=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_dirent_d_off=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_member_struct_stat_st_mtime_n=no
 +  ac_cv_dirent_d_off=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_off" >&5
 +$as_echo "$ac_cv_dirent_d_off" >&6; }
 +if test $ac_cv_dirent_d_off = yes; then
-+
+ 
 +$as_echo "#define HAVE_DIRENT_D_OFF 1" >>confdefs.h
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtime_n" = 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 "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
+-$as_echo "$ac_cv_func_stat64" >&6; }
+-  if test x$ac_cv_func_stat64 = xyes ; then
 +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
 +if test "x$ac_cv_type_ssize_t" = x""yes; then :
 +
 +else
  
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT64 1
++cat >>confdefs.h <<_ACEOF
 +#define ssize_t int
  _ACEOF
  
--# AIX
--	samba_cv_stat_hires=yes
+-  fi
  fi
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
--$as_echo_n "checking for struct stat.st_umtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
-+if test "x$ac_cv_type_wchar_t" = x""yes; then :
-+
- else
+-if test x$ac_cv_func_lstat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
+-
+-#if defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+-#endif
+-#include <sys/stat.h>
++ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
++if test "x$ac_cv_type_wchar_t" = x""yes; then :
+ 
 -int
 -main ()
 -{
--static struct stat ac_aggr;
--if (ac_aggr.st_umtime)
--return 0;
+-struct stat64 st64; exit(lstat64(".",&st64));
 -  ;
 -  return 0;
 -}
-+
-+cat >>confdefs.h <<_ACEOF
-+#define wchar_t unsigned short
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-_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;;
-+
-+fi
-+
-+
+-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_lstat64=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
++cat >>confdefs.h <<_ACEOF
++#define wchar_t unsigned short
++_ACEOF
+ 
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
+-$as_echo "$ac_cv_func_lstat64" >&6; }
+-  if test x$ac_cv_func_lstat64 = xyes ; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LSTAT64 Whether lstat64() is available
+-_ACEOF
+ 
+-  fi
 +############################################
 +# for cups support we need libcups, and a handful of header files
 +
 +# Check whether --enable-cups was given.
 +if test "${enable_cups+set}" = set; then :
 +  enableval=$enable_cups;
-+fi
-+
-+
+ fi
+ 
+-if test x$ac_cv_func_fstat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-#if defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+-#endif
+-#include <sys/stat.h>
 +if test x$enable_cups != xno; then
 +	# Extract the first word of "cups-config", so it can be a program name with args.
 +set dummy cups-config; ac_word=$2
@@ -51238,12 +51405,25 @@
 +done
 +  done
 +IFS=$as_save_IFS
-+
+ 
+-int
+-main ()
+-{
+-struct stat64 st64; exit(fstat64(0,&st64));
+-  ;
+-  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_compile") 2>conftest.er1
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -51252,8 +51432,11 @@
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_umtime=yes
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_fstat64=yes
 +fi
 +CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
 +if test -n "$CUPS_CONFIG"; then
@@ -51266,12 +51449,19 @@
 +$as_echo "no" >&6; }
 +fi
  
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+
-+
+ 
+-fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
+-$as_echo "$ac_cv_func_fstat64" >&6; }
+-  if test x$ac_cv_func_fstat64 = xyes ; then
 +        if test "x$CUPS_CONFIG" != x; then
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FSTAT64 1
 +		ac_save_CFLAGS=$CFLAGS
 +		ac_save_LDFLAGS=$LDFLAGS
 +		ac_save_PRINT_LIBS=$PRINT_LIBS
@@ -51287,13 +51477,19 @@
 +  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
-+
-+fi
-+
+ 
+-  fi
+ fi
+ 
+-#################################################
+-# Check whether struct stat has timestamps with sub-second resolution.
+-#
 +done
-+
+ 
+-samba_cv_stat_hires=no
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
 +		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
 +		        x"$ac_cv_header_cups_language_h" = xyes; then
 +
@@ -51310,8 +51506,13 @@
 +        { $as_echo "$as_me:${as_lineno-$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
-+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.  */
 -$ac_includes_default
@@ -51327,7 +51528,7 @@
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_umtime)
+-if (ac_aggr.st_mtim.tv_nsec)
 -return 0;
 +return httpConnectEncrypt ();
    ;
@@ -51352,7 +51553,7 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_umtime=yes
+-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
 +		  ac_cv_lib_ext_cups=yes
@@ -51364,14 +51565,29 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 +fi
 +{ $as_echo "$as_me:${as_lineno-$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
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_mtim.tv_nsec)
+-return 0;
+-  ;
+-  return 0;
+-}
 +
 +fi
 +LIBS=$ac_check_lib_ext_save_LIBS
@@ -51379,8 +51595,31 @@
 +if test $ac_cv_lib_ext_cups = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBCUPS 1
-+_ACEOF
-+
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
 +		case "$PRINT_LIBS" in
 +		    *-lcups*)
 +			;;
@@ -51388,11 +51627,8 @@
 +			PRINT_LIBS="-lcups $PRINT_LIBS"
 +			;;
 +		esac
- 
--	ac_cv_member_struct_stat_st_umtime=no
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
  fi
 +		else
 +			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups-config around but cups-devel not installed" >&5
@@ -51407,40 +51643,35 @@
 +		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
--
--# Tru64
--	samba_cv_stat_hires=yes
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +# Check whether --enable-iprint was given.
 +if test "${enable_iprint+set}" = set; then :
 +  enableval=$enable_iprint;
  fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
+-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
  
--if test x"$samba_cv_stat_hires" = x"yes" ; then
+-# Linux, Solaris
+-	samba_cv_stat_hires=yes
 +if test x$enable_iprint != xno; then
 +	if test x"$samba_cv_HAVE_CUPS" = xyes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_HIRES_TIMESTAMPS 1
--_ACEOF
++
 +$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
- 
++
 +	elif test x"$enable_iprint" = x"yes"; then
 +		as_fn_error "iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
 +        fi
  fi
  
--# recent FreeBSD, NetBSD have creation timestamps called birthtime:
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimespec.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_birthtimespec.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtimespec_tv_nsec+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
+-$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
 +############################################
 +# check if the compiler will optimize out function calls
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
@@ -51463,7 +51694,7 @@
  main ()
  {
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtimespec.tv_nsec)
+-if (ac_aggr.st_mtimensec)
 -return 0;
 +
 +		if (0) {
@@ -51495,7 +51726,7 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-  ac_cv_member_struct_stat_st_mtimensec=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  samba_cv_optimize_out_funcation_calls=yes
  else
@@ -51540,7 +51771,7 @@
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
+-if (sizeof ac_aggr.st_mtimensec)
 -return 0;
 +
 +	struct msghdr msg;
@@ -51573,40 +51804,41 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-  ac_cv_member_struct_stat_st_mtimensec=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_msghdr_msg_control=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
+-	ac_cv_member_struct_stat_st_mtimensec=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  samba_cv_msghdr_msg_control=no
  fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
--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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
 +{ $as_echo "$as_me:${as_lineno-$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
  
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
+-_ACEOF
 +$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
  
+-# BSD, if defined _POSIX_SOURCE
+-	samba_cv_stat_hires=yes
  fi
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
--$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
 +#############################################
 +# check for fd passing struct via msg_acctrights
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
@@ -51625,7 +51857,7 @@
 -main ()
 -{
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtime)
+-if (ac_aggr.st_mtimespec.tv_nsec)
 -return 0;
 -  ;
 -  return 0;
@@ -51649,7 +51881,7 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtime=yes
+-  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -51672,7 +51904,7 @@
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtime)
+-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
 -return 0;
 +
 +	struct msghdr msg;
@@ -51702,14 +51934,14 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtime=yes
+-  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_msghdr_msg_acctrights=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_birthtime=no
+-	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
 +  samba_cv_msghdr_msg_acctrights=no
  fi
 -
@@ -51723,12 +51955,12 @@
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
--if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
  
 -cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
 +for ac_func in dirfd
 +do :
 +  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
@@ -51737,16 +51969,18 @@
 +#define HAVE_DIRFD 1
  _ACEOF
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimensec" >&5
--$as_echo_n "checking for struct stat.st_birthtimensec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtimensec+set}" = set; then
+-# BSD, if not defined _POSIX_SOURCE
+-	samba_cv_stat_hires=yes
 +fi
 +done
 +
 +if test x"$ac_cv_func_dirfd" = x"yes"; then
 +	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+fi
-+
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
+-$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
 +$as_echo_n "checking for struct sigevent type... " >&6; }
 +if test "${samba_cv_struct_sigevent+set}" = set; then :
@@ -51763,7 +51997,7 @@
 -main ()
 -{
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtimensec)
+-if (ac_aggr.st_mtime_n)
 -return 0;
 -  ;
 -  return 0;
@@ -51787,7 +52021,7 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimensec=yes
+-  ac_cv_member_struct_stat_st_mtime_n=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -51811,7 +52045,7 @@
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimensec)
+-if (sizeof ac_aggr.st_mtime_n)
 -return 0;
 +struct sigevent s;
    ;
@@ -51836,14 +52070,14 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimensec=yes
+-  ac_cv_member_struct_stat_st_mtime_n=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_struct_sigevent=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_birthtimensec=no
+-	ac_cv_member_struct_stat_st_mtime_n=no
 +  samba_cv_struct_sigevent=no
  fi
 -
@@ -51852,47 +52086,86 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_sigevent" >&5
 +$as_echo "$samba_cv_struct_sigevent" >&6; }
 +if test x"$samba_cv_struct_sigevent" = x"yes"; then
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimensec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtimensec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then
++
 +$as_echo "#define HAVE_STRUCT_SIGEVENT 1" >>confdefs.h
 +
 +   ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
 +"
 +if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
++
++cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
- _ACEOF
++_ACEOF
++
  
- 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
 +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
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIME_N 1
 +#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+_ACEOF
+ _ACEOF
  
- 
+-# AIX
+-	samba_cv_stat_hires=yes
++
 +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
 +
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
+-$as_echo_n "checking for struct stat.st_umtime... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
 +{ $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 :
    $as_echo_n "(cached) " >&6
  else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static struct stat ac_aggr;
+-if (ac_aggr.st_umtime)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_umtime=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -51901,7 +52174,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <sys/stat.h>
+-$ac_includes_default
 +
 +#include <sys/types.h>
 +#if STDC_HEADERS
@@ -51922,14 +52195,9 @@
  int
  main ()
  {
--
--		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;
--
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_umtime)
+-return 0;
 +struct timespec ts;
    ;
    return 0;
@@ -51953,71 +52221,41 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  samba_cv_stat_dos_flags=yes
+-  ac_cv_member_struct_stat_st_umtime=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_struct_timespec=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	samba_cv_stat_dos_flags=no
+-	ac_cv_member_struct_stat_st_umtime=no
 +  samba_cv_struct_timespec=no
  fi
 -
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
  fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
--$as_echo "$samba_cv_stat_dos_flags" >&6; }
--
--if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_timespec" >&5
 +$as_echo "$samba_cv_struct_timespec" >&6; }
 +if test x"$samba_cv_struct_timespec" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_DOS_FLAGS 1
--_ACEOF
++
 +$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
  
+-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
  
--#####################################
--# needed for SRV lookups
--
--{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
--$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_UMTIME 1
 +# and glibc has setresuid under linux but the function does
 +# nothing until kernel 2.1.44! very dumb.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
 +$as_echo_n "checking for real setresuid... " >&6; }
 +if test "${samba_cv_have_setresuid+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* 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 dn_expand ();
--int
--main ()
--{
--return dn_expand ();
--  ;
--  return 0;
--}
++  $as_echo_n "(cached) " >&6
++else
++
 +    if test "$cross_compiling" = yes; then :
 +  samba_cv_have_setresuid=cross
 +else
@@ -52026,95 +52264,37 @@
 +#include <errno.h>
 +main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0: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
--  ac_cv_lib_resolv_dn_expand=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  samba_cv_have_setresuid=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv_dn_expand=no
++else
 +  samba_cv_have_setresuid=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
  
--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
+-# Tru64
+-	samba_cv_stat_hires=yes
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
--_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresuid" >&5
 +$as_echo "$samba_cv_have_setresuid" >&6; }
 +if test x"$samba_cv_have_setresuid" = x"yes"; then
  
--  LIBS="-lresolv $LIBS"
 +$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
  
- fi
- 
--
--{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
--$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
+-if test x"$samba_cv_stat_hires" = x"yes" ; then
++fi
++
 +# Do the same check for setresguid...
 +#
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresgid" >&5
 +$as_echo_n "checking for real setresgid... " >&6; }
 +if test "${samba_cv_have_setresgid+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  $as_echo_n "(cached) " >&6
++else
  
--/* 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 _dn_expand ();
--int
--main ()
--{
--return _dn_expand ();
--  ;
--  return 0;
--}
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT_HIRES_TIMESTAMPS 1
 +    if test "$cross_compiling" = yes; then :
 +  samba_cv_have_setresgid=cross
 +else
@@ -52124,73 +52304,34 @@
 +#include <errno.h>
 +main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 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_lib_resolv__dn_expand=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  samba_cv_have_setresgid=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv__dn_expand=no
++else
 +  samba_cv_have_setresgid=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
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
--_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresgid" >&5
 +$as_echo "$samba_cv_have_setresgid" >&6; }
 +if test x"$samba_cv_have_setresgid" = x"yes"; then
  
--  LIBS="-lresolv $LIBS"
+-# recent FreeBSD, NetBSD have creation timestamps called birthtime:
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimespec.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_birthtimespec.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtimespec_tv_nsec+set}" = set; then
 +$as_echo "#define HAVE_SETRESGID 1" >>confdefs.h
- 
- fi
- 
--
--{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
--$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
++
++fi
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
 +$as_echo_n "checking for working memcmp... " >&6; }
 +if test "${ac_cv_func_memcmp_working+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -52200,19 +52341,13 @@
 +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 __dn_expand ();
-+$ac_includes_default
+ $ac_includes_default
  int
  main ()
  {
--return __dn_expand ();
+-static struct stat ac_aggr;
+-if (ac_aggr.st_birthtimespec.tv_nsec)
+-return 0;
 +
 +  /* Some versions of memcmp are not 8-bit clean.  */
 +  char c0 = '\100', c1 = '\200', c2 = '\201';
@@ -52242,15 +52377,15 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -52259,35 +52394,36 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_lib_resolv___dn_expand=yes
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  ac_cv_func_memcmp_working=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv___dn_expand=no
 +  ac_cv_func_memcmp_working=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
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
+-return 0;
+-  ;
+-  return 0;
+-}
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
 +$as_echo "$ac_cv_func_memcmp_working" >&6; }
 +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -52295,20 +52431,13 @@
 +  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 + ;;
 +esac
- 
--  LIBS="-lresolv $LIBS"
- 
--fi
- 
++
++
++
 +###############################################
 +# Readline included by default unless explicitly asked not to
 +test "${with_readline+set}" != "set" && with_readline=yes
- 
--#
--# Check for the functions putprpwnam, set_auth_parameters,
--# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
--# Needed for OSF1 and HPUX.
--#
++
 +# test for where we get readline() from
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
 +$as_echo_n "checking whether to use readline... " >&6; }
@@ -52319,7 +52448,7 @@
 +  yes)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
- 
++
 +    for ac_header in readline.h history.h readline/readline.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52328,20 +52457,35 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
-+fi
+-	ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
+ fi
  
--for ac_func in putprpwnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--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.  */
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 +done
 +
 +    for ac_header in readline/history.h
@@ -52350,29 +52494,21 @@
 +if test "x$ac_cv_header_readline_history_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_READLINE_HISTORY_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
++_ACEOF
  
--/* 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:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
+-_ACEOF
 +done
  
--#undef $ac_func
-+
+ 
+-fi
 +    for ac_header in readline.h readline/readline.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52382,52 +52518,55 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
+-$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
 +      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:${as_lineno-$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
+   $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="-l${termlib}  $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
-@@ -47290,100 +14524,41 @@
- #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
--
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++/* 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 tgetent ();
  int
  main ()
  {
--return $ac_func ();
+-static struct stat ac_aggr;
+-if (ac_aggr.st_birthtime)
+-return 0;
 +return tgetent ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -52436,112 +52575,71 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtime=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  eval "$as_ac_Lib=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  eval "$as_ac_Lib=no"
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++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
++fi
 +eval ac_res=\$$as_ac_Lib
 +	       { $as_echo "$as_me:${as_lineno-$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
--
--        # putprpwnam was found in libc or existing $LIBS
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
--
--
--
--else
--
--        # putprpwnam was not found, try adding libsecurity
--	case " $LIBS " in
--          *\ -lsecurity\ *)
--
--		    # putprpwnam was not found and we already had libsecurity
--		    # nothing to do here by default
--		    true
++$as_echo "$ac_res" >&6; }
 +eval as_val=\$$as_ac_Lib
 +   if test "x$as_val" = x""yes; then :
 +  TERMLIBS="-l${termlib}"; break
 +fi
  
--	    ;;
--          *)
--	    # putprpwnam was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
--$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
-+      done
-+      { $as_echo "$as_me:${as_lineno-$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
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++      done
++      { $as_echo "$as_me:${as_lineno-$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
++  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lreadline $TERMLIBS $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -47392,111 +14567,106 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char putprpwnam ();
+-$ac_includes_default
++
++/* 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 rl_callback_handler_install ();
  int
  main ()
  {
--return putprpwnam ();
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtime)
+-return 0;
 +return rl_callback_handler_install ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -52550,53 +52648,38 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_lib_security_putprpwnam=yes
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtime=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_readline_rl_callback_handler_install=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_security_putprpwnam=no
 +  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
++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:$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"
++LIBS=$ac_check_lib_save_LIBS
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
 +$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
 +if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
 +  TERMLIBS="-lreadline $TERMLIBS"
- 
++
 +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
+-	ac_cv_member_struct_stat_st_birthtime=no
 +       break
 +else
 +  TERMLIBS=
-+fi
+ 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
 +done
- 
--else
++
 +    ;;
 +  no)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -52605,19 +52688,16 @@
 +  *)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
- 
++
 +    # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
 +    # alternate readline path
 +    _ldflags=${LDFLAGS}
 +    _cppflags=${CPPFLAGS}
- 
--			# putprpwnam was not found in libsecurity
--			# nothing to do here by default
--			true
++
 +    # Add additional search path
 +    LDFLAGS="-L$with_readline/lib $LDFLAGS"
 +    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
- 
++
 +    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`
@@ -52627,11 +52707,14 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
- 
++
  fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
  
--	  ;;
--        esac
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
 +done
 +
 +    for ac_header in readline/history.h
@@ -52640,14 +52723,16 @@
 +if test "x$ac_cv_header_readline_history_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_READLINE_HISTORY_H 1
-+_ACEOF
+ _ACEOF
  
- fi
--done
- 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimensec" >&5
+-$as_echo_n "checking for struct stat.st_birthtimensec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtimensec+set}" = set; then
++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`
@@ -52657,13 +52742,7 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
- 
--for ac_func in putprpwnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++
 +      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:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
@@ -52680,56 +52759,35 @@
 +LIBS="-l${termlib}  $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
--
--#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -47504,100 +14674,41 @@
- #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
--
+-$ac_includes_default
++
++/* 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 tgetent ();
  int
  main ()
  {
--return $ac_func ();
+-static struct stat ac_aggr;
+-if (ac_aggr.st_birthtimensec)
+-return 0;
 +return tgetent ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -52738,112 +52796,71 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtimensec=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  eval "$as_ac_Lib=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  eval "$as_ac_Lib=no"
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++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
++fi
 +eval ac_res=\$$as_ac_Lib
 +	       { $as_echo "$as_me:${as_lineno-$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
--
--        # putprpwnam was found in libc or existing $LIBS
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
--
--
--
--else
--
--        # putprpwnam was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
--
--		    # putprpwnam was not found and we already had libsec
--		    # nothing to do here by default
--		    true
++$as_echo "$ac_res" >&6; }
 +eval as_val=\$$as_ac_Lib
 +   if test "x$as_val" = x""yes; then :
 +  TERMLIBS="-l${termlib}"; break
 +fi
  
--	    ;;
--          *)
--	    # putprpwnam was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
--$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
-+      done
-+      { $as_echo "$as_me:${as_lineno-$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
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++      done
++      { $as_echo "$as_me:${as_lineno-$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
++  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lreadline $TERMLIBS $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -47606,112 +14717,68 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char putprpwnam ();
+-$ac_includes_default
++
++/* 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 rl_callback_handler_install ();
  int
  main ()
  {
--return putprpwnam ();
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtimensec)
+-return 0;
 +return rl_callback_handler_install ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -52852,39 +52869,21 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_lib_sec_putprpwnam=yes
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_member_struct_stat_st_birthtimensec=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_readline_rl_callback_handler_install=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_sec_putprpwnam=no
+-	ac_cv_member_struct_stat_st_birthtimensec=no
 +  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
++fi
 +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_putprpwnam" >&5
--$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
--if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
--
--		LIBS="-lsec $LIBS"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
--
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
 +$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
 +if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
@@ -52893,25 +52892,27 @@
 +       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
 +       TERMLIBS="-lreadline $TERMLIBS"
  
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
- 
++
 +       break
- else
++else
 +  TERMLIBS= CPPFLAGS=$_cppflags
-+fi
+ fi
  
-+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_birthtimensec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtimensec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then
  
--			# putprpwnam was not found in libsec
--			# nothing to do here by default
--			true
--
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
+-_ACEOF
 +done
  
--fi
  
--	  ;;
--        esac
+-fi
 +    LDFLAGS=$_ldflags
 +    ;;
 +  esac
@@ -52920,18 +52921,13 @@
 +$as_echo "no" >&6; }
  
  fi
--done
--
  
  
  
- 
--for ac_func in set_auth_parameters
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-{ $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
++
 +# 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.
@@ -52940,7 +52936,8 @@
 +if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
+-
+-	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -52949,56 +52946,40 @@
 +LIBS="-lreadline $TERMLIBS $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
--
--#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -47719,100 +14786,54 @@
- #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 <sys/stat.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 rl_completion_matches ();
  int
  main ()
  {
--return $ac_func ();
+-
+-		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 rl_completion_matches ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -53007,86 +52988,112 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
+-  samba_cv_stat_dos_flags=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_readline_rl_completion_matches=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	samba_cv_stat_dos_flags=no
 +  ac_cv_lib_readline_rl_completion_matches=no
  fi
 -
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
+-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
 +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
--$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:$LINENO: result: $samba_cv_stat_dos_flags" >&5
+-$as_echo "$samba_cv_stat_dos_flags" >&6; }
 -
--        # set_auth_parameters was found in libc or existing $LIBS
--
+-if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
 +{ $as_echo "$as_me:${as_lineno-$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 :
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_STAT_DOS_FLAGS 1
 -_ACEOF
 +$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
  
-+fi
+ fi
  
+-{ $as_echo "$as_me:$LINENO: checking whether we can compile with __attribute__((destructor))" >&5
+-$as_echo_n "checking whether we can compile with __attribute__((destructor))... " >&6; }
+-if test "${samba_cv_function_attribute_destructor+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-	         cat >conftest.$ac_ext <<_ACEOF
+-
+-				__attribute__((destructor))
+-				static void cleanup(void) { }
  
+-_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
+-  samba_cv_function_attribute_destructor=yes
 +# not all readline libs have rl_event_hook or history_list
 +ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
 +"
 +if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
 +  ac_have_decl=1
  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
+-
 +  ac_have_decl=0
-+fi
- 
--        # set_auth_parameters was not found, try adding libsecurity
--	case " $LIBS " in
--          *\ -lsecurity\ *)
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_function_attribute_destructor" >&5
+-$as_echo "$samba_cv_function_attribute_destructor" >&6; }
 -
--		    # set_auth_parameters was not found and we already had libsecurity
--		    # nothing to do here by default
--		    true
+-if test x"$samba_cv_function_attribute_destructor" = xyes ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
-+_ACEOF
+ _ACEOF
  
--	    ;;
--          *)
--	    # set_auth_parameters was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
--$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
+-fi
+-
+-#####################################
+-# needed for SRV lookups
+-
+-{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$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 :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
+-LIBS="-lresolv  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -53097,16 +53104,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47821,111 +14842,43 @@
+@@ -47550,73 +14933,42 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char set_auth_parameters ();
+-char dn_expand ();
 +char history_list ();
  int
  main ()
  {
--return set_auth_parameters ();
+-return dn_expand ();
 +return history_list ();
    ;
    return 0;
@@ -53133,14 +53140,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_set_auth_parameters=yes
+-  ac_cv_lib_resolv_dn_expand=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_readline_history_list=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_security_set_auth_parameters=no
+-	ac_cv_lib_resolv_dn_expand=no
 +  ac_cv_lib_readline_history_list=no
  fi
 -
@@ -53151,48 +53158,25 @@
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
--
--		LIBS="-lsecurity $LIBS"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
 -_ACEOF
--
--
--
--else
--
--
--			# set_auth_parameters was not found in libsecurity
--			# nothing to do here by default
--			true
--
--
--fi
 +{ $as_echo "$as_me:${as_lineno-$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 :
  
--	  ;;
--        esac
+-  LIBS="-lresolv $LIBS"
 +$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
  
  fi
--done
--
--
  
  
--for ac_func in set_auth_parameters
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
+-$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
 +###############################################
 +# test for where we get yp_get_default_domain() from
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_get_default_domain" >&5
@@ -53200,7 +53184,9 @@
 +if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -53208,42 +53194,18 @@
 +  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
--
--#undef $ac_func
  
  /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -47933,316 +14886,299 @@
+@@ -47625,73 +14977,147 @@
  #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 ();
 +char yp_get_default_domain ();
  int
  main ()
  {
--return $ac_func ();
+-return _dn_expand ();
 +return yp_get_default_domain ();
    ;
    return 0;
@@ -53270,10 +53232,7 @@
 -	 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
+-  ac_cv_lib_resolv__dn_expand=yes
 +for ac_lib in '' nsl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -53291,69 +53250,61 @@
 +fi
 +done
 +if test "${ac_cv_search_yp_get_default_domain+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_yp_get_default_domain=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_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"
  
+-	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
--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
-+
+-LIBS=$ac_check_lib_save_LIBS
 +for ac_func in yp_get_default_domain
 +do :
 +  ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
 +if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_YP_GET_DEFAULT_DOMAIN 1
- _ACEOF
- 
--        # set_auth_parameters was found in libc or existing $LIBS
-+fi
++_ACEOF
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
 +done
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
++
++
 +# Check if we have execl, if not we need to compile smbrun.
 +for ac_func in execl
 +do :
 +  ac_fn_c_check_func "$LINENO" "execl" "ac_cv_func_execl"
 +if test "x$ac_cv_func_execl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
 +#define HAVE_EXECL 1
  _ACEOF
  
+-  LIBS="-lresolv $LIBS"
 +fi
 +done
- 
++
 +if test x"$ac_cv_func_execl" = x"no"; then
 +    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
 +fi
- 
--else
--
--        # set_auth_parameters was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
++
 +for ac_func in getcwd fchown chmod fchmod mknod mknod64
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53364,49 +53315,20 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--		    # set_auth_parameters was not found and we already had libsec
--		    # nothing to do here by default
--		    true
-+fi
+ fi
 +done
  
--	    ;;
--          *)
--	    # set_auth_parameters was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
--$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
--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="-lsec  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
 +for ac_func in strtol
 +do :
 +  ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
 +if test "x$ac_cv_func_strtol" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRTOL 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++_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 set_auth_parameters ();
--int
--main ()
--{
--return set_auth_parameters ();
--  ;
--  return 0;
--}
+-{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
+-$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
 +fi
 +done
 +
@@ -53418,6 +53340,70 @@
 +   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 getrlimit fsync setpgid
++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 fdatasync
++do :
++  ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
++if test "x$ac_cv_func_fdatasync" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_FDATASYNC 1
++_ACEOF
++
++else
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lrt $LIBS  $LIBS"
++
++
++
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
++$as_echo_n "checking for fdatasync in -lrt... " >&6; }
++if test "${ac_cv_lib_ext_rt_fdatasync+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $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.
+@@ -47700,200 +15126,228 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char __dn_expand ();
++char fdatasync ();
+ int
+ main ()
+ {
+-return __dn_expand ();
++return fdatasync ();
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -53440,36 +53426,48 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_set_auth_parameters=yes
--else
+-  ac_cv_lib_resolv___dn_expand=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_ext_rt_fdatasync=yes;
++		  ac_cv_lib_ext_rt=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_sec_set_auth_parameters=no
- fi
-+done
++  ac_cv_lib_ext_rt_fdatasync=no;
++		  ac_cv_lib_ext_rt=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
 +
-+for ac_func in getrlimit fsync fdatasync setpgid
-+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 :
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_fdatasync" >&5
++$as_echo "$ac_cv_lib_ext_rt_fdatasync" >&6; }
++    if test $ac_cv_lib_ext_rt_fdatasync = yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_FDATASYNC 1
 +_ACEOF
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
++
++fi
++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
++
++		case "$LIBS" in
++		    *-lrt*)
++			;;
++		    *)
++			LIBS="-lrt $LIBS"
++			;;
++		esac
++
++
++fi
++fi
 +done
- 
--		LIBS="-lsec $LIBS"
++
 +for ac_func in setsid glob strpbrk crypt16 getauthuid
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53479,12 +53477,10 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
 +done
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
++
 +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`
@@ -53493,11 +53489,11 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
++_ACEOF
++
 +fi
 +done
- 
++
 +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`
@@ -53508,24 +53504,32 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--else
-+fi
+-	ac_cv_lib_resolv___dn_expand=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
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
 +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`
 +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 HAVE_LIBRESOLV 1
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
  
--			# set_auth_parameters was not found in libsec
--			# nothing to do here by default
--			true
-+fi
+-  LIBS="-lresolv $LIBS"
+-
+ fi
 +done
  
 +for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
@@ -53538,11 +53542,14 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
- fi
+-#
+-# Check for the functions putprpwnam, set_auth_parameters,
+-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+-# Needed for OSF1 and HPUX.
+-#
++fi
 +done
  
--	  ;;
--        esac
 +for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53553,35 +53560,10 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
- fi
- done
- 
-+for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
-+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
  
--# UnixWare 7.x has its getspnam in -lgen
-+for ac_func in getpwent_r
-+do :
-+  ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
-+if test "x$ac_cv_func_getpwent_r" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETPWENT_R 1
-+_ACEOF
- 
-+fi
-+done
- 
--for ac_func in getspnam
+-for ac_func in putprpwnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -53591,12 +53573,14 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in getdents64
++for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
 +do :
-+  ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
-+if test "x$ac_cv_func_getdents64" = 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_GETDENTS64 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -53619,14 +53603,12 @@
 +done
  
 -#undef $ac_func
-+for ac_func in setenv strcasecmp fcvt fcvtl
++for ac_func in getpwent_r
 +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" "getpwent_r" "ac_cv_func_getpwent_r"
++if test "x$ac_cv_func_getpwent_r" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETPWENT_R 1
 +_ACEOF
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -53652,14 +53634,12 @@
 -  ;
 -  return 0;
 -}
-+for ac_func in syslog vsyslog timegm
++for ac_func in getdents64
 +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" "getdents64" "ac_cv_func_getdents64"
++if test "x$ac_cv_func_getdents64" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDENTS64 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -53702,7 +53682,7 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_func in setlocale nl_langinfo
++for ac_func in setenv strcasecmp fcvt fcvtl
 +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"
@@ -53712,49 +53692,73 @@
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
--        # getspnam was found in libc or existing $LIBS
--
+-        # putprpwnam was found in libc or existing $LIBS
 +fi
 +done
++
++for ac_func in syslog vsyslog timegm
++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
+ 
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_PUTPRPWNAM 1
++for ac_func in setlocale nl_langinfo
++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 nanosleep
 +do :
 +  ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
 +if test "x$ac_cv_func_nanosleep" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_NANOSLEEP 1
- _ACEOF
++_ACEOF
  
-+else
+ else
  
- 
--else
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lrt $LIBS  $LIBS"
- 
--        # getspnam was not found, try adding libgen
+-        # putprpwnam was not found, try adding libsecurity
 -	case " $LIBS " in
--          *\ -lgen\ *)
+-          *\ -lsecurity\ *)
  
--		    # getspnam was not found and we already had libgen
+-		    # putprpwnam was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lrt $LIBS  $LIBS"
  
 -	    ;;
 -          *)
--	    # getspnam was not found, try adding libgen
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
--$as_echo_n "checking for getspnam in -lgen... " >&6; }
--if test "${ac_cv_lib_gen_getspnam+set}" = set; then
+-	    # putprpwnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
++
++
 +        { $as_echo "$as_me:${as_lineno-$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_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgen  $LIBS"
+-LIBS="-lsecurity  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -53764,16 +53768,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48251,112 +15187,179 @@
+@@ -47902,111 +15356,181 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getspnam ();
+-char putprpwnam ();
 +char nanosleep ();
  int
  main ()
  {
--return getspnam ();
+-return putprpwnam ();
 +return nanosleep ();
    ;
    return 0;
@@ -53800,7 +53804,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_gen_getspnam=yes
+-  ac_cv_lib_security_putprpwnam=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_rt_nanosleep=yes;
 +		  ac_cv_lib_ext_rt=yes
@@ -53813,7 +53817,7 @@
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
--	ac_cv_lib_gen_getspnam=no
+-	ac_cv_lib_security_putprpwnam=no
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_nanosleep" >&5
 +$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
@@ -53827,12 +53831,12 @@
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
--$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
--if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
 +LIBS=$ac_check_lib_ext_save_LIBS
  
--		LIBS="-lgen $LIBS"
+-		LIBS="-lsecurity $LIBS"
 +if test $ac_cv_lib_ext_rt = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBRT 1
@@ -53848,17 +53852,19 @@
  
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_PUTPRPWNAM 1
 +fi
 +fi
 +done
 +
-+for ac_func in utimensat
++for ac_func in lutimes futimes utimensat futimens
 +do :
-+  ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
-+if test "x$ac_cv_func_utimensat" = 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_UTIMENSAT 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
 +fi
@@ -53888,7 +53894,7 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--			# getspnam was not found in libgen
+-			# putprpwnam was not found in libsecurity
 -			# nothing to do here by default
 -			true
 +fi
@@ -53931,7 +53937,7 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
 +done
  
@@ -53948,7 +53954,7 @@
 +fi
 +done
  
--for ac_func in getspnam
+-for ac_func in putprpwnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -54013,7 +54019,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48364,100 +15367,66 @@
+@@ -48014,100 +15538,66 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54094,7 +54100,7 @@
 +done
 +if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
  
--        # getspnam was found in libc or existing $LIBS
+-        # putprpwnam was found in libc or existing $LIBS
 +else
 +  ac_cv_search_backtrace_symbols=no
 +fi
@@ -54110,7 +54116,7 @@
 +fi
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_PUTPRPWNAM 1
 +for ac_func in backtrace_symbols
 +do :
 +  ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
@@ -54125,27 +54131,27 @@
 -
 -else
 -
--        # getspnam was not found, try adding libsecurity
+-        # putprpwnam was not found, try adding libsec
 -	case " $LIBS " in
--          *\ -lsecurity\ *)
+-          *\ -lsec\ *)
 -
--		    # getspnam was not found and we already had libsecurity
+-		    # putprpwnam was not found and we already had libsec
 -		    # nothing to do here by default
 -		    true
 -
 -	    ;;
 -          *)
--	    # getspnam was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
--$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_getspnam+set}" = set; then
+-	    # putprpwnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
+-$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trace_back_stack in -lexc" >&5
 +$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
 +if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
+-LIBS="-lsec  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54156,16 +54162,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48466,212 +15435,191 @@
+@@ -48116,326 +15606,218 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getspnam ();
+-char putprpwnam ();
 +char trace_back_stack ();
  int
  main ()
  {
--return getspnam ();
+-return putprpwnam ();
 +return trace_back_stack ();
    ;
    return 0;
@@ -54192,14 +54198,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_getspnam=yes
+-  ac_cv_lib_sec_putprpwnam=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_exc_trace_back_stack=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_security_getspnam=no
+-	ac_cv_lib_sec_putprpwnam=no
 +  ac_cv_lib_exc_trace_back_stack=no
  fi
 -
@@ -54210,15 +54216,15 @@
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
--$as_echo "$ac_cv_lib_security_getspnam" >&6; }
--if test "x$ac_cv_lib_security_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
 -
--		LIBS="-lsecurity $LIBS"
+-		LIBS="-lsec $LIBS"
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_PUTPRPWNAM 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 :
@@ -54226,22 +54232,17 @@
 +#define HAVE_LIBEXC 1
  _ACEOF
  
--
--
++  LIBS="-lexc $LIBS"
+ 
++fi
+ 
 -else
 -
 -
--			# getspnam was not found in libsecurity
+-			# putprpwnam was not found in libsec
 -			# nothing to do here by default
 -			true
--
-+  LIBS="-lexc $LIBS"
  
- fi
- 
--	  ;;
--        esac
-+
 +# check for sysctlbyname for BSD systems
 +for ac_func in sysctlbyname
 +do :
@@ -54252,12 +54253,40 @@
 +_ACEOF
  
  fi
- done
++done
  
+-	  ;;
+-        esac
  
--
--
--for ac_func in getspnam
+-fi
+-done
++#################################################
++# Check to see if core dump directory is defined in linux
++# with /proc/sys/kernel/core_pattern
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/sys/kernel/core_pattern" >&5
++$as_echo_n "checking for /proc/sys/kernel/core_pattern... " >&6; }
++if test "${ac_cv_file__proc_sys_kernel_core_pattern+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  test "$cross_compiling" = yes &&
++  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
++if test -r "/proc/sys/kernel/core_pattern"; then
++  ac_cv_file__proc_sys_kernel_core_pattern=yes
++else
++  ac_cv_file__proc_sys_kernel_core_pattern=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__proc_sys_kernel_core_pattern" >&5
++$as_echo "$ac_cv_file__proc_sys_kernel_core_pattern" >&6; }
++if test "x$ac_cv_file__proc_sys_kernel_core_pattern" = x""yes; then :
+ 
++$as_echo "#define HAVE_SYS_KERNEL_PROC_CORE_PATTERN 1" >>confdefs.h
+ 
++fi
+ 
+ 
+-for ac_func in set_auth_parameters
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -54361,35 +54390,58 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +  samba_cv_HAVE_ONEFS=no
-+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
+-
+-        # set_auth_parameters was found in libc or existing $LIBS
+-
 +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"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
+-_ACEOF
 +$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
  
--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"
-+
+ 
+-else
 +# 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
-+
+ 
+-        # set_auth_parameters was not found, try adding libsecurity
+-	case " $LIBS " in
+-          *\ -lsecurity\ *)
 +UNWIND_ARCH="unknown"
 +if test x"$UNAME_I" != x"unknown"; then
 +	UNWIND_ARCH="$UNAME_I"
@@ -54397,19 +54449,11 @@
 +	UNWIND_ARCH="$UNAME_M"
 +elif test x"$UNAME_P" != x"unknown"; then
 +	UNWIND_ARCH="$UNAME_P"
- 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
  
--        # getspnam was found in libc or existing $LIBS
+-		    # set_auth_parameters was not found and we already had libsecurity
+-		    # nothing to do here by default
+-		    true
 +case "$UNWIND_ARCH" in
 +	unknown)
 +		# This probably won't link without
@@ -54427,40 +54471,95 @@
 +		;;
 +esac
  
+-	    ;;
+-          *)
+-	    # set_auth_parameters was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
+-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 >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.  */
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-/* 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"
 +#ifdef HAVE_LIBUNWIND_H
 +#include <libunwind.h>
-+#endif
+ #endif
+-char set_auth_parameters ();
 +
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return set_auth_parameters ();
 +
 +	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;
-+}
+   ;
+   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_lib_security_set_auth_parameters=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_security_set_auth_parameters=no
+-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=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
  
+-		LIBS="-lsecurity $LIBS"
 +$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
  
--else
  
--        # getspnam was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
 +	# If we have libunwind, test whether we also have libunwind-ptrace
 +	# which would let us unwind arbitrary processes.
 +	save_LIBS=$LIBS
@@ -54470,48 +54569,85 @@
 +if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBUNWIND_PTRACE_H 1
-+_ACEOF
+ _ACEOF
  
--		    # getspnam was not found and we already had libsec
--		    # nothing to do here by default
--		    true
-+fi
+-
+-
+-else
+-
+-
+-			# set_auth_parameters was not found in libsecurity
+-			# nothing to do here by default
+-			true
+-
+-
+ fi
  
--	    ;;
--          *)
--	    # getspnam was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
--$as_echo_n "checking for getspnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_getspnam+set}" = set; then
-+done
-+
+-	  ;;
+-        esac
+-
+-fi
+ done
+ 
+-
+-
+-
+-for ac_func in set_auth_parameters
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
 +$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
 +if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  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="-lunwind-ptrace  $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
+-
+-#undef $ac_func
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48680,541 +15628,646 @@
+    Use char because int might match the return type of a GCC
+@@ -48443,859 +15825,674 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getspnam ();
+-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 _UPT_create ();
  int
  main ()
  {
--return getspnam ();
+-return $ac_func ();
 +return _UPT_create ();
    ;
    return 0;
@@ -54538,14 +54674,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_getspnam=yes
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_unwind_ptrace__UPT_create=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_sec_getspnam=no
+-	eval "$as_ac_var=no"
 +  ac_cv_lib_unwind_ptrace__UPT_create=no
  fi
 -
@@ -54554,64 +54690,65 @@
 -      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_getspnam" >&5
--$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
--if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
--
--		LIBS="-lsec $LIBS"
--
+-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: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
 +$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
 +if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
--_ACEOF
+-        # set_auth_parameters was found in libc or existing $LIBS
 +		LIBUNWIND_PTRACE="-lunwind-ptrace";
  
 +$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
  
- 
- else
--
--
--			# getspnam was not found in libsec
--			# nothing to do here by default
--			true
--
--
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
+-_ACEOF
++
++else
 +   LIBUNWIND_PTRACE=""
- fi
++fi
  
--	  ;;
--        esac
--
--fi
--done
  
 +	LIBS=$save_LIBS
  
-+else
+ else
  
+-        # set_auth_parameters was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	LIBS=$save_LIBS
  
+-		    # set_auth_parameters was not found and we already had libsec
+-		    # nothing to do here by default
+-		    true
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
--for ac_func in bigcrypt
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-	    ;;
+-          *)
+-	    # set_auth_parameters was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsec  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +# To use libunwind-ptrace, we also need to make some ptrace system calls.
 +if test x"$LIBUNWIND_PTRACE" != x"" ; then
@@ -54624,29 +54761,15 @@
  _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.  */
++
 +fi
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++
 +done
- 
--#undef $ac_func
++
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
 +$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
 +    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
@@ -54656,20 +54779,15 @@
 +#if HAVE_SYS_TYPES_H
 +#include <sys/types.h>
  #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
+-char set_auth_parameters ();
 +#if HAVE_SYS_PTRACE_H
 +#include <sys/ptrace.h>
- #endif
- 
++#endif
++
  int
  main ()
  {
--return $ac_func ();
+-return set_auth_parameters ();
 +
 +		pid_t me = (pid_t)-1;
 +		ptrace(PTRACE_ATTACH, me, 0, 0);
@@ -54701,7 +54819,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_sec_set_auth_parameters=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -54714,7 +54832,7 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--	eval "$as_ac_var=no"
+-	ac_cv_lib_sec_set_auth_parameters=no
 -fi
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
@@ -54723,37 +54841,33 @@
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
  fi
--ac_res=`eval 'as_val=${'$as_ac_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_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
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +fi
-+
-+
-+
+ 
+-		LIBS="-lsec $LIBS"
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 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
++  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
  
--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`
@@ -54762,8 +54876,9 @@
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
+-else
 +fi
 +done
  
@@ -54777,13 +54892,12 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--else
+-			# set_auth_parameters was not found in libsec
+-			# nothing to do here by default
+-			true
 +fi
 +done
  
--        # 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`
@@ -54794,25 +54908,62 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--		    # bigcrypt was not found and we already had libsecurity
--		    # nothing to do here by default
--		    true
+ fi
++done
+ 
+-	  ;;
+-        esac
++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
+ 
+ fi
+ done
+ 
++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"
++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
  
--	    ;;
--          *)
--	    # bigcrypt was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
--$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
+-# UnixWare 7.x has its getspnam in -lgen
++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"
++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 getspnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 -  $as_echo_n "(cached) " >&6
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++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"
@@ -54824,25 +54975,58 @@
 -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
++fi
++done
+ 
+-#undef $ac_func
++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"
++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
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char bigcrypt ();
+-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 bigcrypt ();
+-return $ac_func ();
 -  ;
 -  return 0;
 -}
-+fi
-+done
-+
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
 +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"
@@ -54872,52 +55056,44 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_bigcrypt=yes
+-  eval "$as_ac_var=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--	ac_cv_lib_security_bigcrypt=no
+-	eval "$as_ac_var=no"
  fi
 +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`
-+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 \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
--if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
-+done
- 
--		LIBS="-lsecurity $LIBS"
-+for ac_func in getdents __getdents _lseek __lseek _read __read
+-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 __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
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
+-        # getspnam was found in libc or existing $LIBS
+-
 +fi
 +done
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
-+for ac_func in getdirentries _write __write _fork __fork
+-#define HAVE_GETSPNAM 1
++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"
@@ -54930,7 +55106,7 @@
 +fi
 +done
  
-+for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
 +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"
@@ -54944,50 +55120,9 @@
 +fi
 +done
  
-+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
- 
--			# bigcrypt was not found in libsecurity
--			# nothing to do here by default
--			true
-+fi
-+done
- 
-+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
- 
- fi
-+done
- 
--	  ;;
--        esac
-+for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
-+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
- 
+-        # getspnam was not found, try adding libgen
+-	case " $LIBS " in
+-          *\ -lgen\ *)
 +for ac_func in open64 _open64 __open64 creat64
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54998,19 +55133,23 @@
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
+-		    # getspnam was not found and we already had libgen
+-		    # nothing to do here by default
+-		    true
 +fi
 +done
  
--
--for ac_func in bigcrypt
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-	    ;;
+-          *)
+-	    # getspnam was not found, try adding libgen
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
+-$as_echo_n "checking for getspnam in -lgen... " >&6; }
+-if test "${ac_cv_lib_gen_getspnam+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgen  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +for ac_func in prctl
 +do :
@@ -55021,48 +55160,28 @@
  _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.  */
++
 +fi
 +done
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
++
++
 +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
 -   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
 +#ifdef HAVE_SYS_PRCTL_H
 +#include <sys/prctl.h>
  #endif
- 
+-char getspnam ();
++
  int
  main ()
  {
--return $ac_func ();
+-return getspnam ();
 +int i; i = prtcl(0);
    ;
    return 0;
@@ -55089,14 +55208,35 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_gen_getspnam=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_c_try_compile "$LINENO"; then :
-+
+ 
+-	ac_cv_lib_gen_getspnam=no
+-fi
 +$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
-+
-+fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
+-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+-
+-		LIBS="-lgen $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_ACEOF
+-
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +#
 +#
 +#
@@ -55107,15 +55247,13 @@
 +$as_echo_n "checking for good getgrouplist... " >&6; }
 +if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  if test "$cross_compiling" = yes; then :
 +  samba_cv_linux_getgrouplist_ok=cross
-+else
+ else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+
+ 
 +#include <unistd.h>
 +#include <sys/utsname.h>
 +main() {
@@ -55123,7 +55261,10 @@
 +#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 +       int libc_major = __GLIBC__;
 +       int libc_minor = __GLIBC_MINOR__;
-+
+ 
+-			# getspnam was not found in libgen
+-			# nothing to do here by default
+-			true
 +       if (libc_major < 2)
 +              exit(1);
 +       if ((libc_major == 2) && (libc_minor <= 3))
@@ -55132,7 +55273,6 @@
 +       exit(0);
 +}
  
--	eval "$as_ac_var=no"
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  samba_cv_linux_getgrouplist_ok=yes
@@ -55141,23 +55281,15 @@
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
- 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
 +{ $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
 +$as_echo "#define HAVE_GETGROUPLIST 1" >>confdefs.h
 +
 +       fi
@@ -55167,88 +55299,177 @@
 +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
++_ACEOF
  
--        # bigcrypt was found in libc or existing $LIBS
-+fi
-+done
+ 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 getspnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-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
 +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.  */
+ /* 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
 +#if defined(HAVE_UNISTD_H)
 +#include <unistd.h>
-+#endif
+ #endif
 +#include <sys/stat.h>
  
--else
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return $ac_func ();
 +struct stat64 st64; exit(stat64(".",&st64));
-+  ;
-+  return 0;
-+}
-+_ACEOF
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_func_stat64=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
+-
+-        # getspnam was found in libc or existing $LIBS
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_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
  
--        # bigcrypt was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
 +$as_echo "#define HAVE_STAT64 1" >>confdefs.h
  
--		    # bigcrypt was not found and we already had libsec
--		    # nothing to do here by default
--		    true
+-else
 +  fi
 +fi
  
--	    ;;
--          *)
--	    # bigcrypt was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
--$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-        # getspnam 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.  */
-+
+ 
+-		    # getspnam 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>
-+
+ 
+-	    ;;
+-          *)
+-	    # getspnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
+-$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_getspnam+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 +int
 +main ()
 +{
@@ -55286,13 +55507,13 @@
 +#if defined(HAVE_UNISTD_H)
 +#include <unistd.h>
  #endif
--char bigcrypt ();
+-char getspnam ();
 +#include <sys/stat.h>
 +
  int
  main ()
  {
--return bigcrypt ();
+-return getspnam ();
 +struct stat64 st64; exit(fstat64(0,&st64));
    ;
    return 0;
@@ -55319,112 +55540,209 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_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_getspnam=no
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_func_fstat64=yes
-+fi
+ 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
+-LIBS=$ac_check_lib_save_LIBS
 +$as_echo "#define HAVE_FSTAT64 1" >>confdefs.h
 +
 +  fi
-+fi
-+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
+-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
+ 
+-		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_GETSPNAM 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+_ACEOF
-+
+ _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
-+
+ 
+-			# getspnam was not found in libsecurity
+-			# nothing to do here by default
+-			true
 +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
-+
+ fi
+ 
+-	  ;;
+-        esac
 +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
-+
+ 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 getspnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-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.  */
 +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
+-   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
 +# 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 0;
+-}
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
-+_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
+-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
  
--	ac_cv_lib_sec_bigcrypt=no
+-	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
--LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
--$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
--if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
+-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
  
--		LIBS="-lsec $LIBS"
+-        # getspnam was found in libc or existing $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 :
 +
@@ -55436,7 +55754,7 @@
 +if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-#define HAVE_GETSPNAM 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
  _ACEOF
@@ -55447,57 +55765,154 @@
 -else
 +fi
  
+-        # getspnam was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
  
--			# bigcrypt was not found in libsec
--			# nothing to do here by default
--			true
+-		    # getspnam was not found and we already had libsec
+-		    # nothing to do here by default
+-		    true
  
+-	    ;;
+-          *)
+-	    # getspnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
+-$as_echo_n "checking for getspnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_getspnam+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
+   $as_echo_n "(cached) " >&6
+ else
+-  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
+-/* end confdefs.h.  */
  
--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 getspnam ();
 +	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
-+int
-+main ()
-+{
- 
--	  ;;
--        esac
+ int
+ main ()
+ {
+-return getspnam ();
++
 +		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;
-+}
-+_ACEOF
++
+   ;
+   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_lib_sec_getspnam=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_stat_dos_flags=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_sec_getspnam=no
 +  samba_cv_stat_dos_flags=no
  fi
--done
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
+-$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
+-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
+-
+-		LIBS="-lsec $LIBS"
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_stat_dos_flags" >&5
 +$as_echo "$samba_cv_stat_dos_flags" >&6; }
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_ACEOF
 +if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
  
 +$as_echo "#define HAVE_STAT_DOS_FLAGS 1" >>confdefs.h
  
 +fi
  
--for ac_func in getprpwnam
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile with __attribute__((destructor))" >&5
++$as_echo_n "checking whether we can compile with __attribute__((destructor))... " >&6; }
++if test "${samba_cv_function_attribute_destructor+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
++	         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-			# getspnam was not found in libsec
+-			# nothing to do here by default
+-			true
+-
++				__attribute__((destructor))
++				static void cleanup(void) { }
+ 
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_function_attribute_destructor=yes
+ fi
+-
+-	  ;;
+-        esac
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-done
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_function_attribute_destructor" >&5
++$as_echo "$samba_cv_function_attribute_destructor" >&6; }
+ 
++if test x"$samba_cv_function_attribute_destructor" = xyes ; then
+ 
++$as_echo "#define HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR 1" >>confdefs.h
+ 
++fi
+ 
+-for ac_func in bigcrypt
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55538,7 +55953,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49222,100 +16275,43 @@
+@@ -49303,100 +16500,43 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55613,11 +56028,11 @@
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
--        # getprpwnam was found in libc or existing $LIBS
+-        # bigcrypt was found in libc or existing $LIBS
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+-#define HAVE_BIGCRYPT 1
 +#define HAVE_LIBRESOLV 1
  _ACEOF
  
@@ -55627,20 +56042,20 @@
  
 -else
 -
--        # getprpwnam was not found, try adding libsecurity
+-        # bigcrypt was not found, try adding libsecurity
 -	case " $LIBS " in
 -          *\ -lsecurity\ *)
 -
--		    # getprpwnam was not found and we already had libsecurity
+-		    # bigcrypt was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
 -
 -	    ;;
 -          *)
--	    # 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
+-	    # bigcrypt was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
+-$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_bigcrypt+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 :
@@ -55658,16 +56073,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49324,111 +16320,44 @@
+@@ -49405,111 +16545,44 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getprpwnam ();
+-char bigcrypt ();
 +char _dn_expand ();
  int
  main ()
  {
--return getprpwnam ();
+-return bigcrypt ();
 +return _dn_expand ();
    ;
    return 0;
@@ -55694,14 +56109,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_getprpwnam=yes
+-  ac_cv_lib_security_bigcrypt=yes
 +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
 -
--	ac_cv_lib_security_getprpwnam=no
+-	ac_cv_lib_security_bigcrypt=no
 +  ac_cv_lib_resolv__dn_expand=no
  fi
 -
@@ -55712,15 +56127,15 @@
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
--$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
--if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
 -
 -		LIBS="-lsecurity $LIBS"
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+-#define HAVE_BIGCRYPT 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 :
@@ -55733,7 +56148,7 @@
 -else
 -
 -
--			# getprpwnam was not found in libsecurity
+-			# bigcrypt was not found in libsecurity
 -			# nothing to do here by default
 -			true
 -
@@ -55746,11 +56161,11 @@
  
  fi
 -done
+ 
 -
 -
- 
 -
--for ac_func in getprpwnam
+-for ac_func in bigcrypt
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55789,7 +56204,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49436,100 +16365,79 @@
+@@ -49517,100 +16590,79 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55865,13 +56280,13 @@
 +#define HAVE_LIBRESOLV 1
  _ACEOF
  
--        # getprpwnam was found in libc or existing $LIBS
+-        # bigcrypt was found in libc or existing $LIBS
 +  LIBS="-lresolv $LIBS"
  
 +fi
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+-#define HAVE_BIGCRYPT 1
 +
 +#
 +# Check for the functions putprpwnam, set_auth_parameters,
@@ -55897,23 +56312,23 @@
  
  else
  
--        # getprpwnam was not found, try adding libsec
+-        # bigcrypt was not found, try adding libsec
 +        # putprpwnam was not found, try adding libsecurity
  	case " $LIBS " in
 -          *\ -lsec\ *)
 +          *\ -lsecurity\ *)
  
--		    # getprpwnam was not found and we already had libsec
+-		    # bigcrypt was not found and we already had libsec
 +		    # putprpwnam was not found and we already had libsecurity
  		    # 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
+-	    # bigcrypt was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
+-$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_bigcrypt+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; }
@@ -55932,16 +56347,16 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49538,66 +16446,39 @@
+@@ -49619,66 +16671,39 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getprpwnam ();
+-char bigcrypt ();
 +char putprpwnam ();
  int
  main ()
  {
--return getprpwnam ();
+-return bigcrypt ();
 +return putprpwnam ();
    ;
    return 0;
@@ -55968,14 +56383,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_getprpwnam=yes
+-  ac_cv_lib_sec_bigcrypt=yes
 +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
 -
--	ac_cv_lib_sec_getprpwnam=no
+-	ac_cv_lib_sec_bigcrypt=no
 +  ac_cv_lib_security_putprpwnam=no
  fi
 -
@@ -55986,9 +56401,9 @@
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
--$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
--if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then
+-{ $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
 +{ $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 :
@@ -55998,7 +56413,7 @@
  
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+-#define HAVE_BIGCRYPT 1
 -_ACEOF
 +$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
@@ -56007,17 +56422,18 @@
  else
  
  
--			# getprpwnam was not found in libsec
+-			# bigcrypt was not found in libsec
 +			# putprpwnam was not found in libsecurity
  			# nothing to do here by default
  			true
  
-@@ -49612,123 +16493,42 @@
+@@ -49693,139 +16718,42 @@
  
  
  
 -
--for ac_func in strsignal
+-
+-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
@@ -56027,13 +56443,7 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+  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
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -56045,16 +56455,15 @@
 -    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
-+        # putprpwnam was found in libc or existing $LIBS
- 
+-
 -#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.  */
@@ -56068,8 +56477,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
- 
+-
 -int
 -main ()
 -{
@@ -56103,10 +56511,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
 -fi
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -56118,71 +56526,79 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++  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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_PUTPRPWNAM 1
+ _ACEOF
+ 
+-        # getprpwnam was found in libc or existing $LIBS
++        # putprpwnam was found in libc or existing $LIBS
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
 -_ACEOF
-+else
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
--fi
--done
+ 
+ 
+ else
+ 
+-        # getprpwnam was not found, try adding libsecurity
 +        # putprpwnam was not found, try adding libsec
-+	case " $LIBS " in
+ 	case " $LIBS " in
+-          *\ -lsecurity\ *)
 +          *\ -lsec\ *)
  
+-		    # getprpwnam was not found and we already had libsecurity
 +		    # putprpwnam was not found and we already had libsec
-+		    # nothing to do here by default
-+		    true
+ 		    # nothing to do here by default
+ 		    true
  
--############################################
--# Check if we have libattr
--case "$host_os" in
--  *osf*)
--	{ $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
--$as_echo_n "checking for library containing getproplist... " >&6; }
--if test "${ac_cv_search_getproplist+set}" = set; then
-+	    ;;
-+          *)
+ 	    ;;
+           *)
+-	    # 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
 +	    # 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
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity  $LIBS"
 -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="-lsec  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49737,174 +16537,47 @@
+@@ -49834,66 +16762,39 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getproplist ();
+-char getprpwnam ();
 +char putprpwnam ();
  int
  main ()
  {
--return getproplist ();
+-return getprpwnam ();
 +return putprpwnam ();
    ;
    return 0;
  }
  _ACEOF
--for ac_lib in '' proplist; do
--  if test -z "$ac_lib"; then
--    ac_res="none required"
--  else
--    ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--  fi
--  rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56203,60 +56619,62 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_search_getproplist=$ac_res
--else
+-  ac_cv_lib_security_getprpwnam=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_sec_putprpwnam=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_putprpwnam=no
+ 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_getproplist+set}" = set; then
--  break
--fi
--done
--if test "${ac_cv_search_getproplist+set}" = set; then
--  :
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_putprpwnam=yes
- else
--  ac_cv_search_getproplist=no
-+  ac_cv_lib_sec_putprpwnam=no
- fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
+-      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_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"
+-{ $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
 +{ $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 :
  
--fi
+-		LIBS="-lsecurity $LIBS"
 +		LIBS="-lsec $LIBS"
  
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
+-_ACEOF
 +$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
  
  
--for ac_func in getproplist fgetproplist setproplist fsetproplist
+ else
+ 
+ 
+-			# getprpwnam was not found in libsecurity
++			# putprpwnam was not found in libsec
+ 			# nothing to do here by default
+ 			true
+ 
+@@ -49909,137 +16810,42 @@
+ 
+ 
+ 
+-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_n "(cached) " >&6
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -56277,9 +56695,9 @@
 -#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.  */
@@ -56293,10 +56711,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+			# putprpwnam was not found in libsec
-+			# nothing to do here by default
-+			true
- 
+-
 -int
 -main ()
 -{
@@ -56330,10 +56745,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	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
@@ -56345,20 +56760,149 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++  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
+ 
+-        # getprpwnam was found in libc or existing $LIBS
++        # set_auth_parameters was found in libc or existing $LIBS
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
 -_ACEOF
-+	  ;;
-+        esac
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
  
+ 
+ 
+ else
+ 
+-        # getprpwnam was not found, try adding libsec
++        # set_auth_parameters was not found, try adding libsecurity
+ 	case " $LIBS " in
+-          *\ -lsec\ *)
++          *\ -lsecurity\ *)
+ 
+-		    # getprpwnam was not found and we already had libsec
++		    # set_auth_parameters was not found and we already had libsecurity
+ 		    # 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
++	    # 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="-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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -50048,66 +16854,39 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char getprpwnam ();
++char set_auth_parameters ();
+ int
+ main ()
+ {
+-return getprpwnam ();
++return set_auth_parameters ();
+   ;
+   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_lib_sec_getprpwnam=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_security_set_auth_parameters=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_set_auth_parameters=no
  fi
- done
-@@ -49912,138 +16585,43 @@
+-
+-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_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_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="-lsec $LIBS"
++		LIBS="-lsecurity $LIBS"
  
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
+-_ACEOF
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
+ 
+ 
+ 
+ else
+ 
+ 
+-			# getprpwnam was not found in libsec
++			# set_auth_parameters was not found in libsecurity
+ 			# nothing to do here by default
+ 			true
+ 
+@@ -50122,123 +16901,42 @@
+ 
+ 
+ 
 -
--for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
+-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
@@ -56466,79 +57010,64 @@
  
 -fi
 -done
-+        # set_auth_parameters was not found, try adding libsecurity
++        # set_auth_parameters was not found, try adding libsec
 +	case " $LIBS " in
-+          *\ -lsecurity\ *)
++          *\ -lsec\ *)
  
-+		    # set_auth_parameters 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
  
--for ac_func in sizeof_proplist_entry
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-############################################
+-# Check for EA implementations
+-case "$host_os" in
+-  *osf*)
+-	{ $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
+-$as_echo_n "checking for library containing getproplist... " >&6; }
+-if test "${ac_cv_search_getproplist+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 :
++	    # 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
--  cat >conftest.$ac_ext <<_ACEOF
+-  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
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity  $LIBS"
++LIBS="-lsec  $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
--
--#undef $ac_func
  
  /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -50051,82 +16629,89 @@
+@@ -50247,212 +16945,92 @@
  #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 getproplist ();
 +char set_auth_parameters ();
  int
  main ()
  {
--return $ac_func ();
+-return getproplist ();
 +return set_auth_parameters ();
    ;
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' proplist; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56559,134 +57088,110 @@
 -	 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_security_set_auth_parameters=yes
- else
+-  ac_cv_search_getproplist=$ac_res
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_security_set_auth_parameters=no
-+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_getproplist+set}" = set; then
+-  break
+-fi
+-done
+-if test "${ac_cv_search_getproplist+set}" = set; then
+-  :
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_sec_set_auth_parameters=yes
+ else
+-  ac_cv_search_getproplist=no
++  ac_cv_lib_sec_set_auth_parameters=no
+ fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
 +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
-+
- 
--	eval "$as_ac_var=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"
++{ $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 :
  
--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 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
- 
 -fi
--done
-+        # set_auth_parameters was found in libc or existing $LIBS
++		LIBS="-lsec $LIBS"
  
--  ;;
--  *)
--	{ $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
--$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
-+
-+
-+
-+else
-+
-+        # set_auth_parameters was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
-+
-+		    # set_auth_parameters 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 :
-   $as_echo_n "(cached) " >&6
+ 
+ 
+ 
+-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
+-  $as_echo_n "(cached) " >&6
  else
--  ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
+-  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="-lsec  $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
  
- /* Override any GCC internal prototype to avoid an error.
-@@ -50135,109 +16720,92 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char getxattr ();
-+char set_auth_parameters ();
- int
- main ()
- {
--return getxattr ();
-+return set_auth_parameters ();
-   ;
-   return 0;
- }
- _ACEOF
--for ac_lib in '' attr; do
--  if test -z "$ac_lib"; then
--    ac_res="none required"
--  else
--    ac_res=-l$ac_lib
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--  fi
--  rm -f conftest.$ac_objext conftest$ac_exeext
+-/* 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
++			# set_auth_parameters 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
+-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
+ 
+-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;;
@@ -56707,84 +57212,51 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_search_getxattr=$ac_res
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_set_auth_parameters=yes
- else
+-  eval "$as_ac_var=yes"
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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_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="-lsec $LIBS"
-+
-+
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++	  ;;
++        esac
  
+-	eval "$as_ac_var=no"
+ fi
++done
  
--fi
- 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext
--  if test "${ac_cv_search_getxattr+set}" = set; then
--  break
+-      conftest$ac_exeext conftest.$ac_ext
 -fi
--done
--if test "${ac_cv_search_getxattr+set}" = set; then
--  :
- else
--  ac_cv_search_getxattr=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
+-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
 +
 +
-+			# set_auth_parameters was not found in libsec
-+			# nothing to do here by default
-+			true
-+
-+
- fi
--{ $as_echo "$as_me:$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"
-+
-+	  ;;
-+        esac
- 
- fi
-+done
-+
-+
- 
 +# 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"
 +if test "x$ac_cv_func_getspnam" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETSPNAM 1
-+_ACEOF
+ _ACEOF
  
+-fi
+-done
 +        # getspnam was found in libc or existing $LIBS
  
  
 +$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
-+
  
  
--for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
+ 
+-for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -56835,7 +57307,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50245,65 +16813,47 @@
+@@ -50460,293 +17038,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56887,33 +57359,14 @@
 -
 -	eval "$as_ac_var=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_gen_getspnam" >&5
-+$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
-+if test "x$ac_cv_lib_gen_getspnam" = x""yes; then :
-+
-+		LIBS="-lgen $LIBS"
-+
-+
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
-+			# getspnam was not found in libgen
-+			# nothing to do here by default
-+			true
-+
- 
+-
 -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"'`
@@ -56925,39 +57378,23 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
-+
-+	  ;;
-+        esac
++{ $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 :
  
- fi
- done
-@@ -50311,39 +16861,43 @@
+-fi
+-done
++		LIBS="-lgen $LIBS"
  
  
- 
-+  for ac_func in getspnam
-+do :
-+  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 HAVE_GETSPNAM 1
-+_ACEOF
-+
-+        # getspnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
- 
- 
- 
--for ac_func in getea fgetea lgetea listea flistea llistea
+-for ac_func in sizeof_proplist_entry
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -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
@@ -56967,44 +57404,28 @@
 -/* 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_GETSPNAM 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.  */
-+        # getspnam was not found, try adding libsecurity
-+	case " $LIBS " in
-+          *\ -lsecurity\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getspnam was not found and we already had libsecurity
-+		    # 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 :
-+  $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
-@@ -50351,105 +16905,90 @@
- #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
@@ -57012,17 +57433,15 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
-+char getspnam ();
- int
- main ()
- {
+ 
+-int
+-main ()
+-{
 -return $ac_func ();
-+return getspnam ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -57045,38 +57464,16 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_getspnam=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_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_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_GETSPNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
-+			# getspnam was not found in libsecurity
++			# getspnam was not found in libgen
 +			# 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
@@ -57098,78 +57495,59 @@
  fi
  done
  
+-  ;;
+-  *freebsd4* | *dragonfly* )
  
+-cat >>confdefs.h <<\_ACEOF
+-#define BROKEN_EXTATTR 1
+-_ACEOF
  
-+  for ac_func in getspnam
-+do :
-+  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 HAVE_GETSPNAM 1
-+_ACEOF
+-  ;;
+-  *solaris*)
  
-+        # getspnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
- 
- 
- 
--for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
+-for ac_func in attropen
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -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
++  for ac_func in getspnam
++do :
++  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 HAVE_GETSPNAM 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.  */
-+        # getspnam was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # getspnam was not found and we already had libsec
-+		    # 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 :
-+  $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
-@@ -50457,206 +16996,91 @@
- #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
@@ -57177,17 +57555,16 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
-+char getspnam ();
- int
- main ()
- {
++        # getspnam was found in libc or existing $LIBS
+ 
+-int
+-main ()
+-{
 -return $ac_func ();
-+return getspnam ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -57210,23 +57587,18 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_getspnam=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_sec_getspnam=no
- fi
--
+-fi
++$as_echo "#define HAVE_GETSPNAM 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
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -57237,30 +57609,165 @@
 -  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_getspnam" >&5
-+$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
-+if test "x$ac_cv_lib_sec_getspnam" = x""yes; then :
  
 -fi
 -done
-+		LIBS="-lsec $LIBS"
  
+-  ;;
+-  *)
+-	{ $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
+-$as_echo_n "checking for library containing getxattr... " >&6; }
+-if test "${ac_cv_search_getxattr+set}" = set; then
++else
++
++        # getspnam was not found, try adding libsecurity
++	case " $LIBS " in
++          *\ -lsecurity\ *)
++
++		    # getspnam was not found and we already had libsecurity
++		    # nothing to do here by default
++		    true
++
++	    ;;
++          *)
++	    # 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_func_search_save_LIBS=$LIBS
+-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="-lsecurity  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
+ /* Override any GCC internal prototype to avoid an error.
+@@ -50755,105 +17130,90 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char getxattr ();
++char getspnam ();
+ int
+ main ()
+ {
+-return getxattr ();
++return getspnam ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' attr; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_search_getxattr=$ac_res
++if ac_fn_c_try_link "$LINENO"; then :
++  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_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_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_GETSPNAM 1" >>confdefs.h
  
  
+-fi
  
--for ac_func in flistxattr removexattr lremovexattr fremovexattr
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_getxattr+set}" = set; then
+-  break
+-fi
+-done
+-if test "${ac_cv_search_getxattr+set}" = set; then
+-  :
+ else
+-  ac_cv_search_getxattr=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++
++
++			# getspnam was not found in libsecurity
++			# nothing to do here by default
++			true
++
++
+ fi
+-{ $as_echo "$as_me:$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"
++
++	  ;;
++        esac
+ 
+ fi
++done
+ 
+ 
+-for ac_func in getxattr
 -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
++
++  for ac_func in getspnam
++do :
++  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 HAVE_GETSPNAM 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -57272,24 +57779,48 @@
 -    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 found in libc or existing $LIBS
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+			# getspnam was not found in libsec
-+			# nothing to do here by default
-+			true
  
 -#undef $ac_func
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++
++
++
++else
++
++        # getspnam was not found, try adding libsec
++	case " $LIBS " in
++          *\ -lsec\ *)
++
++		    # getspnam was not found and we already had libsec
++		    # nothing to do here by default
++		    true
++
++	    ;;
++          *)
++	    # 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
++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
--   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
+@@ -50861,107 +17221,91 @@
+ #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
@@ -57297,16 +57828,17 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
- 
--int
--main ()
--{
+-
++char getspnam ();
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++return getspnam ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -57329,20 +57861,42 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_sec_getspnam=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	  ;;
-+        esac
- 
+-
 -	eval "$as_ac_var=no"
++  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
-+done
++{ $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
++
  
 -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
@@ -57350,28 +57904,35 @@
 -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
+ 
++	  ;;
++        esac
+ 
++fi
++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
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_BIGCRYPT 1
- _ACEOF
++_ACEOF
  
--fi
--done
 +        # bigcrypt was found in libc or existing $LIBS
  
  
 +$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
-+
  
  
--for ac_func in setxattr lsetxattr fsetxattr
+ 
+-for ac_func in lgetxattr fgetxattr listxattr llistxattr flistxattr removexattr lremovexattr fremovexattr setxattr lsetxattr fsetxattr
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57422,7 +57983,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50664,103 +17088,90 @@
+@@ -50969,104 +17313,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57531,11 +58092,13 @@
 +        # bigcrypt was found in libc or existing $LIBS
  
  
+-fi
+-done
 +$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
++
  
  
- 
--for ac_func in attr_get attr_list attr_set attr_remove
+-for ac_func in getea
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57586,7 +58149,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50768,103 +17179,91 @@
+@@ -51074,107 +17404,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57635,12 +58198,14 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+ fi
 +{ $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 :
@@ -57660,15 +58225,9 @@
 +			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"'`
@@ -57677,22 +58236,27 @@
 -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
+ 
++	  ;;
++        esac
+ 
++fi
 +done
-+
-+
-+
-+
+ 
+ 
+ 
+ 
 +  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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETPRPWNAM 1
- _ACEOF
++_ACEOF
  
--fi
--done
 +        # getprpwnam was found in libc or existing $LIBS
  
  
@@ -57700,7 +58264,7 @@
  
  
  
--for ac_func in attr_getf attr_listf attr_setf attr_removef
+-for ac_func in fgetea lgetea listea flistea llistea removeea fremoveea lremoveea setea fsetea lsetea
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57751,7 +58315,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50872,107 +17271,90 @@
+@@ -51182,104 +17496,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57797,7 +58361,9 @@
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_security_getprpwnam=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_lib_security_getprpwnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
@@ -57815,17 +58381,15 @@
 +
 +
 +
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	eval "$as_ac_var=no"
++else
 +
++
 +			# getprpwnam was not found in libsecurity
 +			# nothing to do here by default
 +			true
 +
-+
+ 
+-	eval "$as_ac_var=no"
  fi
  
 -rm -rf conftest.dSYM
@@ -57858,19 +58422,15 @@
 -fi
 -done
 +        # getprpwnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
  
--  ;;
--esac
  
--########################################################
--# Check if attropen() is present if this is Solaris
--case "$host_os" in
--  *solaris*)
+-fi
+-done
++$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
++
  
--for ac_func in attropen
+ 
+-for ac_func in attr_get
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57921,7 +58481,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50980,190 +17362,77 @@
+@@ -51287,103 +17587,77 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57972,12 +58532,15 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
++  ac_cv_lib_sec_getprpwnam=no
+ fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+  ac_cv_lib_sec_getprpwnam=no
++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"'`
@@ -57989,168 +58552,89 @@
 -  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_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--done
--
--  ;;
--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 :
  
--########################################################
--# Do xattr functions take additional options like on Darwin?
--if test x"$ac_cv_func_getxattr" = x"yes" ; then
--	{ $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
--$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
--if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
 +		LIBS="-lsec $LIBS"
  
--		old_LIBS=$LIBS
--		LIBS="$LIBS $ACL_LIBS"
--		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>
--			#if HAVE_ATTR_XATTR_H
--			#include <attr/xattr.h>
--			#elif HAVE_SYS_XATTR_H
--			#include <sys/xattr.h>
--			#endif
 +$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
  
--int
--main ()
--{
  
--			getxattr(0, 0, 0, 0, 0, 0);
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  smb_attr_cv_xattr_add_opt=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
  
--	smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
--fi
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-for ac_func in attr_list attr_set attr_remove attr_getf attr_listf attr_setf attr_removef
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-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.  */
 +			# getprpwnam was not found in libsec
 +			# nothing to do here by default
 +			true
 +
- 
- fi
--{ $as_echo "$as_me:$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
- 
--cat >>confdefs.h <<\_ACEOF
--#define XATTR_ADD_OPT 1
--_ACEOF
++
++fi
++
 +	  ;;
 +        esac
- 
--	fi
- fi
++
++fi
 +done
- 
--# Check if we have extattr
--case "$host_os" in
--  *freebsd4* | *dragonfly* )
- 
--cat >>confdefs.h <<\_ACEOF
--#define BROKEN_EXTATTR 1
--_ACEOF
- 
--    ;;
--  *)
++
++
++
 +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
 +#define HAVE_STRSIGNAL 1
-+_ACEOF
- 
-+fi
-+done
- 
- 
--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
-+############################################
-+# Check if we have libattr
-+case "$host_os" in
-+  *osf*)
-+	{ $as_echo "$as_me:${as_lineno-$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
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_func_search_save_LIBS=$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.  */
--
++fi
++done
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
++############################################
++# Check for EA implementations
++case "$host_os" in
++  *osf*)
++	{ $as_echo "$as_me:${as_lineno-$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
++  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
-@@ -51171,62 +17440,53 @@
+@@ -51391,62 +17665,66 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58194,9 +58678,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 '' proplist; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -58214,11 +58695,12 @@
 +fi
 +done
 +if test "${ac_cv_search_getproplist+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_getproplist=no
- fi
++fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
@@ -58228,9 +58710,22 @@
 +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_func in getproplist fgetproplist setproplist fsetproplist
++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
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -58239,8 +58734,9 @@
 -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 getproplist fgetproplist setproplist fsetproplist
++	for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -58249,23 +58745,10 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51234,39 +17494,40 @@
+@@ -51454,41 +17732,45 @@
  fi
  done
  
-+	for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+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 sizeof_proplist_entry
 +do :
 +  ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
@@ -58274,50 +58757,68 @@
 +#define HAVE_SIZEOF_PROPLIST_ENTRY 1
 +_ACEOF
  
-+fi
-+done
+ fi
+ done
  
--for ac_func in extattr_get_fd extattr_get_file extattr_get_link
++  ;;
++  *freebsd4* | *dragonfly* )
+ 
+-for ac_func in extattr_delete_file
 -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 getxattr" >&5
-+$as_echo_n "checking for library containing getxattr... " >&6; }
-+if test "${ac_cv_search_getxattr+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_func_search_save_LIBS=$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
--
++$as_echo "#define BROKEN_EXTATTR 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.  */
--
++  ;;
++  *solaris*)
++	for ac_func in attropen
++do :
++  ac_fn_c_check_func "$LINENO" "attropen" "ac_cv_func_attropen"
++if test "x$ac_cv_func_attropen" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_ATTROPEN 1
++_ACEOF
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++fi
++done
+ 
 -#undef $ac_func
++  ;;
++  *)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getxattr" >&5
++$as_echo_n "checking for library containing getxattr... " >&6; }
++if test "${ac_cv_search_getxattr+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
-@@ -51274,62 +17535,53 @@
+@@ -51496,170 +17778,136 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58407,21 +58908,42 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
-+	for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
++	for ac_func in getxattr
 +do :
++  ac_fn_c_check_func "$LINENO" "getxattr" "ac_cv_func_getxattr"
++if test "x$ac_cv_func_getxattr" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETXATTR 1
+ _ACEOF
+ 
++		for ac_func in lgetxattr fgetxattr listxattr llistxattr flistxattr removexattr lremovexattr fremovexattr 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
-@@ -51337,102 +17589,77 @@
- fi
- done
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
  
-+	for ac_func in getea fgetea lgetea listea flistea llistea
++fi
++done
+ 
+ 
++fi
++done
+ 
++	for ac_func in getea
 +do :
++  ac_fn_c_check_func "$LINENO" "getea" "ac_cv_func_getea"
++if test "x$ac_cv_func_getea" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETEA 1
++_ACEOF
+ 
++		for ac_func in fgetea lgetea listea flistea llistea 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"
 +eval as_val=\$$as_ac_var
@@ -58433,8 +58955,13 @@
 +fi
 +done
  
+ 
++fi
++done
+ 
 -
--for ac_func in extattr_list_fd extattr_list_file extattr_list_link
+-
+-for ac_func in extattr_delete_fd extattr_delete_link extattr_get_fd extattr_get_file extattr_get_link extattr_list_fd extattr_list_file extattr_list_link extattr_set_fd extattr_set_file extattr_set_link
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -58444,14 +58971,12 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+	for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
++	for ac_func in attr_get
 +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" "attr_get" "ac_cv_func_attr_get"
++if test "x$ac_cv_func_attr_get" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_ATTR_GET 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -58464,7 +58989,16 @@
 -    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.  */
--
++		for ac_func in attr_list attr_set attr_remove attr_getf attr_listf attr_setf attr_removef
++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
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
@@ -58474,15 +59008,6 @@
 +done
  
 -#undef $ac_func
-+	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"
-+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
@@ -58507,14 +59032,12 @@
 -  ;
 -  return 0;
 -}
-+	for ac_func in setxattr lsetxattr fsetxattr
++	for ac_func in extattr_delete_file
 +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" "extattr_delete_file" "ac_cv_func_extattr_delete_file"
++if test "x$ac_cv_func_extattr_delete_file" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_EXTATTR_DELETE_FILE 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -58543,23 +59066,12 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
- 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`
-+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
+-
 -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
@@ -58567,9 +59079,7 @@
 -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 attr_getf attr_listf attr_setf attr_removef
++		for ac_func in extattr_delete_fd extattr_delete_link extattr_get_fd extattr_get_file extattr_get_link extattr_list_fd extattr_list_file extattr_list_link extattr_set_fd extattr_set_file extattr_set_link
 +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"
@@ -58578,112 +59088,42 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51440,102 +17667,128 @@
- fi
- done
- 
-+  ;;
-+esac
-+
-+########################################################
-+# Check if attropen() is present if this is Solaris
-+case "$host_os" in
-+  *solaris*)
-+	for ac_func in attropen
-+do :
-+  ac_fn_c_check_func "$LINENO" "attropen" "ac_cv_func_attropen"
-+if test "x$ac_cv_func_attropen" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ATTROPEN 1
-+_ACEOF
- 
-+fi
-+done
- 
-+  ;;
-+esac
- 
--for ac_func in extattr_set_fd extattr_set_file extattr_set_link
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+########################################################
-+# Do xattr functions take additional options like on Darwin?
-+if test x"$ac_cv_func_getxattr" = x"yes" ; then
+@@ -51677,19 +17925,15 @@
+ ########################################################
+ # Do xattr functions take additional options like on Darwin?
+ if test x"$ac_cv_func_getxattr" = x"yes" ; then
+-	{ $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xattr interface takes additional options" >&5
-+$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
+ $as_echo_n "checking whether xattr interface takes additional options... " >&6; }
+-if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
 +if test "${smb_attr_cv_xattr_add_opt+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
+ 
+ 		old_LIBS=$LIBS
+ 		LIBS="$LIBS $ACL_LIBS"
+-		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
-+		old_LIBS=$LIBS
-+		LIBS="$LIBS $ACL_LIBS"
 +		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
--   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 <sys/types.h>
-+			#if HAVE_ATTR_XATTR_H
-+			#include <attr/xattr.h>
-+			#elif HAVE_SYS_XATTR_H
-+			#include <sys/xattr.h>
-+			#endif
- 
- int
- main ()
- {
--return $ac_func ();
-+
-+			getxattr(0, 0, 0, 0, 0, 0);
-+
-   ;
+ 			#include <sys/types.h>
+@@ -51709,48 +17953,25 @@
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -58692,99 +59132,32 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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"
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  smb_attr_cv_xattr_add_opt=yes
+   smb_attr_cv_xattr_add_opt=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
 +  smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--	eval "$as_ac_var=no"
  fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
 +{ $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
-+
+ $as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
+ 	if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define XATTR_ADD_OPT 1
+-_ACEOF
 +$as_echo "#define XATTR_ADD_OPT 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
-+
-+# Check if we have extattr
-+case "$host_os" in
-+  *freebsd4* | *dragonfly* )
-+
-+$as_echo "#define BROKEN_EXTATTR 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`
-+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 extattr_get_fd extattr_get_file extattr_get_link
-+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 extattr_list_fd extattr_list_file extattr_list_link
-+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 extattr_set_fd extattr_set_file extattr_set_link
-+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
-@@ -51547,7 +17800,7 @@
- esac
  
  # Check whether --enable-static was given.
 -if test "${enable_static+set}" = set; then
@@ -58792,7 +59165,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
  case $enableval in
  yes) enable_static=yes ;;
-@@ -51569,7 +17822,7 @@
+@@ -51772,7 +17993,7 @@
  fi
  
  # Check whether --enable-shared was given.
@@ -58801,7 +59174,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
  case $enableval in
  yes) enable_shared=yes ;;
-@@ -51596,16 +17849,16 @@
+@@ -51799,16 +18020,16 @@
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
  # Check whether --enable-pie was given.
@@ -58821,7 +59194,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51631,7 +17884,7 @@
+@@ -51834,7 +18055,7 @@
  		rm -f conftest*
  
  fi
@@ -58830,7 +59203,7 @@
  $as_echo "$samba_cv_fpie" >&6; }
  	if test x"${samba_cv_fpie}" = x"yes"
  	then
-@@ -51643,16 +17896,16 @@
+@@ -51846,16 +18067,16 @@
  # Set defaults
  RELRO_LDFLAGS=""
  # Check whether --enable-relro was given.
@@ -58850,7 +59223,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51661,11 +17914,11 @@
+@@ -51864,11 +18085,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58865,7 +59238,7 @@
  		then
  			samba_cv_relro=yes
  		else
-@@ -51674,7 +17927,7 @@
+@@ -51877,7 +18098,7 @@
  		rm -f conftest*
  
  fi
@@ -58874,7 +59247,7 @@
  $as_echo "$samba_cv_relro" >&6; }
  	if test x"${samba_cv_relro}" = x"yes"
  	then
-@@ -51703,7 +17956,7 @@
+@@ -51906,7 +18127,7 @@
  # You need to specify how to create a shared library and
    # how to compile C code to produce PIC object files
  
@@ -58883,7 +59256,7 @@
  $as_echo_n "checking ability to build shared libraries... " >&6; }
  
    # and these are for particular systems
-@@ -51711,14 +17964,10 @@
+@@ -51914,14 +18135,10 @@
  		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
  			case "$host_os" in
  				*linux*)
@@ -58900,7 +59273,7 @@
   ;;
  			esac
  			BLDSHARED="true"
-@@ -51729,15 +17978,11 @@
+@@ -51932,15 +18149,11 @@
  			DYNEXP="-Wl,--export-dynamic"
  			PICFLAG="-fPIC"
  			SONAMEFLAG="-Wl,-soname="
@@ -58918,7 +59291,7 @@
  
  			BLDSHARED="true"
  			if test "${GCC}" = "yes"; then
-@@ -51757,33 +18002,23 @@
+@@ -51960,33 +18173,23 @@
  				SONAMEFLAG="-Wl,-h,"
  			fi
  
@@ -58957,7 +59330,7 @@
  
  			;;
  		*netbsd* | *freebsd* | *dragonfly* )
-@@ -51793,14 +18028,10 @@
+@@ -51996,14 +18199,10 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC -DPIC"
  
@@ -58974,7 +59347,7 @@
  
  			;;
  		*openbsd*)  BLDSHARED="true"
-@@ -51809,26 +18040,18 @@
+@@ -52012,26 +18211,18 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
  
@@ -59005,7 +59378,7 @@
  
  			;;
  			esac
-@@ -51841,15 +18064,11 @@
+@@ -52044,15 +18235,11 @@
  				PICFLAG="-KPIC"
  			fi
  
@@ -59023,7 +59396,7 @@
  
  			BLDSHARED="true"
  			# use expfull to export underscored symbols
-@@ -51865,25 +18084,17 @@
+@@ -52068,25 +18255,17 @@
  			fi
  
  
@@ -59051,10 +59424,10 @@
 -_ACEOF
 +$as_echo "#define HPUX 1" >>confdefs.h
  
- 			# Use special PIC flags for the native HP-UX compiler.
- 				BLDSHARED="true"
-@@ -51905,74 +18116,52 @@
- 				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
+ 			# ia64: 64bit build using gcc with CFLAGS="-mpl64"
+ 			#       64bit build using HP's cc with CFLAGS="+DD64"
+@@ -52128,44 +18307,30 @@
+ 				PIE_LDFLAGS=\${PICFLAG}
  			fi
  
 -cat >>confdefs.h <<\_ACEOF
@@ -59090,6 +59463,68 @@
 -_ACEOF
 +$as_echo "#define BROKEN_GETGRNAM 1" >>confdefs.h
  
+ 			for flags in "-expect_unresolved '*'" "-Wl,-expect_unresolved,'*'" ; do
+ 				saved_ldflags="$LDFLAGS"
+-				{ $as_echo "$as_me:$LINENO: checking if $flags works" >&5
++				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+ 				LDFLAGS="$flags $saved_ldflags"
+-				cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -52176,84 +18341,47 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 					LDSHFLAGS_Z_NODEFS=$flags
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS="$saved_ldflags"
+ 				test x"$LDSHFLAGS_Z_NODEFS" != x && break
+ 			done
  			;;
  		*sco*)
 -cat >>confdefs.h <<\_ACEOF
@@ -59141,7 +59576,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ROFF"; then
-@@ -51983,91 +18172,71 @@
+@@ -52264,91 +18392,71 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59248,7 +59683,7 @@
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -52081,16 +18250,12 @@
+@@ -52362,16 +18470,12 @@
                          # actually support the PIE stuff.
                          PIE_LDFLAGS=
                          PIE_CFLAGS=
@@ -59267,7 +59702,7 @@
  
  			;;
    esac
-@@ -52107,20 +18272,16 @@
+@@ -52388,7 +18492,7 @@
  	LDFLAGS="$LDFLAGS -L./bin"
  fi
  
@@ -59275,8 +59710,19 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLDSHARED" >&5
  $as_echo "$BLDSHARED" >&6; }
  
- saved_before_as_needed_ldflags="$LDFLAGS"
- for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
+ if test x"$enable_developer" = x"yes" ; then
+@@ -52397,7 +18501,7 @@
+ 	default_as_needed=no
+ fi
+ # Check whether --enable-as-needed was given.
+-if test "${enable_as_needed+set}" = set; then
++if test "${enable_as_needed+set}" = set; then :
+   enableval=$enable_as_needed; enable_as_needed=$enableval
+ else
+   enable_as_needed=$default_as_needed
+@@ -52407,14 +18511,10 @@
+     saved_before_as_needed_ldflags="$LDFLAGS"
+     for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
  	saved_ldflags="$LDFLAGS"
 -	{ $as_echo "$as_me:$LINENO: checking if $flags works" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
@@ -59291,7 +59737,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -52131,42 +18292,17 @@
+@@ -52425,42 +18525,17 @@
    return 0;
  }
  _ACEOF
@@ -59338,9 +59784,88 @@
 +    conftest$ac_exeext conftest.$ac_ext
  	LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
  	test x"$ld_as_needed_flag_found" = xyes && break
- done
-@@ -52179,16 +18315,12 @@
+     done
+@@ -52468,7 +18543,7 @@
  
+ if test x$ld_as_needed_flag_found = xyes -a x$enable_as_needed = xauto ; then
+ # check if ld has bug described in https://bugzilla.samba.org/show_bug.cgi?id=7209#c17
+-	{ $as_echo "$as_me:$LINENO: checking if $LD_AS_NEEDED_FLAG has explicit external libs bug" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD_AS_NEEDED_FLAG has explicit external libs bug" >&5
+ $as_echo_n "checking if $LD_AS_NEEDED_FLAG has explicit external libs bug... " >&6; }
+ cat > conftest_shb.c <<END
+ void b() {}
+@@ -52489,49 +18564,49 @@
+ 
+ 	rm -fr conftest
+ 	{ ac_try='$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_sha.o conftest_sha.c 1>&5 2>&1'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	{ ac_try='$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_shb.o conftest_shb.c 1>&5 2>&1'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
+ 	{ ac_try='$TESTCMD -o libconftest_shb.$SHLIBEXT conftest_shb.o 1>&5 2>&1'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	{ ac_try='$TESTCMD -o libconftest_sha.$SHLIBEXT conftest_sha.o 1>&5 2>&1'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	{ ac_try='$CC -o conftest conftest.c $LDFLAGS -L. -lconftest_sha -lconftest_shb 1>&5 2>&1'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	if { ac_try='eval "$LIB_PATH_VAR=. ./conftest 1>&5 2>&1"'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }
+ 	then
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	else
+ 		ld_as_needed_flag_found=no
+ 		LDFLAGS="$saved_before_as_needed_ldflags"
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	fi
+ 	rm conftest* libconftest*
+@@ -52545,16 +18620,12 @@
+ 
  if test x$ac_cv_lib_readline_rl_callback_handler_install = xyes ; then
  	if test x$ld_as_needed_flag_found = xyes ; then
 -		{ $as_echo "$as_me:$LINENO: checking if $LD_AS_NEEDED_FLAG works with readline" >&5
@@ -59358,7 +59883,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -52199,40 +18331,15 @@
+@@ -52565,40 +18636,15 @@
    return 0;
  }
  _ACEOF
@@ -59404,7 +59929,7 @@
  		LIBS="$save_LIBS"
          fi
  fi
-@@ -52247,14 +18354,10 @@
+@@ -52613,14 +18659,10 @@
  
  for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
  	saved_ldflags="$LDFLAGS"
@@ -59421,7 +59946,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -52265,94 +18368,69 @@
+@@ -52631,94 +18673,69 @@
    return 0;
  }
  _ACEOF
@@ -59541,7 +60066,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -52361,18 +18439,18 @@
+@@ -52727,20 +18744,20 @@
     # The $SHLD and $LDSHFLAGS variables may contain references to other
     # variables so they need to be eval'ed.
     if { ac_try='$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&5'
@@ -59554,7 +60079,9 @@
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; }
     then
-      if { ac_try='`eval echo "$SHLD $LDSHFLAGS $PICFLAG"` -o "shlib.$SHLIBEXT" shlib.o 1>&5'
+      TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
+      TESTCMD="$TESTCMD -o \"shlib.$SHLIBEXT\" shlib.o"
+      if { ac_try='eval $TESTCMD 1>&5 2>&1'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    (eval $ac_try) 2>&5
@@ -59566,7 +60093,7 @@
       then
         ac_cv_shlib_works=yes
       fi
-@@ -52381,7 +18459,7 @@
+@@ -52749,7 +18766,7 @@
  
  
  fi
@@ -59575,7 +60102,7 @@
  $as_echo "$ac_cv_shlib_works" >&6; }
  if test $ac_cv_shlib_works = no; then
     BLDSHARED=false
-@@ -52398,9 +18476,9 @@
+@@ -52766,9 +18783,9 @@
  	merged_build_possible=no
  fi
  
@@ -59587,7 +60114,7 @@
  $as_echo "$PICFLAG" >&6; }
  
  
-@@ -52472,10 +18550,10 @@
+@@ -52807,10 +18824,10 @@
  USESHARED=false
  
  
@@ -59600,7 +60127,7 @@
    enableval=$enable_shared_libs; enable_shared_libs=$enableval
  else
    enable_shared_libs=yes
-@@ -52486,11 +18564,11 @@
+@@ -52821,11 +18838,11 @@
  	USESHARED=$BLDSHARED
  fi
  
@@ -59614,7 +60141,7 @@
  $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
  fi
  
-@@ -52518,14 +18596,13 @@
+@@ -52853,14 +18870,13 @@
  
  
  # Check whether --with-static-libs was given.
@@ -59631,7 +60158,7 @@
  fi
  
  
-@@ -52547,7 +18624,7 @@
+@@ -52882,7 +18898,7 @@
  #  be extracted from their respective source directories
  #
  # Check whether --enable-external_libtalloc was given.
@@ -59640,7 +60167,7 @@
    enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -52562,9 +18639,9 @@
+@@ -52897,9 +18913,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
@@ -59652,7 +60179,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -52577,14 +18654,14 @@
+@@ -52912,14 +18928,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59670,7 +60197,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52592,10 +18669,10 @@
+@@ -52927,10 +18943,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -59683,7 +60210,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52605,9 +18682,9 @@
+@@ -52940,9 +18956,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
@@ -59695,7 +60222,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -52620,14 +18697,14 @@
+@@ -52955,14 +18971,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59713,7 +60240,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52635,10 +18712,10 @@
+@@ -52970,10 +18986,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -59726,7 +60253,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52647,7 +18724,7 @@
+@@ -52982,7 +18998,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -59735,7 +60262,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -52660,13 +18737,13 @@
+@@ -52995,13 +19011,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -59752,7 +60279,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -52674,7 +18751,7 @@
+@@ -53009,7 +19025,7 @@
  fi
  
  pkg_failed=no
@@ -59761,54 +60288,72 @@
  $as_echo_n "checking for LIBTALLOC... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -52682,11 +18759,11 @@
+@@ -53017,817 +19033,161 @@
          pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
-   ac_status=$?
+-  ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.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_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -52700,11 +18777,11 @@
-         pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
+-  pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$LIBTALLOC_LIBS"; then
+-        pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.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_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -52731,768 +18808,112 @@
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBTALLOC_PKG_ERRORS" >&5
- 
+-  pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        LIBTALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 2.0.1"`
+-        else
+-	        LIBTALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 2.0.1"`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$LIBTALLOC_PKG_ERRORS" >&5
+-
 -	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-                 if test x$enable_external_libtalloc = xyes; then
+-$as_echo "no" >&6; }
+-                 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; }; }
-+			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
+-		  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; }; }
@@ -60015,7 +60560,24 @@
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$LIBTALLOC_LIBS"; then
++        pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
+   ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -60025,7 +60587,10 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
--else
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -60035,20 +60600,23 @@
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
--fi
++  pkg_failed=yes
+ fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
--else
++    fi
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_lo= ac_hi=
--fi
--
++	pkg_failed=untried
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -60065,7 +60633,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -60092,10 +60660,22 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++if test $pkg_failed = yes; then
+ 
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
+ fi
++        if test $_pkg_short_errors_supported = yes; then
++	        LIBTALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 2.0.1"`
++        else
++	        LIBTALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 2.0.1"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$LIBTALLOC_PKG_ERRORS" >&5
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -60127,7 +60707,14 @@
 -int
 -main ()
 -{
--
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++                 if test x$enable_external_libtalloc = xyes; then
++			as_fn_error "Unable to find libtalloc" "$LINENO" 5
++		  else
++			enable_external_libtalloc=no
++		  fi
+ 
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -60148,7 +60735,13 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 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;
 -}
@@ -60176,7 +60769,7 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_size_t=`cat conftest.val`
--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
@@ -60193,31 +60786,57 @@
 -   else
 -     ac_cv_sizeof_size_t=0
 -   fi
--fi
++	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
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -rm -f conftest.val
--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
++		tallocdir="$d"
++
++		break;
++	fi
++done
++if test x"$tallocdir" = "x"; then
++   as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 -$as_echo "$ac_cv_sizeof_size_t" >&6; }
--
--
--
++TALLOC_OBJ="talloc.o"
+ 
+ 
++TALLOC_CFLAGS="-I$srcdir/$tallocdir"
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 -_ACEOF
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
++
++TALLOC_LIBS=""
+ 
+ 
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
 -{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
 -$as_echo_n "checking size of void *... " >&6; }
 -if test "${ac_cv_sizeof_void_p+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
++$as_echo_n "checking size of size_t... " >&6; }
++if test "${ac_cv_sizeof_size_t+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  if test "$cross_compiling" = yes; then
 -  # Depending upon the size, compute the lo and hi bounds.
 -cat >conftest.$ac_ext <<_ACEOF
@@ -60293,50 +60912,24 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid; break
-+			as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+		  else
-+			enable_external_libtalloc=no
-+		  fi
-+
- 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;
-+	fi
-+done
-+if test x"$tallocdir" = "x"; then
-+   as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
- fi
-+TALLOC_OBJ="talloc.o"
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -60349,8 +60942,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
 -test_array [0] = 0
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
- 
+-
 -  ;
 -  return 0;
 -}
@@ -60387,6 +60979,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
 -test_array [0] = 0
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
  
 -  ;
 -  return 0;
@@ -60411,36 +61004,16 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+TALLOC_LIBS=""
- 
+-
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
- 
--	ac_lo= ac_hi=
-+else
 +  if test "$ac_cv_type_size_t" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -60453,11 +61026,20 @@
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
 +$as_echo "$ac_cv_sizeof_size_t" >&6; }
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
 -  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -60473,11 +61055,13 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -60520,12 +61104,18 @@
 -     ac_cv_sizeof_void_p=0
 -   fi ;;
 -esac
--else
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if test "${ac_cv_sizeof_void_p+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -60537,7 +61127,7 @@
 -int
 -main ()
 -{
- 
+-
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -60558,6 +61148,7 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
  
 -  ;
 -  return 0;
@@ -60586,24 +61177,14 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_void_p=`cat conftest.val`
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
- 
+-
 -( exit $ac_status )
 -if test "$ac_cv_type_void_p" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+else
 +  if test "$ac_cv_type_void_p" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -60630,7 +61211,7 @@
  $as_echo "$ac_cv_sizeof_void_p" >&6; }
  
  
-@@ -53504,17 +18925,15 @@
+@@ -53839,17 +19199,15 @@
  
  
  if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
@@ -60653,7 +61234,7 @@
  fi
  
  if test x"$VERSIONSCRIPT" != "x"; then
-@@ -53549,16 +18968,16 @@
+@@ -53884,16 +19242,16 @@
  
  
  
@@ -60673,7 +61254,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53584,7 +19003,7 @@
+@@ -53919,7 +19277,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
  		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -60682,7 +61263,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
  			enable_static=yes
-@@ -53597,12 +19016,12 @@
+@@ -53932,12 +19290,12 @@
  		enable_static=yes
  		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
  		LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -60697,7 +61278,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -53628,7 +19047,7 @@
+@@ -53963,7 +19321,7 @@
  
  
  # Check whether --enable-external_libtdb was given.
@@ -60706,7 +61287,7 @@
    enableval=$enable_external_libtdb;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -53639,7 +19058,7 @@
+@@ -53974,7 +19332,7 @@
  then
  
  pkg_failed=no
@@ -60715,37 +61296,37 @@
  $as_echo_n "checking for LIBTDB... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -53647,11 +19066,11 @@
+@@ -53982,11 +19340,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.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
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.2\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.2\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.2") 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.2.1" 2>/dev/null`
+   pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.2.2" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53665,11 +19084,11 @@
+@@ -54000,11 +19358,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.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
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.2\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.2\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.2") 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.2.1" 2>/dev/null`
+   pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.2.2" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53696,13 +19115,11 @@
+@@ -54031,13 +19389,11 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBTDB_PKG_ERRORS" >&5
  
@@ -60761,7 +61342,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53710,9 +19127,7 @@
+@@ -54045,9 +19401,7 @@
  elif test $pkg_failed = untried; then
  
  		if test x$enable_external_libtdb = xyes; then
@@ -60772,7 +61353,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53720,7 +19135,7 @@
+@@ -54055,7 +19409,7 @@
  else
  	LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
  	LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
@@ -60781,7 +61362,7 @@
  $as_echo "yes" >&6; }
  	 enable_external_libtdb=yes
  fi
-@@ -53739,9 +19154,7 @@
+@@ -54074,9 +19428,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -60792,16 +61373,20 @@
  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"
-@@ -53754,104 +19167,12 @@
- TDB_CFLAGS="-I$tdbdir/include"
+@@ -54085,260 +19437,29 @@
  
+ TDB_LIBS=""
  
 -
+-TDB_CFLAGS="-I$tdbdir/include"
 -
 -
 -
 -
- for ac_func in mmap pread pwrite getpagesize utime
+-
+-
+-
+-for ac_func in mmap pread pwrite getpagesize utime
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -60894,22 +61479,17 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -53859,151 +19180,12 @@
- fi
- done
- 
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
 -
+-fi
+-done
 -
 -
- for ac_header in getopt.h sys/select.h sys/time.h
+-
+-
+-for ac_header in getopt.h sys/select.h sys/time.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
@@ -61047,10 +61627,27 @@
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
 -
--fi
++
++TDB_CFLAGS="-I$tdbdir/include"
++
++
++for ac_func in mmap pread pwrite getpagesize utime
++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
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++done
++
++for ac_header in getopt.h sys/select.h sys/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"
@@ -61059,7 +61656,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -54014,17 +19196,13 @@
+@@ -54349,17 +19470,13 @@
  
  
  
@@ -61080,7 +61677,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -54035,56 +19213,29 @@
+@@ -54370,56 +19487,29 @@
    return 0;
  }
  _ACEOF
@@ -61144,7 +61741,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -54095,41 +19246,18 @@
+@@ -54430,41 +19520,18 @@
    return 0;
  }
  _ACEOF
@@ -61190,7 +61787,7 @@
  
   fi
  
-@@ -54166,16 +19294,16 @@
+@@ -54501,16 +19568,16 @@
  
  
  
@@ -61210,7 +61807,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54201,7 +19329,7 @@
+@@ -54536,7 +19603,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
  		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -61219,7 +61816,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54214,12 +19342,12 @@
+@@ -54549,12 +19616,12 @@
  		enable_static=yes
  		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
  		LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -61234,10 +61831,67 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54275,16 +19403,16 @@
+@@ -54584,11 +19651,7 @@
  
+ 	ac_cv_have_tdb_err_nesting=yes
+ else
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include "tdb.h"
+ int
+@@ -54599,40 +19662,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_tdb_err_nesting=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_tdb_err_nesting=no
++  ac_cv_have_tdb_err_nesting=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
  
+ if test x"$ac_cv_have_tdb_err_nesting" = xyes; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TDB_ERR_NESTING 1
+-_ACEOF
++$as_echo "#define HAVE_TDB_ERR_NESTING 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -54662,16 +19702,16 @@
+ 
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libnetapi shared library" >&5
  $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
@@ -61254,7 +61908,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54310,7 +19438,7 @@
+@@ -54697,7 +19737,7 @@
  	if eval $BLDSHARED = true; then
  		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
  		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -61263,7 +61917,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54323,12 +19451,12 @@
+@@ -54710,12 +19750,12 @@
  		enable_static=yes
  		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
  		LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -61278,7 +61932,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54366,16 +19494,16 @@
+@@ -54753,16 +19793,16 @@
  
  
  
@@ -61298,7 +61952,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54401,7 +19529,7 @@
+@@ -54788,7 +19828,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -61307,7 +61961,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54414,12 +19542,12 @@
+@@ -54801,12 +19841,12 @@
  		enable_static=yes
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
  		LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -61322,7 +61976,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54457,16 +19585,16 @@
+@@ -54844,16 +19884,16 @@
  
  
  
@@ -61342,7 +61996,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54492,7 +19620,7 @@
+@@ -54879,7 +19919,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -61351,7 +62005,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54505,12 +19633,12 @@
+@@ -54892,12 +19932,12 @@
  		enable_static=yes
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
  		LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -61366,7 +62020,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54548,19 +19676,19 @@
+@@ -54935,19 +19975,19 @@
  
  
  
@@ -61389,7 +62043,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54569,7 +19697,7 @@
+@@ -54956,7 +19996,7 @@
  else
  
  # if unspecified, default is not to build
@@ -61398,7 +62052,7 @@
  $as_echo "no" >&6; }
  build_lib=no
  
-@@ -54585,7 +19713,7 @@
+@@ -54972,7 +20012,7 @@
  	if eval $BLDSHARED = true; then
  		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
  		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -61407,7 +62061,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54598,12 +19726,12 @@
+@@ -54985,12 +20025,12 @@
  		enable_static=yes
  		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
  		LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -61422,7 +62076,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54620,165 +19748,39 @@
+@@ -55007,165 +20047,39 @@
  
  ################
  
@@ -61600,7 +62254,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54788,102 +19790,9 @@
+@@ -55175,102 +20089,9 @@
  fi
  
  else
@@ -61705,7 +62359,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54898,17 +19807,13 @@
+@@ -55285,17 +20106,13 @@
  # Check if the compiler supports the LL prefix on long long integers.
  # AIX needs this.
  
@@ -61726,7 +62380,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -54919,190 +19824,97 @@
+@@ -55306,190 +20123,97 @@
    return 0;
  }
  _ACEOF
@@ -61869,8 +62523,8 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  #include <sys/stat.h>
--main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
--_ACEOF
+ main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -61893,8 +62547,6 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
-+_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
    samba_cv_SIZEOF_OFF_T=yes
  else
@@ -61947,7 +62599,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55112,67 +19924,34 @@
+@@ -55499,67 +20223,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
@@ -62025,7 +62677,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55182,67 +19961,34 @@
+@@ -55569,67 +20260,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -62103,7 +62755,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55252,67 +19998,34 @@
+@@ -55639,67 +20297,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
@@ -62181,7 +62833,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55322,67 +20035,34 @@
+@@ -55709,67 +20334,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -62259,7 +62911,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55392,64 +20072,31 @@
+@@ -55779,64 +20371,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
@@ -62333,7 +62985,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55465,55 +20112,28 @@
+@@ -55852,55 +20411,28 @@
    return 0;
  }
  _ACEOF
@@ -62396,7 +63048,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55529,58 +20149,31 @@
+@@ -55916,58 +20448,31 @@
    return 0;
  }
  _ACEOF
@@ -62463,7 +63115,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55589,67 +20182,34 @@
+@@ -55976,67 +20481,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = major(dev); return 0; }
  _ACEOF
@@ -62541,7 +63193,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55658,67 +20218,34 @@
+@@ -56045,67 +20517,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = minor(dev); return 0; }
  _ACEOF
@@ -62619,7 +63271,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55727,129 +20254,63 @@
+@@ -56114,129 +20553,63 @@
  #include <sys/types.h>
  main() { dev_t dev = makedev(1,2); return 0; }
  _ACEOF
@@ -62768,7 +63420,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -55862,55 +20323,28 @@
+@@ -56249,226 +20622,80 @@
    return 0;
  }
  _ACEOF
@@ -62792,49 +63444,46 @@
 -       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_SEEKDIR_RETURNS_VOID=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_SEEKDIR_RETURNS_VOID=no
-+  samba_cv_SEEKDIR_RETURNS_VOID=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_SEEKDIR_RETURNS_VOID" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SEEKDIR_RETURNS_VOID" >&5
- $as_echo "$samba_cv_SEEKDIR_RETURNS_VOID" >&6; }
- if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
- 
+-$as_echo "$samba_cv_SEEKDIR_RETURNS_VOID" >&6; }
+-if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define SEEKDIR_RETURNS_VOID 1
 -_ACEOF
-+$as_echo "#define SEEKDIR_RETURNS_VOID 1" >>confdefs.h
- 
- fi
- 
+-
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for __FUNCTION__ macro" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
- $as_echo_n "checking for __FUNCTION__ macro... " >&6; }
+-$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
 -if test "${samba_cv_HAVE_FUNCTION_MACRO+set}" = set; then
-+if test "${samba_cv_HAVE_FUNCTION_MACRO+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 <stdio.h>
- int
-@@ -55921,55 +20355,28 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-printf("%s\n", __FUNCTION__);
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -62853,105 +63502,36 @@
 -	 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_FUNCTION_MACRO=yes
- else
+-  samba_cv_HAVE_FUNCTION_MACRO=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_FUNCTION_MACRO=no
-+  samba_cv_HAVE_FUNCTION_MACRO=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_FUNCTION_MACRO" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_FUNCTION_MACRO" >&5
- $as_echo "$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
- if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
- 
+-$as_echo "$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
+-if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_FUNCTION_MACRO 1
 -_ACEOF
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
- 
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes tz argument" >&5
- $as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
--if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then
-+if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <sys/time.h>
-@@ -55982,46 +20389,19 @@
-   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 :
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--	samba_cv_HAVE_GETTIMEOFDAY_TZ=no
-+  samba_cv_HAVE_GETTIMEOFDAY_TZ=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
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
- $as_echo "$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
- if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTIMEOFDAY_TZ 1
--_ACEOF
-+$as_echo "#define HAVE_GETTIMEOFDAY_TZ 1" >>confdefs.h
- 
- fi
- 
-@@ -56033,120 +20413,24 @@
-     # which rely on signals.
- 
- 
 -
+-if test x"$samba_cv_WITH_PROFILE" = x"yes"; then
+-
+-    # On some systems (eg. Linux) librt can pull in libpthread. We
+-    # don't want this to happen because libpthreads changes signal delivery
+-    # semantics in ways we are not prepared for. This breaks Linux oplocks
+-    # which rely on signals.
+-
+-
+-
 -for ac_func in clock_gettime
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -62996,15 +63576,37 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
--int
--main ()
--{
++else
++  samba_cv_SEEKDIR_RETURNS_VOID=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SEEKDIR_RETURNS_VOID" >&5
++$as_echo "$samba_cv_SEEKDIR_RETURNS_VOID" >&6; }
++if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
++
++$as_echo "#define SEEKDIR_RETURNS_VOID 1" >>confdefs.h
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${samba_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
+ 
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++printf("%s\n", __FUNCTION__);
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -63027,17 +63629,27 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_HAVE_FUNCTION_MACRO=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
--
++  samba_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: $samba_cv_HAVE_FUNCTION_MACRO" >&5
++$as_echo "$samba_cv_HAVE_FUNCTION_MACRO" >&6; }
++if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++
++$as_echo "#define HAVE_FUNCTION_MACRO 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
@@ -63045,6 +63657,16 @@
 -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_WITH_PROFILE" = x"yes"; then
++
++    # On some systems (eg. Linux) librt can pull in libpthread. We
++    # don't want this to happen because libpthreads changes signal delivery
++    # semantics in ways we are not prepared for. This breaks Linux oplocks
++    # which rely on signals.
++
++
 +  for ac_func in clock_gettime
 +do :
 +  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
@@ -63076,7 +63698,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56170,58 +20454,27 @@
+@@ -56492,58 +20719,27 @@
    return 0;
  }
  _ACEOF
@@ -63143,7 +63765,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56245,58 +20498,27 @@
+@@ -56567,58 +20763,27 @@
    return 0;
  }
  _ACEOF
@@ -63210,7 +63832,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56320,49 +20542,22 @@
+@@ -56642,49 +20807,22 @@
    return 0;
  }
  _ACEOF
@@ -63266,7 +63888,7 @@
  
  
  
-@@ -56380,18 +20575,14 @@
+@@ -56702,18 +20840,14 @@
  	    ;;
            *)
  	    # clock_gettime was not found, try adding librt
@@ -63288,7 +63910,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -56409,60 +20600,29 @@
+@@ -56731,60 +20865,29 @@
    return 0;
  }
  _ACEOF
@@ -63358,7 +63980,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56486,58 +20646,27 @@
+@@ -56808,58 +20911,27 @@
    return 0;
  }
  _ACEOF
@@ -63425,7 +64047,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56561,58 +20690,27 @@
+@@ -56883,58 +20955,27 @@
    return 0;
  }
  _ACEOF
@@ -63492,7 +64114,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56636,49 +20734,22 @@
+@@ -56958,49 +20999,22 @@
    return 0;
  }
  _ACEOF
@@ -63548,7 +64170,7 @@
  
  
  
-@@ -56703,20 +20774,16 @@
+@@ -57025,20 +21039,16 @@
  
  fi
  
@@ -63573,7 +64195,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -56724,216 +20791,67 @@
+@@ -57046,64 +21056,31 @@
  if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
  di->d_name[0] == 0) exit(0); exit(1);}
  _ACEOF
@@ -63626,31 +64248,31 @@
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BROKEN_READDIR_NAME 1
 -_ACEOF
--
--fi
--
++$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
+ 
+ fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for utimbuf" >&5
--$as_echo_n "checking for utimbuf... " >&6; }
++{ $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
--  $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
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* 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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <utime.h>
+@@ -57115,41 +21092,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -63669,37 +64291,41 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  samba_cv_HAVE_UTIMBUF=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_HAVE_UTIMBUF=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_UTIMBUF=no
--fi
++  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:$LINENO: result: $samba_cv_HAVE_UTIMBUF" >&5
--$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
--if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
--
++{ $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
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_UTIMBUF 1
 -_ACEOF
++$as_echo "#define HAVE_UTIMBUF 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -57157,105 +21111,12 @@
+ # Check utmp details, but only if our OS offers utmp.h
+ if test x"$ac_cv_header_utmp_h" = x"yes"; then
+ 
 -
--fi
 -
--##############
--# Check utmp details, but only if our OS offers utmp.h
--if test x"$ac_cv_header_utmp_h" = x"yes"; then
 -
 -
 -
 -
--
--
--
--for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
+ for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -63744,29 +64370,14 @@
 -choke me
 -#endif
 -
-+$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
-+
-+fi
-+
-+{ $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 :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#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
@@ -63789,27 +64400,17 @@
 -	 $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"
-+  samba_cv_HAVE_UTIMBUF=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_UTIMBUF" >&5
-+$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
-+if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
-+
-+$as_echo "#define HAVE_UTIMBUF 1" >>confdefs.h
- 
+-fi
+-
 -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
@@ -63817,12 +64418,6 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+##############
-+# Check utmp details, but only if our OS offers utmp.h
-+if test x"$ac_cv_header_utmp_h" = x"yes"; then
-+
-+for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
 +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"
@@ -63831,7 +64426,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -56942,17 +20860,13 @@
+@@ -57264,17 +21125,13 @@
  done
  
  
@@ -63852,7 +64447,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56964,55 +20878,28 @@
+@@ -57286,55 +21143,28 @@
    return 0;
  }
  _ACEOF
@@ -63915,7 +64510,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57024,55 +20911,28 @@
+@@ -57346,55 +21176,28 @@
    return 0;
  }
  _ACEOF
@@ -63978,7 +64573,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57084,55 +20944,28 @@
+@@ -57406,55 +21209,28 @@
    return 0;
  }
  _ACEOF
@@ -64041,7 +64636,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57144,55 +20977,28 @@
+@@ -57466,55 +21242,28 @@
    return 0;
  }
  _ACEOF
@@ -64104,7 +64699,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57204,55 +21010,28 @@
+@@ -57526,55 +21275,28 @@
    return 0;
  }
  _ACEOF
@@ -64167,7 +64762,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57264,55 +21043,28 @@
+@@ -57586,55 +21308,28 @@
    return 0;
  }
  _ACEOF
@@ -64230,7 +64825,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57324,55 +21076,28 @@
+@@ -57646,55 +21341,28 @@
    return 0;
  }
  _ACEOF
@@ -64293,7 +64888,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57384,55 +21109,28 @@
+@@ -57706,55 +21374,28 @@
    return 0;
  }
  _ACEOF
@@ -64356,7 +64951,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57444,55 +21142,28 @@
+@@ -57766,55 +21407,28 @@
    return 0;
  }
  _ACEOF
@@ -64419,7 +65014,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57504,55 +21175,28 @@
+@@ -57826,55 +21440,28 @@
    return 0;
  }
  _ACEOF
@@ -64482,7 +65077,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57564,56 +21208,29 @@
+@@ -57886,56 +21473,29 @@
    return 0;
  }
  _ACEOF
@@ -64546,7 +65141,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57625,56 +21242,29 @@
+@@ -57947,56 +21507,29 @@
    return 0;
  }
  _ACEOF
@@ -64610,7 +65205,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmpx.h>
-@@ -57686,41 +21276,18 @@
+@@ -58008,41 +21541,18 @@
    return 0;
  }
  _ACEOF
@@ -64656,7 +65251,7 @@
  
  fi
  
-@@ -57731,12 +21298,10 @@
+@@ -58053,12 +21563,10 @@
  ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
  
  # Check whether --with-libiconv was given.
@@ -64671,7 +65266,7 @@
    else
       if test "$withval" != "yes" ; then
  	ICONV_PATH_SPEC=yes
-@@ -57782,7 +21347,7 @@
+@@ -58104,7 +21612,7 @@
  		export LDFLAGS LIBS CPPFLAGS
  		# Try to find iconv(3)
  
@@ -64680,7 +65275,7 @@
  $as_echo_n "checking for iconv in $i/$l... " >&6; }
      jm_cv_func_iconv="no"
      jm_cv_lib_iconv=""
-@@ -57790,11 +21355,7 @@
+@@ -58112,11 +21620,7 @@
      jm_save_LIBS="$LIBS"
  
      if test "$jm_cv_func_iconv" != yes; then
@@ -64693,7 +65288,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57808,48 +21369,17 @@
+@@ -58130,48 +21634,17 @@
    return 0;
  }
  _ACEOF
@@ -64746,7 +65341,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57863,49 +21393,18 @@
+@@ -58185,49 +21658,18 @@
    return 0;
  }
  _ACEOF
@@ -64800,7 +65395,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57919,53 +21418,22 @@
+@@ -58241,53 +21683,22 @@
    return 0;
  }
  _ACEOF
@@ -64858,7 +65453,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57979,50 +21447,19 @@
+@@ -58301,50 +21712,19 @@
    return 0;
  }
  _ACEOF
@@ -64913,7 +65508,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <biconv.h>
-@@ -58036,42 +21473,15 @@
+@@ -58358,42 +21738,15 @@
    return 0;
  }
  _ACEOF
@@ -64959,7 +65554,7 @@
  
              LIBS="$jm_save_LIBS"
            fi
-@@ -58082,36 +21492,30 @@
+@@ -58404,36 +21757,30 @@
    if test "$jm_cv_func_iconv" = yes; then
      if test "$jm_cv_giconv" = yes; then
  
@@ -65003,7 +65598,7 @@
  $as_echo "no" >&6; }
    fi
  
-@@ -58149,16 +21553,12 @@
+@@ -58471,16 +21818,12 @@
  	# check for default dos charset name
  	for j in CP850 IBM850 ; do
  
@@ -65023,7 +65618,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -58171,43 +21571,16 @@
+@@ -58493,43 +21836,16 @@
  }
  
  _ACEOF
@@ -65072,7 +65667,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_dos_charset="$ICONV_CHARSET"
-@@ -58219,16 +21592,12 @@
+@@ -58541,16 +21857,12 @@
  	# check for default display charset name
  	for j in ASCII 646 ; do
  
@@ -65092,7 +65687,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -58241,43 +21610,16 @@
+@@ -58563,43 +21875,16 @@
  }
  
  _ACEOF
@@ -65141,7 +65736,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_display_charset="$ICONV_CHARSET"
-@@ -58289,16 +21631,12 @@
+@@ -58611,16 +21896,12 @@
  	# check for default unix charset name
  	for j in UTF-8 UTF8 ; do
  
@@ -65161,7 +65756,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -58311,43 +21649,16 @@
+@@ -58633,43 +21914,16 @@
  }
  
  _ACEOF
@@ -65210,7 +65805,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_unix_charset="$ICONV_CHARSET"
-@@ -58386,9 +21697,9 @@
+@@ -58708,9 +21962,9 @@
  	    default_display_charset="ASCII"
  	    default_unix_charset="UTF-8"
  	    samba_cv_HAVE_NATIVE_ICONV=yes
@@ -65222,7 +65817,7 @@
  $as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
  	fi
  
-@@ -58412,9 +21723,7 @@
+@@ -58734,9 +21988,7 @@
  	    default_unix_charset="\"$default_unix_charset\""
  
  
@@ -65233,7 +65828,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -58448,7 +21757,7 @@
+@@ -58770,7 +22022,7 @@
  
  
  if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -65242,7 +65837,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;}
-@@ -58470,20 +21779,16 @@
+@@ -58792,20 +22044,16 @@
  fi
  
  
@@ -65267,7 +65862,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58497,67 +21802,34 @@
+@@ -58819,67 +22067,34 @@
  }
  
  _ACEOF
@@ -65345,7 +65940,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58571,204 +21843,36 @@
+@@ -58893,204 +22108,36 @@
  }
  
  _ACEOF
@@ -65563,13 +66158,12 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -58776,120 +21880,26 @@
- fi
+@@ -59099,119 +22146,25 @@
  
  done
+ 
 -
--
--for ac_func in inotify_init
+ for ac_func in inotify_init
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -65662,8 +66256,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 inotify_init
 +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 :
@@ -65693,7 +66285,7 @@
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -58900,54 +21910,29 @@
+@@ -59222,54 +22175,29 @@
    return 0;
  }
  _ACEOF
@@ -65754,7 +66346,7 @@
  
  fi
  
-@@ -58956,157 +21941,18 @@
+@@ -59278,157 +22206,18 @@
  #	http://oss.sgi.com/projects/fam/
  #	http://savannah.nongnu.org/projects/fam/
  # Check whether --enable-fam was given.
@@ -65918,7 +66510,7 @@
  _ACEOF
   samba_cv_HAVE_FAM_H=yes
  else
-@@ -59118,18 +21964,14 @@
+@@ -59440,18 +22229,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.
@@ -65940,7 +66532,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59147,43 +21989,18 @@
+@@ -59469,48 +22254,21 @@
    return 0;
  }
  _ACEOF
@@ -65987,10 +66579,16 @@
  $as_echo "$ac_cv_lib_fam_FAMOpen2" >&6; }
 -if test "x$ac_cv_lib_fam_FAMOpen2" = x""yes; then
 +if test "x$ac_cv_lib_fam_FAMOpen2" = x""yes; then :
-   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
+   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam";
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FAMOPEN2 1
+-_ACEOF
++$as_echo "#define HAVE_FAMOPEN2 1" >>confdefs.h
+ 
  else
    samba_cv_HAVE_LIBFAM=no
-@@ -59194,23 +22011,17 @@
+@@ -59521,23 +22279,17 @@
              samba_fam_xtra=-lC
  
  
@@ -66017,7 +66615,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59228,72 +22039,41 @@
+@@ -59555,76 +22307,43 @@
    return 0;
  }
  _ACEOF
@@ -66076,9 +66674,15 @@
  
 -if test $ac_cv_lib_ext_fam = yes; then
 +if test $ac_cv_lib_ext_fam = yes; then :
-   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC"
+   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC";
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FAMOPEN2 1
+-_ACEOF
++$as_echo "#define HAVE_FAMOPEN2 1" >>confdefs.h
  
+ 
+ 
  else
    samba_cv_HAVE_LIBFAM=no
  fi
@@ -66086,7 +66690,6 @@
              unset samba_fam_xtra
          fi
      fi
- 
      if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
          default_shared_modules="$default_shared_modules vfs_notify_fam"
 -        cat >conftest.$ac_ext <<_ACEOF
@@ -66098,7 +66701,7 @@
  /* end confdefs.h.  */
  #include <fam.h>
  int
-@@ -59304,43 +22084,16 @@
+@@ -59635,52 +22354,23 @@
    return 0;
  }
  _ACEOF
@@ -66137,6 +66740,82 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      fi
  
+     if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for FAMNoExists in -lfam" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FAMNoExists in -lfam" >&5
+ $as_echo_n "checking for FAMNoExists in -lfam... " >&6; }
+-if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then
++if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lfam  $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.
+@@ -59698,56 +22388,27 @@
+   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_fam_FAMNoExists=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_fam_FAMNoExists=no
++  ac_cv_lib_fam_FAMNoExists=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_fam_FAMNoExists" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fam_FAMNoExists" >&5
+ $as_echo "$ac_cv_lib_fam_FAMNoExists" >&6; }
+-if test "x$ac_cv_lib_fam_FAMNoExists" = x""yes; then
++if test "x$ac_cv_lib_fam_FAMNoExists" = x""yes; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FAMNOEXISTS 1
+-_ACEOF
++$as_echo "#define HAVE_FAMNOEXISTS 1" >>confdefs.h
+ 
+ fi
+ 
+     fi
+ 
      if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
 -        { { $as_echo "$as_me:$LINENO: error: FAM support requested but FAM library not available " >&5
 -$as_echo "$as_me: error: FAM support requested but FAM library not available " >&2;}
@@ -66145,7 +66824,30 @@
      fi
  fi
  
-@@ -59353,18 +22106,14 @@
+@@ -59758,11 +22419,11 @@
+ 
+ 
+ with_dmapi_support=auto
+-{ $as_echo "$as_me:$LINENO: checking whether to use DMAPI support" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DMAPI support" >&5
+ $as_echo_n "checking whether to use DMAPI support... " >&6; }
+ 
+ # Check whether --with-dmapi was given.
+-if test "${with_dmapi+set}" = set; then
++if test "${with_dmapi+set}" = set; then :
+   withval=$with_dmapi;  case "$withval" in
+   yes|no)
+     with_dmapi_support=$withval
+@@ -59771,7 +22432,7 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_dmapi_support" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dmapi_support" >&5
+ $as_echo "$with_dmapi_support" >&6; }
+ 
+ if test x"$with_dmapi_support" != xno ; then
+@@ -59779,18 +22440,14 @@
      samba_dmapi_libs=""
  
      if test x"$samba_dmapi_libs" = x"" ; then
@@ -66167,7 +66869,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59382,61 +22131,32 @@
+@@ -59808,61 +22465,32 @@
    return 0;
  }
  _ACEOF
@@ -66238,7 +66940,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59454,61 +22174,32 @@
+@@ -59880,61 +22508,32 @@
    return 0;
  }
  _ACEOF
@@ -66309,7 +67011,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59526,61 +22217,32 @@
+@@ -59952,61 +22551,32 @@
    return 0;
  }
  _ACEOF
@@ -66380,7 +67082,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59598,43 +22260,18 @@
+@@ -60024,43 +22594,18 @@
    return 0;
  }
  _ACEOF
@@ -66430,7 +67132,7 @@
    samba_dmapi_libs="-lxdsm"
  fi
  
-@@ -59643,153 +22280,12 @@
+@@ -60069,153 +22614,12 @@
  
      # Only bother to test ehaders if we have a candidate DMAPI library
      if test x"$samba_dmapi_libs" != x"" ; then
@@ -66590,7 +67292,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -59803,11 +22299,7 @@
+@@ -60229,11 +22633,7 @@
      if test x"$samba_dmapi_libs" != x"" ; then
  	samba_dmapi_save_LIBS="$LIBS"
  	LIBS="$LIBS $samba_dmapi_libs"
@@ -66603,10 +67305,12 @@
  /* end confdefs.h.  */
  
  #include <time.h>      /* needed by Tru64 */
-@@ -59842,50 +22334,25 @@
+@@ -60266,45 +22666,20 @@
+ 
+   ;
    return 0;
- }
- _ACEOF
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -66628,6 +67332,8 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
  
  		    true # DMAPI link test succeeded
@@ -66650,15 +67356,22 @@
  	LIBS="$samba_dmapi_save_LIBS"
      fi
  
-     if test x"$samba_dmapi_libs" = x"" ; then
+@@ -60312,12 +22687,10 @@
  	# DMAPI detection failure actions begin
  
+ 
 -		{ $as_echo "$as_me:$LINENO: DMAPI support not present" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
  $as_echo "$as_me: DMAPI support not present" >&6;}
+ 		if test x"$with_dmapi_support" = xyes ; then
+-			{ { $as_echo "$as_me:$LINENO: error: no DMAPI support found but requested!" >&5
+-$as_echo "$as_me: error: no DMAPI support found but requested!" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "no DMAPI support found but requested!" "$LINENO" 5
+ 		fi
  
- 	# DMAPI detection failure actions end
-@@ -59893,11 +22360,9 @@
+ 
+@@ -60327,11 +22700,9 @@
  	# DMAPI detection success actions start
  
  
@@ -66672,7 +67385,7 @@
  $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
  
  	# DMAPI detection success actions end
-@@ -59911,20 +22376,16 @@
+@@ -60346,20 +22717,16 @@
      default_shared_modules="$default_shared_modules vfs_tsmsm"
  fi
  
@@ -66697,7 +67410,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -59940,65 +22401,32 @@
+@@ -60375,65 +22742,32 @@
  }
  
  _ACEOF
@@ -66772,7 +67485,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -60010,185 +22438,29 @@
+@@ -60445,185 +22779,29 @@
    return 0;
  }
  _ACEOF
@@ -66965,7 +67678,7 @@
  
  fi
  
-@@ -60198,110 +22470,18 @@
+@@ -60633,110 +22811,18 @@
  
      ac_save_LIBS=$LIBS
  
@@ -67082,7 +67795,7 @@
  
  
  
-@@ -60318,18 +22498,14 @@
+@@ -60753,18 +22839,14 @@
  	    ;;
            *)
  	    # cap_get_proc was not found, try adding libcap
@@ -67104,7 +67817,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -60347,50 +22523,23 @@
+@@ -60782,50 +22864,23 @@
    return 0;
  }
  _ACEOF
@@ -67162,7 +67875,7 @@
  
  
  
-@@ -60412,20 +22561,16 @@
+@@ -60847,20 +22902,16 @@
  
  
  
@@ -67187,7 +67900,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -60441,52 +22586,23 @@
+@@ -60876,52 +22927,23 @@
   exit(0);
  }
  _ACEOF
@@ -67246,7 +67959,7 @@
  
  else
      LIBS=$ac_save_LIBS
-@@ -60499,17 +22615,13 @@
+@@ -60934,17 +22956,13 @@
  # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
  #
  
@@ -67267,7 +67980,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60523,55 +22635,28 @@
+@@ -60958,55 +22976,28 @@
    return 0;
  }
  _ACEOF
@@ -67330,7 +68043,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60585,55 +22670,28 @@
+@@ -61020,55 +23011,28 @@
    return 0;
  }
  _ACEOF
@@ -67393,7 +68106,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60647,55 +22705,28 @@
+@@ -61082,55 +23046,28 @@
    return 0;
  }
  _ACEOF
@@ -67417,12 +68130,11 @@
 -       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
-+else
 +  samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
  fi
 -
@@ -67457,7 +68169,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60709,56 +22740,29 @@
+@@ -61144,56 +23081,29 @@
    return 0;
  }
  _ACEOF
@@ -67521,7 +68233,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_SECURITY_H
-@@ -60776,238 +22780,112 @@
+@@ -61211,238 +23121,112 @@
    return 0;
  }
  _ACEOF
@@ -67796,7 +68508,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -61018,63 +22896,32 @@
+@@ -61453,63 +23237,32 @@
    return 0;
  }
  _ACEOF
@@ -67869,7 +68581,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -61085,63 +22932,32 @@
+@@ -61520,63 +23273,32 @@
    return 0;
  }
  _ACEOF
@@ -67942,7 +68654,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -61152,63 +22968,32 @@
+@@ -61587,63 +23309,32 @@
    return 0;
  }
  _ACEOF
@@ -68015,7 +68727,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -61219,147 +23004,30 @@
+@@ -61654,147 +23345,30 @@
    return 0;
  }
  _ACEOF
@@ -68173,7 +68885,7 @@
  _ACEOF
  
  fi
-@@ -61371,20 +23039,16 @@
+@@ -61806,20 +23380,16 @@
  seteuid=no;
  
  if test $seteuid = no; then
@@ -68198,7 +68910,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61392,50 +23056,21 @@
+@@ -61827,50 +23397,21 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68255,7 +68967,7 @@
  
  fi
  fi
-@@ -61443,20 +23078,16 @@
+@@ -61878,20 +23419,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
@@ -68280,7 +68992,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61464,69 +23095,36 @@
+@@ -61899,69 +23436,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68360,7 +69072,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61534,69 +23132,36 @@
+@@ -61969,69 +23473,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68440,7 +69152,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61604,64 +23169,31 @@
+@@ -62039,64 +23510,31 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68514,7 +69226,7 @@
  /* end confdefs.h.  */
  
  #include <sys/syscall.h>
-@@ -61675,195 +23207,98 @@
+@@ -62110,195 +23548,98 @@
    return 0;
  }
  _ACEOF
@@ -68740,7 +69452,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -61887,67 +23322,34 @@
+@@ -62322,67 +23663,34 @@
  #endif
  }
  _ACEOF
@@ -68817,7 +69529,7 @@
  /* end confdefs.h.  */
  
    #define _XOPEN_SOURCE 600
-@@ -61965,56 +23367,29 @@
+@@ -62400,56 +23708,29 @@
    return 0;
  }
  _ACEOF
@@ -68881,7 +69593,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -62027,141 +23402,24 @@
+@@ -62462,141 +23743,24 @@
    return 0;
  }
  _ACEOF
@@ -69030,7 +69742,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_BLKSIZE_T 1
-@@ -62169,103 +23427,9 @@
+@@ -62604,103 +23768,9 @@
  
  
  fi
@@ -69137,7 +69849,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_BLKCNT_T 1
-@@ -62275,17 +23439,13 @@
+@@ -62710,17 +23780,13 @@
  fi
  
  
@@ -69158,7 +69870,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -62298,55 +23458,28 @@
+@@ -62733,55 +23799,28 @@
    return 0;
  }
  _ACEOF
@@ -69221,7 +69933,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -62359,57 +23492,30 @@
+@@ -62794,57 +23833,30 @@
    return 0;
  }
  _ACEOF
@@ -69286,7 +69998,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -62425,58 +23531,31 @@
+@@ -62860,58 +23872,31 @@
    return 0;
  }
  _ACEOF
@@ -69353,7 +70065,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -62495,74 +23574,45 @@
+@@ -62930,74 +23915,45 @@
  }
  
  _ACEOF
@@ -69439,7 +70151,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62571,24 +23621,24 @@
+@@ -63006,24 +23962,24 @@
  ####################################################
  # check for Linux-specific AFS fake-kaserver support
  samba_cv_WITH_FAKE_KASERVER=no
@@ -69469,7 +70181,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62600,18 +23650,14 @@
+@@ -63035,18 +23991,14 @@
     test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
  
      # see if this box has the OpenSSL DES libraries
@@ -69491,7 +70203,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62629,208 +23675,43 @@
+@@ -63064,208 +24016,43 @@
    return 0;
  }
  _ACEOF
@@ -69716,7 +70428,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62842,12 +23723,10 @@
+@@ -63277,12 +24064,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
@@ -69731,7 +70443,7 @@
  	fi
      else
      	have_afs_headers=yes
-@@ -62857,9 +23736,7 @@
+@@ -63292,9 +24077,7 @@
  FAKE_KASERVER_OBJ=""
  if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69742,7 +70454,7 @@
  
      FAKE_KASERVER_OBJ="utils/net_afs.o"
  fi
-@@ -62868,24 +23745,24 @@
+@@ -63303,24 +24086,24 @@
  #################################################
  # check whether to compile AFS/NT ACL mapping module
  samba_cv_WITH_VFS_AFSACL=no
@@ -69772,7 +70484,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62897,36 +23774,32 @@
+@@ -63332,36 +24115,32 @@
  
  if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69816,7 +70528,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62936,12 +23809,12 @@
+@@ -63371,12 +24150,12 @@
  # Compile with LDAP support?
  
  with_ldap_support=auto
@@ -69831,7 +70543,7 @@
    withval=$with_ldap;  case "$withval" in
      yes|no)
  	with_ldap_support=$withval
-@@ -62950,7 +23823,7 @@
+@@ -63385,7 +24164,7 @@
  fi
  
  
@@ -69840,7 +70552,7 @@
  $as_echo "$with_ldap_support" >&6; }
  
  SMBLDAP=""
-@@ -62965,150 +23838,12 @@
+@@ -63398,150 +24177,12 @@
    ##################################################################
    # first test for ldap.h and lber.h
    # (ldap.h is required for this test)
@@ -69997,7 +70709,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -63120,11 +23855,9 @@
+@@ -63553,11 +24194,9 @@
  
    if test x"$ac_cv_header_ldap_h" != x"yes"; then
  	if test x"$with_ldap_support" = x"yes"; then
@@ -70011,7 +70723,7 @@
  $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
  	fi
  
-@@ -63136,117 +23869,24 @@
+@@ -63569,117 +24208,24 @@
    # unsigned int in include/includes.h
    case $host_os in
  	*hpux*)
@@ -70136,7 +70848,7 @@
  $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
  		fi
  		with_ldap_support=no
-@@ -63263,23 +23903,17 @@
+@@ -63696,23 +24242,17 @@
    # this test must be before the libldap test
  
  
@@ -70163,7 +70875,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63297,54 +23931,28 @@
+@@ -63730,54 +24270,28 @@
    return 0;
  }
  _ACEOF
@@ -70225,7 +70937,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLBER 1
  _ACEOF
-@@ -63360,25 +23968,19 @@
+@@ -63793,25 +24307,19 @@
  
  fi
  
@@ -70254,7 +70966,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.  */
-@@ -63419,61 +24021,31 @@
+@@ -63852,61 +24360,31 @@
    return 0;
  }
  _ACEOF
@@ -70325,7 +71037,7 @@
  /* end confdefs.h.  */
  #include <ldap.h>
  int
-@@ -63484,59 +24056,32 @@
+@@ -63917,59 +24395,32 @@
    return 0;
  }
  _ACEOF
@@ -70392,7 +71104,7 @@
  /* end confdefs.h.  */
  #include <lber.h>
  int
-@@ -63547,42 +24092,19 @@
+@@ -63980,42 +24431,19 @@
    return 0;
  }
  _ACEOF
@@ -70439,7 +71151,7 @@
  
    fi
  
-@@ -63590,23 +24112,17 @@
+@@ -64023,23 +24451,17 @@
    # now see if we can find the ldap libs in standard paths
  
  
@@ -70466,7 +71178,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63624,54 +24140,28 @@
+@@ -64057,54 +24479,28 @@
    return 0;
  }
  _ACEOF
@@ -70528,7 +71240,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLDAP 1
  _ACEOF
-@@ -63687,25 +24177,19 @@
+@@ -64120,25 +24516,19 @@
  
  fi
  
@@ -70557,7 +71269,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.  */
-@@ -63746,62 +24230,32 @@
+@@ -64179,62 +24569,32 @@
    return 0;
  }
  _ACEOF
@@ -70629,7 +71341,7 @@
  /* end confdefs.h.  */
  
  	#include <lber.h>
-@@ -63814,37 +24268,16 @@
+@@ -64247,37 +24607,16 @@
    return 0;
  }
  _ACEOF
@@ -70670,7 +71382,7 @@
  $as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
  
  
-@@ -63855,19 +24288,14 @@
+@@ -64288,19 +24627,14 @@
  
  
  
@@ -70693,7 +71405,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.  */
-@@ -63908,55 +24336,27 @@
+@@ -64341,55 +24675,27 @@
    return 0;
  }
  _ACEOF
@@ -70756,7 +71468,7 @@
  
      CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
      default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -63964,17 +24364,15 @@
+@@ -64397,17 +24703,15 @@
      SMBLDAP="lib/smbldap.o"
      SMBLDAPUTIL="lib/smbldap_util.o"
      with_ldap_support=yes
@@ -70778,7 +71490,7 @@
  $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
      fi
  
-@@ -63989,12 +24387,12 @@
+@@ -64422,12 +24726,12 @@
  # active directory support
  
  with_ads_support=auto
@@ -70793,7 +71505,7 @@
    withval=$with_ads;  case "$withval" in
      yes|no)
  	with_ads_support="$withval"
-@@ -64003,7 +24401,7 @@
+@@ -64436,7 +24740,7 @@
  fi
  
  
@@ -70802,7 +71514,7 @@
  $as_echo "$with_ads_support" >&6; }
  
  FOUND_KRB5=no
-@@ -64012,11 +24410,9 @@
+@@ -64445,11 +24749,9 @@
  if test x"$with_ldap_support" != x"yes"; then
  
      if test x"$with_ads_support" = x"yes"; then
@@ -70816,7 +71528,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
  	with_ads_support=no
      fi
-@@ -64031,19 +24427,14 @@
+@@ -64464,19 +24766,14 @@
  	*hpux*)
  
  
@@ -70839,7 +71551,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.  */
-@@ -64084,57 +24475,29 @@
+@@ -64517,57 +24814,29 @@
    return 0;
  }
  _ACEOF
@@ -70905,7 +71617,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -64143,19 +24506,14 @@
+@@ -64576,19 +24845,14 @@
  	*)
  
  
@@ -70928,7 +71640,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.  */
-@@ -64196,57 +24554,29 @@
+@@ -64629,57 +24893,29 @@
    return 0;
  }
  _ACEOF
@@ -70994,7 +71706,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -64257,19 +24587,14 @@
+@@ -64690,19 +24926,14 @@
  
  
  
@@ -71017,7 +71729,7 @@
  /* 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.  */
-@@ -64310,57 +24635,29 @@
+@@ -64743,57 +24974,29 @@
    return 0;
  }
  _ACEOF
@@ -71083,7 +71795,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -64376,23 +24673,23 @@
+@@ -64809,23 +25012,23 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # check for location of Kerberos 5 install
@@ -71112,7 +71824,7 @@
  $as_echo "$withval" >&6; }
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
-@@ -64404,7 +24701,7 @@
+@@ -64837,7 +25040,7 @@
          ;;
        esac
  else
@@ -71121,7 +71833,7 @@
  $as_echo "no krb5-path given" >&6; }
  
  fi
-@@ -64415,9 +24712,9 @@
+@@ -64848,9 +25051,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
@@ -71133,7 +71845,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $KRB5CONFIG in
-@@ -64430,14 +24727,14 @@
+@@ -64863,14 +25066,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -71151,7 +71863,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -64445,15 +24742,15 @@
+@@ -64878,15 +25081,15 @@
  fi
  KRB5CONFIG=$ac_cv_path_KRB5CONFIG
  if test -n "$KRB5CONFIG"; then
@@ -71170,7 +71882,7 @@
  $as_echo_n "checking for working krb5-config... " >&6; }
    if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
      ac_save_CFLAGS=$CFLAGS
-@@ -64467,17 +24764,17 @@
+@@ -64900,17 +25103,17 @@
      CFLAGS=$ac_save_CFLAGS;export CFLAGS
      LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
      FOUND_KRB5=yes
@@ -71191,7 +71903,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
-@@ -64485,17 +24782,17 @@
+@@ -64918,17 +25121,17 @@
            KRB5_CPPFLAGS="-I/usr/include/heimdal"
            KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
  	  FOUND_KRB5=yes
@@ -71212,7 +71924,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64503,17 +24800,17 @@
+@@ -64936,17 +25139,17 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the RedHat location for kerberos
@@ -71233,7 +71945,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64521,16 +24818,16 @@
+@@ -64954,16 +25157,16 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the OpenBSD location for heimdal krb5
@@ -71253,53 +71965,11 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64575,193 +24872,54 @@
-   KRB5_LIBS=$ac_new_flags
- 
- 
--  ac_new_flags=""
--  l=""
--  for i in $KRB5_LDFLAGS; do
--    case $l$i in
--    -L/usr/lib) ;;
--    -L/usr/lib/) ;;
--    -L/usr/lib64) ;;
--    -L/usr/lib64/) ;;
--    -Wl,-rpath,/usr/lib) l="";;
--    -Wl,-rpath,/usr/lib/) l="";;
--    -Wl,-rpath,/usr/lib64) l="";;
--    -Wl,-rpath,/usr/lib64/) l="";;
--    -Wl,-rpath) l=$i;;
--    -Wl,-rpath-Wl,/usr/lib) l="";;
--    -Wl,-rpath-Wl,/usr/lib/) l="";;
--    -Wl,-rpath-Wl,/usr/lib64) l="";;
--    -Wl,-rpath-Wl,/usr/lib64/) l="";;
--    *)
--    	s=" "
--        if test x"$ac_new_flags" = x""; then
--            s="";
--	fi
--        if test x"$l" = x""; then
--            ac_new_flags="$ac_new_flags$s$i";
--        else
--            ac_new_flags="$ac_new_flags$s$l $i";
--        fi
--        l=""
--        ;;
--    esac
--  done
--  KRB5_LDFLAGS=$ac_new_flags
+@@ -65050,151 +25253,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
 -
--  CFLAGS="$KRB5_CFLAGS $CFLAGS"
--  CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
--  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
--
--  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
--
--  # 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
--
 -for ac_header in krb5.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -71395,39 +72065,7 @@
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+  ac_new_flags=""
-+  l=""
-+  for i in $KRB5_LDFLAGS; do
-+    case $l$i in
-+    -L/usr/lib) ;;
-+    -L/usr/lib/) ;;
-+    -L/usr/lib64) ;;
-+    -L/usr/lib64/) ;;
-+    -Wl,-rpath,/usr/lib) l="";;
-+    -Wl,-rpath,/usr/lib/) l="";;
-+    -Wl,-rpath,/usr/lib64) l="";;
-+    -Wl,-rpath,/usr/lib64/) l="";;
-+    -Wl,-rpath) l=$i;;
-+    -Wl,-rpath-Wl,/usr/lib) l="";;
-+    -Wl,-rpath-Wl,/usr/lib/) l="";;
-+    -Wl,-rpath-Wl,/usr/lib64) l="";;
-+    -Wl,-rpath-Wl,/usr/lib64/) l="";;
-+    *)
-+    	s=" "
-+        if test x"$ac_new_flags" = x""; then
-+            s="";
-+	fi
-+        if test x"$l" = x""; then
-+            ac_new_flags="$ac_new_flags$s$i";
-+        else
-+            ac_new_flags="$ac_new_flags$s$l $i";
-+        fi
-+        l=""
-+        ;;
-+    esac
-+  done
-+  KRB5_LDFLAGS=$ac_new_flags
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -71469,19 +72107,11 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+  CFLAGS="$KRB5_CFLAGS $CFLAGS"
-+  CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
-+  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
- 
+-
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
-+
-+  # 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
 +  for ac_header in krb5.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
@@ -71492,7 +72122,7 @@
  _ACEOF
  
  fi
-@@ -64775,11 +24933,9 @@
+@@ -65208,11 +25272,9 @@
      # i.e with_ads_support = auto, otherwise die with an error.
  
      if test x"$with_ads_support" = x"yes"; then
@@ -71506,7 +72136,7 @@
  $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
      fi
  
-@@ -64791,65 +24947,16 @@
+@@ -65224,65 +25286,16 @@
      CPPFLAGS=$ac_save_CPPFLAGS
      LDFLAGS=$ac_save_LDFLAGS
    fi
@@ -71578,7 +72208,7 @@
  _ACEOF
  
  fi
-@@ -64866,17 +24973,13 @@
+@@ -65299,17 +25312,13 @@
  
    # check for new heimdal KRB5_DEPRECATED handling
  
@@ -71599,7 +72229,7 @@
  /* end confdefs.h.  */
  #define KRB5_DEPRECATED 1
        #include <krb5.h>
-@@ -64888,42 +24991,19 @@
+@@ -65321,42 +25330,19 @@
    return 0;
  }
  _ACEOF
@@ -71646,7 +72276,7 @@
  
    fi
  fi
-@@ -64937,152 +25017,12 @@
+@@ -65370,152 +25356,12 @@
  
    # now check for gssapi headers.  This is also done here to allow for
    # different kerberos include paths
@@ -71805,7 +72435,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -65096,23 +25036,17 @@
+@@ -65529,23 +25375,17 @@
    # we might need the k5crypto and com_err libraries on some systems
  
  
@@ -71832,7 +72462,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65130,54 +25064,28 @@
+@@ -65563,54 +25403,28 @@
    return 0;
  }
  _ACEOF
@@ -71894,7 +72524,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCOM_ERR 1
  _ACEOF
-@@ -65194,24 +25102,17 @@
+@@ -65627,24 +25441,17 @@
  fi
  
  
@@ -71922,7 +72552,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65229,54 +25130,28 @@
+@@ -65662,54 +25469,28 @@
    return 0;
  }
  _ACEOF
@@ -71984,7 +72614,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBK5CRYPTO 1
  _ACEOF
-@@ -65292,27 +25167,20 @@
+@@ -65725,27 +25506,20 @@
  
  fi
  
@@ -72015,7 +72645,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65330,54 +25198,28 @@
+@@ -65763,54 +25537,28 @@
    return 0;
  }
  _ACEOF
@@ -72077,7 +72707,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPTO 1
  _ACEOF
-@@ -65394,24 +25236,17 @@
+@@ -65827,24 +25575,17 @@
  fi
  
  
@@ -72105,7 +72735,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65429,54 +25264,28 @@
+@@ -65862,54 +25603,28 @@
    return 0;
  }
  _ACEOF
@@ -72167,7 +72797,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBASN1 1
  _ACEOF
-@@ -65493,24 +25302,17 @@
+@@ -65926,24 +25641,17 @@
  fi
  
  
@@ -72195,7 +72825,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65528,54 +25330,28 @@
+@@ -65961,54 +25669,28 @@
    return 0;
  }
  _ACEOF
@@ -72257,7 +72887,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBROKEN 1
  _ACEOF
-@@ -65591,27 +25367,20 @@
+@@ -66024,27 +25706,20 @@
  
  fi
  
@@ -72288,7 +72918,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65629,54 +25398,28 @@
+@@ -66062,54 +25737,28 @@
    return 0;
  }
  _ACEOF
@@ -72350,7 +72980,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI 1
  _ACEOF
-@@ -65692,29 +25435,22 @@
+@@ -66125,29 +25774,22 @@
  
  fi
  
@@ -72383,7 +73013,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65732,54 +25468,28 @@
+@@ -66165,54 +25807,28 @@
    return 0;
  }
  _ACEOF
@@ -72445,7 +73075,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65796,24 +25506,17 @@
+@@ -66229,24 +25845,17 @@
  fi
  
  
@@ -72473,7 +73103,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65831,54 +25534,28 @@
+@@ -66264,54 +25873,28 @@
    return 0;
  }
  _ACEOF
@@ -72535,7 +73165,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65894,29 +25571,22 @@
+@@ -66327,29 +25910,22 @@
  
  fi
  
@@ -72568,7 +73198,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65934,54 +25604,28 @@
+@@ -66367,54 +25943,28 @@
    return 0;
  }
  _ACEOF
@@ -72630,7 +73260,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI_KRB5 1
  _ACEOF
-@@ -65996,24 +25640,18 @@
+@@ -66429,24 +25979,18 @@
  		have_gssapi=yes
  
  fi
@@ -72658,7 +73288,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.  */
-@@ -66054,43 +25692,18 @@
+@@ -66487,43 +26031,18 @@
    return 0;
  }
  _ACEOF
@@ -72685,11 +73315,12 @@
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_set_real_time=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_func_ext_krb5_set_real_time=no
++else
 +  ac_cv_func_ext_krb5_set_real_time=no
  fi
 -
@@ -72708,7 +73339,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_REAL_TIME 1
  _ACEOF
-@@ -66098,20 +25711,14 @@
+@@ -66531,20 +26050,14 @@
  fi
  
  
@@ -72732,7 +73363,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.  */
-@@ -66152,43 +25759,18 @@
+@@ -66585,43 +26098,18 @@
    return 0;
  }
  _ACEOF
@@ -72782,7 +73413,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -66196,20 +25778,14 @@
+@@ -66629,20 +26117,14 @@
  fi
  
  
@@ -72806,7 +73437,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.  */
-@@ -66250,43 +25826,18 @@
+@@ -66683,43 +26165,18 @@
    return 0;
  }
  _ACEOF
@@ -72856,7 +73487,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
  _ACEOF
-@@ -66294,20 +25845,14 @@
+@@ -66727,20 +26184,14 @@
  fi
  
  
@@ -72880,7 +73511,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.  */
-@@ -66348,43 +25893,18 @@
+@@ -66781,43 +26232,18 @@
    return 0;
  }
  _ACEOF
@@ -72930,7 +73561,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
  _ACEOF
-@@ -66392,20 +25912,14 @@
+@@ -66825,20 +26251,14 @@
  fi
  
  
@@ -72954,7 +73585,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.  */
-@@ -66446,43 +25960,18 @@
+@@ -66879,43 +26299,18 @@
    return 0;
  }
  _ACEOF
@@ -73004,7 +73635,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL2SALT 1
  _ACEOF
-@@ -66490,20 +25979,14 @@
+@@ -66923,20 +26318,14 @@
  fi
  
  
@@ -73028,7 +73659,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.  */
-@@ -66544,43 +26027,18 @@
+@@ -66977,43 +26366,18 @@
    return 0;
  }
  _ACEOF
@@ -73078,7 +73709,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_USE_ENCTYPE 1
  _ACEOF
-@@ -66588,20 +26046,14 @@
+@@ -67021,20 +26385,14 @@
  fi
  
  
@@ -73102,7 +73733,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.  */
-@@ -66642,43 +26094,18 @@
+@@ -67075,43 +26433,18 @@
    return 0;
  }
  _ACEOF
@@ -73152,7 +73783,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY 1
  _ACEOF
-@@ -66686,20 +26113,14 @@
+@@ -67119,20 +26452,14 @@
  fi
  
  
@@ -73176,7 +73807,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.  */
-@@ -66740,43 +26161,18 @@
+@@ -67173,43 +26500,18 @@
    return 0;
  }
  _ACEOF
@@ -73226,7 +73857,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PW_SALT 1
  _ACEOF
-@@ -66784,20 +26180,14 @@
+@@ -67217,20 +26519,14 @@
  fi
  
  
@@ -73250,7 +73881,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.  */
-@@ -66838,43 +26228,18 @@
+@@ -67271,43 +26567,18 @@
    return 0;
  }
  _ACEOF
@@ -73300,7 +73931,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY_SALT 1
  _ACEOF
-@@ -66882,20 +26247,14 @@
+@@ -67315,20 +26586,14 @@
  fi
  
  
@@ -73324,7 +73955,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.  */
-@@ -66936,43 +26295,18 @@
+@@ -67369,43 +26634,18 @@
    return 0;
  }
  _ACEOF
@@ -73374,7 +74005,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETKEY 1
  _ACEOF
-@@ -66980,20 +26314,14 @@
+@@ -67413,20 +26653,14 @@
  fi
  
  
@@ -73398,7 +74029,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.  */
-@@ -67034,43 +26362,18 @@
+@@ -67467,43 +26701,18 @@
    return 0;
  }
  _ACEOF
@@ -73448,7 +74079,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
  _ACEOF
-@@ -67078,20 +26381,14 @@
+@@ -67511,20 +26720,14 @@
  fi
  
  
@@ -73472,7 +74103,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.  */
-@@ -67132,43 +26429,18 @@
+@@ -67565,43 +26768,18 @@
    return 0;
  }
  _ACEOF
@@ -73522,7 +74153,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_LOCATE_KDC 1
  _ACEOF
-@@ -67176,20 +26448,14 @@
+@@ -67609,20 +26787,14 @@
  fi
  
  
@@ -73546,7 +74177,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.  */
-@@ -67230,43 +26496,18 @@
+@@ -67663,43 +26835,18 @@
    return 0;
  }
  _ACEOF
@@ -73596,7 +74227,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
  _ACEOF
-@@ -67274,20 +26515,14 @@
+@@ -67707,20 +26854,14 @@
  fi
  
  
@@ -73620,7 +74251,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.  */
-@@ -67328,43 +26563,18 @@
+@@ -67761,43 +26902,18 @@
    return 0;
  }
  _ACEOF
@@ -73670,7 +74301,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -67372,20 +26582,14 @@
+@@ -67805,20 +26921,14 @@
  fi
  
  
@@ -73694,7 +74325,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.  */
-@@ -67426,43 +26630,18 @@
+@@ -67859,43 +26969,18 @@
    return 0;
  }
  _ACEOF
@@ -73744,7 +74375,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_DATA_CONTENTS 1
  _ACEOF
-@@ -67470,20 +26649,14 @@
+@@ -67903,20 +26988,14 @@
  fi
  
  
@@ -73768,7 +74399,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.  */
-@@ -67524,43 +26697,18 @@
+@@ -67957,43 +27036,18 @@
    return 0;
  }
  _ACEOF
@@ -73818,7 +74449,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
  _ACEOF
-@@ -67568,20 +26716,14 @@
+@@ -68001,20 +27055,14 @@
  fi
  
  
@@ -73842,7 +74473,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.  */
-@@ -67622,43 +26764,18 @@
+@@ -68055,43 +27103,18 @@
    return 0;
  }
  _ACEOF
@@ -73892,7 +74523,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_UNPARSED_NAME 1
  _ACEOF
-@@ -67666,20 +26783,14 @@
+@@ -68099,20 +27122,14 @@
  fi
  
  
@@ -73916,7 +74547,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.  */
-@@ -67720,43 +26831,18 @@
+@@ -68153,43 +27170,18 @@
    return 0;
  }
  _ACEOF
@@ -73966,7 +74597,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
  _ACEOF
-@@ -67764,20 +26850,14 @@
+@@ -68197,20 +27189,14 @@
  fi
  
  
@@ -73990,7 +74621,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.  */
-@@ -67818,43 +26898,18 @@
+@@ -68251,43 +27237,18 @@
    return 0;
  }
  _ACEOF
@@ -74040,7 +74671,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KT_FREE_ENTRY 1
  _ACEOF
-@@ -67862,20 +26917,14 @@
+@@ -68295,20 +27256,14 @@
  fi
  
  
@@ -74064,7 +74695,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.  */
-@@ -67916,43 +26965,18 @@
+@@ -68349,43 +27304,18 @@
    return 0;
  }
  _ACEOF
@@ -74114,7 +74745,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_INIT 1
  _ACEOF
-@@ -67960,20 +26984,14 @@
+@@ -68393,20 +27323,14 @@
  fi
  
  
@@ -74138,7 +74769,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.  */
-@@ -68014,43 +27032,18 @@
+@@ -68447,43 +27371,18 @@
    return 0;
  }
  _ACEOF
@@ -74188,7 +74819,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
  _ACEOF
-@@ -68058,20 +27051,14 @@
+@@ -68491,20 +27390,14 @@
  fi
  
  
@@ -74212,7 +74843,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.  */
-@@ -68112,43 +27099,18 @@
+@@ -68545,43 +27438,18 @@
    return 0;
  }
  _ACEOF
@@ -74262,7 +74893,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_ENCTYPE_COMPARE 1
  _ACEOF
-@@ -68156,20 +27118,14 @@
+@@ -68589,20 +27457,14 @@
  fi
  
  
@@ -74286,7 +74917,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.  */
-@@ -68210,43 +27166,18 @@
+@@ -68643,43 +27505,18 @@
    return 0;
  }
  _ACEOF
@@ -74336,7 +74967,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
  _ACEOF
-@@ -68254,20 +27185,14 @@
+@@ -68687,20 +27524,14 @@
  fi
  
  
@@ -74360,7 +74991,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.  */
-@@ -68308,43 +27233,18 @@
+@@ -68741,43 +27572,18 @@
    return 0;
  }
  _ACEOF
@@ -74410,7 +75041,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_INIT 1
  _ACEOF
-@@ -68352,20 +27252,14 @@
+@@ -68785,20 +27591,14 @@
  fi
  
  
@@ -74434,7 +75065,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.  */
-@@ -68406,43 +27300,18 @@
+@@ -68839,43 +27639,18 @@
    return 0;
  }
  _ACEOF
@@ -74484,7 +75115,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_DESTROY 1
  _ACEOF
-@@ -68450,20 +27319,14 @@
+@@ -68883,20 +27658,14 @@
  fi
  
  
@@ -74508,7 +75139,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.  */
-@@ -68504,43 +27367,18 @@
+@@ -68937,43 +27706,18 @@
    return 0;
  }
  _ACEOF
@@ -74558,7 +75189,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_DECODE_AP_REQ 1
  _ACEOF
-@@ -68548,20 +27386,14 @@
+@@ -68981,20 +27725,14 @@
  fi
  
  
@@ -74582,7 +75213,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.  */
-@@ -68602,43 +27434,18 @@
+@@ -69035,43 +27773,18 @@
    return 0;
  }
  _ACEOF
@@ -74632,7 +75263,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_FREE_AP_REQ 1
  _ACEOF
-@@ -68646,20 +27453,14 @@
+@@ -69079,20 +27792,14 @@
  fi
  
  
@@ -74656,7 +75287,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.  */
-@@ -68700,43 +27501,18 @@
+@@ -69133,43 +27840,18 @@
    return 0;
  }
  _ACEOF
@@ -74706,7 +75337,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68744,20 +27520,14 @@
+@@ -69177,20 +27859,14 @@
  fi
  
  
@@ -74730,7 +75361,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.  */
-@@ -68798,43 +27568,18 @@
+@@ -69231,43 +27907,18 @@
    return 0;
  }
  _ACEOF
@@ -74780,7 +75411,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68842,20 +27587,14 @@
+@@ -69275,20 +27926,14 @@
  fi
  
  
@@ -74804,7 +75435,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.  */
-@@ -68896,43 +27635,18 @@
+@@ -69329,43 +27974,18 @@
    return 0;
  }
  _ACEOF
@@ -74854,7 +75485,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
  _ACEOF
-@@ -68940,20 +27654,14 @@
+@@ -69373,20 +27993,14 @@
  fi
  
  
@@ -74878,7 +75509,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.  */
-@@ -68994,43 +27702,18 @@
+@@ -69427,43 +28041,18 @@
    return 0;
  }
  _ACEOF
@@ -74928,7 +75559,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PARSE_NAME_NOREALM 1
  _ACEOF
-@@ -69038,20 +27721,14 @@
+@@ -69471,20 +28060,14 @@
  fi
  
  
@@ -74952,7 +75583,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.  */
-@@ -69092,43 +27769,18 @@
+@@ -69525,43 +28108,18 @@
    return 0;
  }
  _ACEOF
@@ -75002,7 +75633,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINC_SIZE 1
  _ACEOF
-@@ -69136,20 +27788,14 @@
+@@ -69569,20 +28127,14 @@
  fi
  
  
@@ -75026,7 +75657,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.  */
-@@ -69190,43 +27836,18 @@
+@@ -69623,43 +28175,18 @@
    return 0;
  }
  _ACEOF
@@ -75076,7 +75707,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
  _ACEOF
-@@ -69234,20 +27855,14 @@
+@@ -69667,20 +28194,14 @@
  fi
  
  
@@ -75100,7 +75731,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.  */
-@@ -69288,43 +27903,18 @@
+@@ -69721,43 +28242,18 @@
    return 0;
  }
  _ACEOF
@@ -75150,7 +75781,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_RENEWED_CREDS 1
  _ACEOF
-@@ -69332,20 +27922,14 @@
+@@ -69765,20 +28261,14 @@
  fi
  
  
@@ -75174,7 +75805,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.  */
-@@ -69386,43 +27970,18 @@
+@@ -69819,43 +28309,18 @@
    return 0;
  }
  _ACEOF
@@ -75224,7 +75855,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_KDC_CRED 1
  _ACEOF
-@@ -69430,20 +27989,14 @@
+@@ -69863,20 +28328,14 @@
  fi
  
  
@@ -75248,7 +75879,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.  */
-@@ -69484,43 +28037,18 @@
+@@ -69917,43 +28376,18 @@
    return 0;
  }
  _ACEOF
@@ -75298,7 +75929,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_ERROR_CONTENTS 1
  _ACEOF
-@@ -69528,20 +28056,14 @@
+@@ -69961,20 +28395,14 @@
  fi
  
  
@@ -75322,7 +75953,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.  */
-@@ -69582,43 +28104,18 @@
+@@ -70015,43 +28443,18 @@
    return 0;
  }
  _ACEOF
@@ -75372,7 +76003,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
  _ACEOF
-@@ -69626,20 +28123,14 @@
+@@ -70059,20 +28462,14 @@
  fi
  
  
@@ -75396,7 +76027,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.  */
-@@ -69680,43 +28171,18 @@
+@@ -70113,43 +28510,18 @@
    return 0;
  }
  _ACEOF
@@ -75446,7 +76077,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -69724,20 +28190,14 @@
+@@ -70157,20 +28529,14 @@
  fi
  
  
@@ -75470,7 +76101,7 @@
  /* 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.  */
-@@ -69778,43 +28238,18 @@
+@@ -70211,43 +28577,18 @@
    return 0;
  }
  _ACEOF
@@ -75520,7 +76151,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
  _ACEOF
-@@ -69822,20 +28257,14 @@
+@@ -70255,20 +28596,14 @@
  fi
  
  
@@ -75544,19 +76175,10 @@
  /* 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.  */
-@@ -69867,52 +28296,27 @@
- #if defined __stub_krb5_get_init_creds_opt_get_error || defined __stub___krb5_get_init_creds_opt_get_error
- choke me
- #endif
--
--int
--main ()
--{
--return krb5_get_init_creds_opt_get_error ();
--  ;
--  return 0;
--}
--_ACEOF
+@@ -70309,43 +28644,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -75578,15 +76200,6 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+
-+int
-+main ()
-+{
-+return krb5_get_init_creds_opt_get_error ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_get_init_creds_opt_get_error=yes
  else
@@ -75612,7 +76225,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
  _ACEOF
-@@ -69920,20 +28324,14 @@
+@@ -70353,20 +28663,14 @@
  fi
  
  
@@ -75636,7 +76249,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.  */
-@@ -69974,43 +28372,18 @@
+@@ -70407,43 +28711,18 @@
    return 0;
  }
  _ACEOF
@@ -75686,7 +76299,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPE_TO_STRING 1
  _ACEOF
-@@ -70018,20 +28391,14 @@
+@@ -70451,20 +28730,14 @@
  fi
  
  
@@ -75710,7 +76323,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.  */
-@@ -70072,43 +28439,18 @@
+@@ -70505,43 +28778,18 @@
    return 0;
  }
  _ACEOF
@@ -75760,7 +76373,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FWD_TGT_CREDS 1
  _ACEOF
-@@ -70116,20 +28458,14 @@
+@@ -70549,20 +28797,14 @@
  fi
  
  
@@ -75784,7 +76397,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.  */
-@@ -70170,43 +28506,18 @@
+@@ -70603,43 +28845,18 @@
    return 0;
  }
  _ACEOF
@@ -75834,7 +76447,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
  _ACEOF
-@@ -70214,20 +28525,14 @@
+@@ -70647,20 +28864,14 @@
  fi
  
  
@@ -75858,7 +76471,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.  */
-@@ -70268,43 +28573,18 @@
+@@ -70701,43 +28912,18 @@
    return 0;
  }
  _ACEOF
@@ -75908,7 +76521,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -70312,20 +28592,14 @@
+@@ -70745,20 +28931,14 @@
  fi
  
  
@@ -75932,7 +76545,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.  */
-@@ -70366,43 +28640,18 @@
+@@ -70799,43 +28979,18 @@
    return 0;
  }
  _ACEOF
@@ -75982,7 +76595,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
  _ACEOF
-@@ -70410,20 +28659,14 @@
+@@ -70843,20 +28998,14 @@
  fi
  
  
@@ -76006,7 +76619,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.  */
-@@ -70464,43 +28707,18 @@
+@@ -70897,43 +29046,18 @@
    return 0;
  }
  _ACEOF
@@ -76056,7 +76669,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS 1
  _ACEOF
-@@ -70508,20 +28726,14 @@
+@@ -70941,20 +29065,14 @@
  fi
  
  
@@ -76080,7 +76693,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.  */
-@@ -70562,43 +28774,18 @@
+@@ -70995,43 +29113,18 @@
    return 0;
  }
  _ACEOF
@@ -76130,7 +76743,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1
  _ACEOF
-@@ -70606,20 +28793,14 @@
+@@ -71039,20 +29132,14 @@
  fi
  
  
@@ -76154,7 +76767,7 @@
  /* 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.  */
-@@ -70660,43 +28841,18 @@
+@@ -71093,43 +29180,18 @@
    return 0;
  }
  _ACEOF
@@ -76204,7 +76817,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_HOST_REALM 1
  _ACEOF
-@@ -70704,20 +28860,14 @@
+@@ -71137,20 +29199,14 @@
  fi
  
  
@@ -76228,7 +76841,7 @@
  /* 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.  */
-@@ -70758,208 +28908,62 @@
+@@ -71191,208 +29247,62 @@
    return 0;
  }
  _ACEOF
@@ -76346,16 +76959,16 @@
  
  cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 0
 +#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER $ac_have_decl
  _ACEOF
  
  
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 0
+-_ACEOF
+-
+-
 -fi
 -
 -
@@ -76458,7 +77071,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -70979,57 +28983,30 @@
+@@ -71412,57 +29322,30 @@
    return 0;
  }
  _ACEOF
@@ -76523,7 +77136,7 @@
  /* end confdefs.h.  */
  
  		    #include <krb5.h>
-@@ -71045,58 +29022,31 @@
+@@ -71478,58 +29361,31 @@
    return 0;
  }
  _ACEOF
@@ -76589,7 +77202,7 @@
  /* end confdefs.h.  */
  
  	#include <krb5.h>
-@@ -71108,36 +29058,15 @@
+@@ -71541,36 +29397,15 @@
    return 0;
  }
  _ACEOF
@@ -76629,7 +77242,7 @@
  $as_echo "$smb_krb5_cv_verify_checksum" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -71145,17 +29074,13 @@
+@@ -71578,17 +29413,13 @@
  _ACEOF
  
  
@@ -76650,7 +77263,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71166,56 +29091,29 @@
+@@ -71599,56 +29430,29 @@
    return 0;
  }
  _ACEOF
@@ -76714,7 +77327,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71226,56 +29124,29 @@
+@@ -71659,56 +29463,29 @@
    return 0;
  }
  _ACEOF
@@ -76778,7 +77391,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71286,56 +29157,29 @@
+@@ -71719,56 +29496,29 @@
    return 0;
  }
  _ACEOF
@@ -76842,7 +77455,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71346,56 +29190,29 @@
+@@ -71779,56 +29529,29 @@
    return 0;
  }
  _ACEOF
@@ -76906,7 +77519,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71406,56 +29223,29 @@
+@@ -71839,56 +29562,29 @@
    return 0;
  }
  _ACEOF
@@ -76970,7 +77583,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71466,56 +29256,29 @@
+@@ -71899,116 +29595,62 @@
    return 0;
  }
  _ACEOF
@@ -77034,10 +77647,13 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71526,56 +29289,29 @@
-   return 0;
- }
- _ACEOF
+ main ()
+ {
+-krb5_address kaddr; kaddr.addrtype = ADDRTYPE_INET;
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -77056,6 +77672,11 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
++krb5_address kaddr; kaddr.addrtype = ADDRTYPE_INET;
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=yes
  else
@@ -77098,7 +77719,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71586,55 +29322,28 @@
+@@ -72019,55 +29661,28 @@
    return 0;
  }
  _ACEOF
@@ -77161,7 +77782,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71645,56 +29354,29 @@
+@@ -72078,56 +29693,29 @@
    return 0;
  }
  _ACEOF
@@ -77225,7 +77846,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71705,56 +29387,29 @@
+@@ -72138,56 +29726,29 @@
    return 0;
  }
  _ACEOF
@@ -77289,7 +77910,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71765,56 +29420,29 @@
+@@ -72198,56 +29759,29 @@
    return 0;
  }
  _ACEOF
@@ -77353,7 +77974,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71825,56 +29453,29 @@
+@@ -72258,56 +29792,29 @@
    return 0;
  }
  _ACEOF
@@ -77417,7 +78038,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71885,47 +29486,22 @@
+@@ -72318,47 +29825,22 @@
    return 0;
  }
  _ACEOF
@@ -77471,7 +78092,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71936,58 +29512,31 @@
+@@ -72369,58 +29851,31 @@
    return 0;
  }
  _ACEOF
@@ -77537,7 +78158,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71998,56 +29547,29 @@
+@@ -72431,56 +29886,29 @@
    return 0;
  }
  _ACEOF
@@ -77601,7 +78222,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72058,56 +29580,29 @@
+@@ -72491,56 +29919,29 @@
    return 0;
  }
  _ACEOF
@@ -77665,7 +78286,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72118,56 +29613,29 @@
+@@ -72551,56 +29952,29 @@
    return 0;
  }
  _ACEOF
@@ -77729,7 +78350,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72178,56 +29646,29 @@
+@@ -72611,56 +29985,29 @@
    return 0;
  }
  _ACEOF
@@ -77793,7 +78414,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72238,61 +29679,30 @@
+@@ -72671,61 +30018,30 @@
    return 0;
  }
  _ACEOF
@@ -77864,7 +78485,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72303,56 +29713,29 @@
+@@ -72736,56 +30052,29 @@
    return 0;
  }
  _ACEOF
@@ -77928,7 +78549,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72363,56 +29746,29 @@
+@@ -72796,56 +30085,29 @@
    return 0;
  }
  _ACEOF
@@ -77992,7 +78613,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72423,65 +29779,35 @@
+@@ -72856,65 +30118,35 @@
    return 0;
  }
  _ACEOF
@@ -78069,7 +78690,7 @@
  /* end confdefs.h.  */
  
  #include<krb5.h>
-@@ -72494,65 +29820,32 @@
+@@ -72927,65 +30159,32 @@
      return krb5_kt_resolve(context, "WRFILE:api", &keytab);
    }
  _ACEOF
@@ -78144,7 +78765,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72563,56 +29856,29 @@
+@@ -72996,56 +30195,29 @@
    return 0;
  }
  _ACEOF
@@ -78208,7 +78829,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72626,56 +29892,29 @@
+@@ -73059,56 +30231,29 @@
    return 0;
  }
  _ACEOF
@@ -78272,7 +78893,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72686,56 +29925,29 @@
+@@ -73119,56 +30264,29 @@
    return 0;
  }
  _ACEOF
@@ -78336,7 +78957,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72747,49 +29959,26 @@
+@@ -73180,49 +30298,26 @@
    return 0;
  }
  _ACEOF
@@ -78392,7 +79013,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72803,20 +29992,13 @@
+@@ -73236,20 +30331,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -78418,7 +79039,7 @@
  /* end confdefs.h.  */
  
  		#include <stdlib.h>
-@@ -72830,42 +30012,15 @@
+@@ -73263,42 +30351,15 @@
  		}
  
  _ACEOF
@@ -78465,7 +79086,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72877,20 +30032,18 @@
+@@ -73310,20 +30371,18 @@
  	export LDFLAGS;
  
  fi
@@ -78490,7 +79111,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72904,20 +30057,13 @@
+@@ -73337,20 +30396,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -78516,7 +79137,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -72928,42 +30074,15 @@
+@@ -73361,42 +30413,15 @@
  		}
  
  _ACEOF
@@ -78563,7 +79184,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72975,29 +30094,23 @@
+@@ -73408,29 +30433,23 @@
  	export LDFLAGS;
  
  fi
@@ -78598,7 +79219,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -73008,61 +30121,30 @@
+@@ -73441,61 +30460,30 @@
    return 0;
  }
  _ACEOF
@@ -78669,7 +79290,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -73073,47 +30155,20 @@
+@@ -73506,47 +30494,20 @@
    return 0;
  }
  _ACEOF
@@ -78723,7 +79344,7 @@
  
    fi
  
-@@ -73125,7 +30180,7 @@
+@@ -73558,7 +30519,7 @@
    #
    #
    if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -78732,7 +79353,7 @@
  $as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
      use_ads=no
    fi
-@@ -73133,7 +30188,7 @@
+@@ -73566,7 +30527,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
@@ -78741,7 +79362,7 @@
  $as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -73141,7 +30196,7 @@
+@@ -73574,7 +30535,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
@@ -78750,7 +79371,7 @@
  $as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -73149,7 +30204,7 @@
+@@ -73582,7 +30543,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
@@ -78759,7 +79380,7 @@
  $as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -73157,7 +30212,7 @@
+@@ -73590,7 +30551,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
@@ -78768,7 +79389,7 @@
  $as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -73169,14 +30224,14 @@
+@@ -73602,14 +30563,14 @@
  
        if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
        then
@@ -78785,7 +79406,7 @@
  $as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
  	use_ads=no
        fi
-@@ -73185,29 +30240,21 @@
+@@ -73618,29 +30579,21 @@
  
    if test x"$use_ads" = x"yes"; then
  
@@ -78820,7 +79441,7 @@
  $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
      fi
  
-@@ -73233,9 +30280,9 @@
+@@ -73666,9 +30619,9 @@
      KRB5_LIBS=""
      with_ads_support=no
    fi
@@ -78832,7 +79453,7 @@
  $as_echo "$use_ads" >&6; }
  
  LIBS="$ac_save_LIBS"
-@@ -73247,23 +30294,17 @@
+@@ -73680,23 +30633,17 @@
  
  
  
@@ -78859,7 +79480,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -73281,54 +30322,28 @@
+@@ -73714,54 +30661,28 @@
    return 0;
  }
  _ACEOF
@@ -78921,7 +79542,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSCD 1
  _ACEOF
-@@ -73343,7 +30358,6 @@
+@@ -73776,7 +30697,6 @@
  
  
  fi
@@ -78929,10 +79550,10 @@
  PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
  
  
-@@ -73351,12 +30365,12 @@
+@@ -73784,12 +30704,12 @@
  # Compile with DNS Updates support?
  
- with_dnsupdate_support=no
+ with_dnsupdate_support=auto
 -{ $as_echo "$as_me:$LINENO: checking whether to enable DNS Updates support" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DNS Updates support" >&5
  $as_echo_n "checking whether to enable DNS Updates support... " >&6; }
@@ -78944,7 +79565,7 @@
    withval=$with_dnsupdate;  case "$withval" in
      yes|no)
  	with_dnsupdate_support=$withval
-@@ -73365,7 +30379,7 @@
+@@ -73798,7 +30718,7 @@
  fi
  
  
@@ -78953,7 +79574,21 @@
  $as_echo "$with_dnsupdate_support" >&6; }
  
  if test x"$with_dnsupdate_support" != x"no"; then
-@@ -73379,151 +30393,12 @@
+@@ -73807,11 +30727,9 @@
+   # first test for AD / GSSAPI support being enabled
+ 	if test x"$have_gssapi" != xyes ; then
+ 		if test x"$with_dnsupdate_support" = x"yes" ; then
+-			{ { $as_echo "$as_me:$LINENO: error: DNS Updates support only possible with AD and GSSAPI support" >&5
+-$as_echo "$as_me: error: DNS Updates support only possible with AD and GSSAPI support" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "DNS Updates support only possible with AD and GSSAPI support" "$LINENO" 5
+ 		else
+-			{ $as_echo "$as_me:$LINENO: DNS Updates support only possible with AD and GSSAPI support" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: DNS Updates support only possible with AD and GSSAPI support" >&5
+ $as_echo "$as_me: DNS Updates support only possible with AD and GSSAPI support" >&6;}
+ 			with_dnsupdate_support=no
+ 		fi
+@@ -73819,151 +30737,12 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
@@ -79100,7 +79735,7 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+  for ac_header in uuid/uuid.h
++	for ac_header in uuid/uuid.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 +if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
@@ -79110,21 +79745,21 @@
  _ACEOF
  
  fi
-@@ -73533,11 +30408,9 @@
+@@ -73974,11 +30753,9 @@
  
-   if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
- 	if test x"$with_dnsupdate_support" = x"yes"; then
--	 { { $as_echo "$as_me:$LINENO: error: uuid.h is needed to enable DNS Updates support" >&5
+ 	if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
+ 		if test x"$with_dnsupdate_support" = x"yes"; then
+-			{ { $as_echo "$as_me:$LINENO: error: uuid.h is needed to enable DNS Updates support" >&5
 -$as_echo "$as_me: error: uuid.h is needed to enable DNS Updates support" >&2;}
 -   { (exit 1); exit 1; }; }
-+	 as_fn_error "uuid.h is needed to enable DNS Updates support" "$LINENO" 5
- 	else
--	 { $as_echo "$as_me:$LINENO: WARNING: uuid.h is needed to enable DNS Updates support" >&5
-+	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: uuid.h is needed to enable DNS Updates support" >&5
- $as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
- 	fi
- 	with_dnsupdate_support=no
-@@ -73553,102 +30426,12 @@
++			as_fn_error "uuid.h is needed to enable DNS Updates support" "$LINENO" 5
+ 		else
+-			{ $as_echo "$as_me:$LINENO: uuid.h is needed to enable DNS Updates support" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: uuid.h is needed to enable DNS Updates support" >&5
+ $as_echo "$as_me: uuid.h is needed to enable DNS Updates support" >&6;}
+ 		fi
+ 		with_dnsupdate_support=no
+@@ -73994,102 +30771,12 @@
  
    UUID_LIBS=""
  
@@ -79232,7 +79867,7 @@
  _ACEOF
  
          # uuid_generate was found in libc or existing $LIBS
-@@ -73665,9 +30448,7 @@
+@@ -74106,9 +30793,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -79243,7 +79878,7 @@
  
  
  
-@@ -73680,11 +30461,9 @@
+@@ -74121,11 +30806,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -79257,7 +79892,7 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73693,18 +30472,14 @@
+@@ -74134,18 +30817,14 @@
  	    ;;
            *)
  	    # uuid_generate was not found, try adding libuuid
@@ -79279,10 +79914,18 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -73722,43 +30497,18 @@
-   return 0;
- }
- _ACEOF
+@@ -74155,51 +30834,26 @@
+ extern "C"
+ #endif
+ char uuid_generate ();
+-int
+-main ()
+-{
+-return uuid_generate ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -79304,6 +79947,14 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++int
++main ()
++{
++return uuid_generate ();
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_uuid_uuid_generate=yes
  else
@@ -79329,7 +79980,7 @@
  
  		LIBS="-luuid $LIBS"
  
-@@ -73774,9 +30524,7 @@
+@@ -74215,9 +30869,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -79340,7 +79991,7 @@
  
  
  
-@@ -73786,11 +30534,9 @@
+@@ -74227,11 +30879,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -79354,8 +80005,18 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73810,28 +30556,26 @@
+@@ -74249,36 +30899,34 @@
  
+ fi
+   # finally print out the result:
+-{ $as_echo "$as_me:$LINENO: checking whether DNS Updates support is used" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether DNS Updates support is used" >&5
+ $as_echo_n "checking whether DNS Updates support is used... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $with_dnsupdate_support" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dnsupdate_support" >&5
+ $as_echo "$with_dnsupdate_support" >&6; }
+ 
+ 
  #################################################
  # check for automount support
 -{ $as_echo "$as_me:$LINENO: checking whether to use automount" >&5
@@ -79389,124 +80050,36 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -73842,34 +30586,30 @@
- CIFSMOUNT_PROGS=""
- INSTALL_CIFSMOUNT=""
- UNINSTALL_CIFSMOUNT=""
--{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build mount.cifs" >&5
- $as_echo_n "checking whether to build mount.cifs... " >&6; }
+@@ -74292,11 +30940,11 @@
  
- # Check whether --with-cifsmount was given.
--if test "${with_cifsmount+set}" = set; then
-+if test "${with_cifsmount+set}" = set; then :
-   withval=$with_cifsmount;  case "$withval" in
-   no)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   *)
- 	case "$host_os" in
- 	*linux*)
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+ 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; }
  
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CIFSMOUNT 1
--_ACEOF
-+$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
+ # 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
+@@ -74305,7 +30953,7 @@
  
- 		CIFSMOUNT_PROGS="bin/mount.cifs"
- 		INSTALL_CIFSMOUNT="installcifsmount"
- 		UNINSTALL_CIFSMOUNT="uninstallcifsmount"
- 		;;
- 	*)
--		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
--$as_echo "$as_me: error: not on a linux system!" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "not on a linux system!" "$LINENO" 5
- 		;;
- 	esac
-     ;;
-@@ -73877,19 +30617,17 @@
- else
-    case "$host_os" in
-   *linux*)
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+ fi
  
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CIFSMOUNT 1
--_ACEOF
-+$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
+-{ $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; }
  
- 	CIFSMOUNT_PROGS="bin/mount.cifs"
- 	INSTALL_CIFSMOUNT="installcifsmount"
- 	UNINSTALL_CIFSMOUNT="uninstallcifsmount"
- 	;;
-   *)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   esac
-@@ -73900,40 +30638,36 @@
- CIFSUMOUNT_PROGS=""
- INSTALL_CIFSUMOUNT=""
- UNINSTALL_CIFSUMOUNT=""
--{ $as_echo "$as_me:$LINENO: checking whether to build umount.cifs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build umount.cifs" >&5
- $as_echo_n "checking whether to build umount.cifs... " >&6; }
+ use_pam=no
+@@ -74316,150 +30964,12 @@
  
- # Check whether --with-cifsumount was given.
--if test "${with_cifsumount+set}" = set; then
-+if test "${with_cifsumount+set}" = set; then :
-   withval=$with_cifsumount;  case "$withval" in
-   yes)
- 	case "$host_os" in
- 	*linux*)
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CIFSUMOUNT 1
--_ACEOF
-+$as_echo "#define WITH_CIFSUMOUNT 1" >>confdefs.h
- 
- 		CIFSUMOUNT_PROGS="bin/umount.cifs"
- 		INSTALL_CIFSUMOUNT="installcifsumount"
- 		UNINSTALL_CIFSUMOUNT="uninstallcifsumount"
- 		;;
- 	*)
--		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
--$as_echo "$as_me: error: not on a linux system!" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "not on a linux system!" "$LINENO" 5
- 		;;
- 	esac
- 	;;
-   *)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   esac
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
- fi
-@@ -73941,151 +30675,12 @@
- 
- #################################################
- # check for cifs.upcall support
+ 	# Most systems have PAM headers in /usr/include/security, but Darwin
+ 	# has them in /usr/include/pam.
 -
- for ac_header in keyutils.h
+-
+-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`
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -79648,312 +80221,6 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "keyutils.h" "ac_cv_header_keyutils_h" "$ac_includes_default"
-+if test "x$ac_cv_header_keyutils_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_KEYUTILS_H 1
- _ACEOF
-  HAVE_KEYUTILS_H=1
- else
-@@ -74097,34 +30692,28 @@
- CIFSUPCALL_PROGS=""
- INSTALL_CIFSUPCALL=""
- UNINSTALL_CIFSUPCALL=""
--{ $as_echo "$as_me:$LINENO: checking whether to build cifs.upcall" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build cifs.upcall" >&5
- $as_echo_n "checking whether to build cifs.upcall... " >&6; }
- 
- # Check whether --with-cifsupcall was given.
--if test "${with_cifsupcall+set}" = set; then
-+if test "${with_cifsupcall+set}" = set; then :
-   withval=$with_cifsupcall;  case "$withval" in
-   no)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   *)
- 	case "$host_os" in
- 	*linux*)
- 		if test x"$use_ads" != x"yes"; then
--			{ { $as_echo "$as_me:$LINENO: error: ADS support should be enabled for building cifs.upcall" >&5
--$as_echo "$as_me: error: ADS support should be enabled for building cifs.upcall" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "ADS support should be enabled for building cifs.upcall" "$LINENO" 5
- 		elif test x"$HAVE_KEYUTILS_H" != "x1"; then
--			{ { $as_echo "$as_me:$LINENO: error: keyutils package is required for cifs.upcall" >&5
--$as_echo "$as_me: error: keyutils package is required for cifs.upcall" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "keyutils package is required for cifs.upcall" "$LINENO" 5
- 		else
--			{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CIFSUPCALL 1
--_ACEOF
-+$as_echo "#define WITH_CIFSUPCALL 1" >>confdefs.h
- 
- 			CIFSUPCALL_PROGS="bin/cifs.upcall"
- 			INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -74132,9 +30721,7 @@
- 		fi
- 		;;
- 	*)
--		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
--$as_echo "$as_me: error: not on a linux system!" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "not on a linux system!" "$LINENO" 5
- 		;;
- 	esac
-     ;;
-@@ -74143,18 +30730,16 @@
-    case "$host_os" in
-   *linux*)
- 	if test x"$use_ads" != x"yes"; then
--		{ $as_echo "$as_me:$LINENO: WARNING: ADS support should be enabled for building cifs.upcall" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ADS support should be enabled for building cifs.upcall" >&5
- $as_echo "$as_me: WARNING: ADS support should be enabled for building cifs.upcall" >&2;}
- 	elif test x"$HAVE_KEYUTILS_H" != "x1"; then
--		{ $as_echo "$as_me:$LINENO: WARNING: keyutils package is required for cifs.upcall" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: keyutils package is required for cifs.upcall" >&5
- $as_echo "$as_me: WARNING: keyutils package is required for cifs.upcall" >&2;}
- 	else
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define WITH_CIFSUPCALL 1
--_ACEOF
-+$as_echo "#define WITH_CIFSUPCALL 1" >>confdefs.h
- 
- 		CIFSUPCALL_PROGS="bin/cifs.upcall"
- 		INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -74162,191 +30747,53 @@
- 	fi
- 	;;
-   *)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $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_n "checking whether to try PAM support... " >&6; }
--
--# 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
--
--fi
--
--{ $as_echo "$as_me:$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`
--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
-+  esac
- 
--  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
-+
-+#################################################
-+# 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:${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.
-+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; }
--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; }
-+  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`
@@ -79963,7 +80230,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74358,9 +30805,7 @@
+@@ -74471,9 +30981,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
@@ -79974,7 +80241,7 @@
  		fi
  		use_pam=no
  		create_pam_modules=no
-@@ -74368,23 +30813,17 @@
+@@ -74481,23 +30989,17 @@
  
  
  
@@ -80001,7 +80268,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -74402,54 +30841,28 @@
+@@ -74515,54 +31017,28 @@
    return 0;
  }
  _ACEOF
@@ -80063,7 +80330,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -74464,34 +30877,18 @@
+@@ -74577,34 +31053,18 @@
  
  
  fi
@@ -80103,7 +80370,7 @@
  		#if HAVE_SECURITY_PAM_APPL_H
  		#include <security/pam_appl.h>
  		#endif
-@@ -74499,44 +30896,9 @@
+@@ -74612,44 +31072,9 @@
  		#include <pam/pam_appl.h>
  		#endif
  
@@ -80151,7 +80418,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74548,179 +30910,33 @@
+@@ -74661,179 +31086,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
@@ -80341,7 +80608,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74729,150 +30945,12 @@
+@@ -74842,150 +31121,12 @@
  
  done
  
@@ -80498,7 +80765,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74883,19 +30961,14 @@
+@@ -74996,19 +31137,14 @@
  
  
  
@@ -80521,7 +80788,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.  */
-@@ -74936,72 +31009,42 @@
+@@ -75049,72 +31185,42 @@
    return 0;
  }
  _ACEOF
@@ -80606,7 +80873,7 @@
  /* end confdefs.h.  */
  
  #if (!defined(LINUX))
-@@ -75039,36 +31082,11 @@
+@@ -75152,36 +31258,11 @@
    return 0;
  }
  _ACEOF
@@ -80645,7 +80912,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  #################################################
-@@ -75078,19 +31096,17 @@
+@@ -75191,19 +31272,17 @@
  UNINSTALL_PAM_MODULES=""
  
  try_pam_smbpass=auto
@@ -80668,7 +80935,7 @@
    ;;
    esac
  
-@@ -75104,16 +31120,12 @@
+@@ -75217,16 +31296,12 @@
  	# Conditions under which pam_smbpass can't be built.
  	if test x"$BLDSHARED" != xtrue ; then
  		if test x"${try_pam_smbpass}" = xyes ; then
@@ -80687,7 +80954,7 @@
  		fi
  		use_pam_smbpass=no
  	fi
-@@ -75124,7 +31136,7 @@
+@@ -75237,7 +31312,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  fi
@@ -80696,7 +80963,7 @@
  $as_echo "$use_pam_smbpass" >&6; }
  
  
-@@ -75135,98 +31147,63 @@
+@@ -75248,98 +31323,63 @@
  ## $with_pam_for_crypt variable as above   --jerry
  ##
  if test $with_pam_for_crypt = no; then
@@ -80811,7 +81078,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -75234,28 +31211,26 @@
+@@ -75347,28 +31387,26 @@
  
  #################################################
  # check for syslog logging
@@ -80846,7 +81113,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -75263,16 +31238,14 @@
+@@ -75376,16 +31414,14 @@
  
  #################################################
  # check for custom syslog facility
@@ -80866,7 +81133,7 @@
    else
       if test "$withval" != "yes" ; then
          syslog_facility="$withval"
-@@ -75297,14 +31270,14 @@
+@@ -75410,14 +31446,14 @@
  samba_cv_TRY_SYS_QUOTAS=auto
  samba_cv_SYSQUOTA_FOUND=no
  
@@ -80884,7 +81151,7 @@
  $as_echo "yes" >&6; }
      samba_cv_WITH_QUOTAS=yes
      samba_cv_TRY_QUOTAS=yes
-@@ -75313,7 +31286,7 @@
+@@ -75426,7 +31462,7 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    auto)
@@ -80893,7 +81160,7 @@
  $as_echo "auto" >&6; }
      samba_cv_WITH_QUOTAS=auto
      samba_cv_TRY_QUOTAS=auto
-@@ -75322,74 +31295,74 @@
+@@ -75435,719 +31471,165 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    no)
@@ -80944,47 +81211,45 @@
      ;;
    no)
 -    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     samba_cv_WITH_SYS_QUOTAS=no
-     samba_cv_TRY_SYS_QUOTAS=no
-     ;;
-   *)
+-$as_echo "no" >&6; }
+-    samba_cv_WITH_SYS_QUOTAS=no
+-    samba_cv_TRY_SYS_QUOTAS=no
+-    ;;
+-  *)
 -    { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
- $as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
-     ;;
-   esac
- else
+-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+-    ;;
+-  esac
+-else
 -  { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-+  { $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 "${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 "$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_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 "$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 "yes" >&6; }
+-            samba_cv_TRY_SYS_QUOTAS=yes
+-            samba_cv_RUN_QUOTA_TESTS=yes
+-	    ;;
+-	*)
 -	    { $as_echo "$as_me:$LINENO: result: no" >&5
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-             samba_cv_TRY_SYS_QUOTAS=no
- 	    ;;
-@@ -75400,641 +31373,87 @@
- # only check for quota stuff if --with-quotas
- if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
- 
+-            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*)
@@ -81274,7 +81539,9 @@
 -    { $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
--    ;;
++    samba_cv_WITH_SYS_QUOTAS=no
++    samba_cv_TRY_SYS_QUOTAS=no
+     ;;
 -  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;}
@@ -81294,35 +81561,66 @@
 -## ---------------------------------------- ##
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
++  *)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
++$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+     ;;
 -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
++  esac
+ 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_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
++$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+ 
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
--fi
--
+ 
++
++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
+ 
 -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`
@@ -81371,14 +81669,20 @@
 -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; }
@@ -81394,7 +81698,19 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++	    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
 -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
@@ -81411,23 +81727,16 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+case "$host_os" in
-+	# on linux we didn't need to test we have builtin support
-+	*linux*)
-+	    samba_cv_SYSQUOTA_FOUND=yes
  
 -  ac_header_preproc=no
 -fi
-+$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
++# some broken header files need this
++ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
++if test "x$ac_cv_header_asm_types_h" = 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; }
-+	    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; }
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -81458,22 +81767,7 @@
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
-+
-+$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
-+
-+	    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
 -{ $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
@@ -81485,6 +81779,7 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
++$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
  
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -81493,18 +81788,15 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+# some broken header files need this
-+ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
-+if test "x$ac_cv_header_asm_types_h" = x""yes; then :
++	    cat >> confdefs.h <<\EOF
++#include <asm/types.h>
++EOF
  
 -fi
  
 -done
-+$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
++fi
  
-+	    cat >> confdefs.h <<\EOF
-+#include <asm/types.h>
-+EOF
  
 -# For sys/quota.h and linux/quota.h
  
@@ -81516,7 +81808,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
@@ -81533,9 +81825,6 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+
-+
-+
 +# For quotas on Veritas VxFS filesystems
 +for ac_header in sys/fs/vx_quota.h
 +do :
@@ -81681,7 +81970,7 @@
  _ACEOF
  
  fi
-@@ -76044,17 +31463,13 @@
+@@ -76157,17 +31639,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
@@ -81702,7 +81991,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76074,35 +31489,14 @@
+@@ -76187,35 +31665,14 @@
    return 0;
  }
  _ACEOF
@@ -81741,7 +82030,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
-@@ -76110,17 +31504,13 @@
+@@ -76223,17 +31680,13 @@
  fi
  
  # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -81762,7 +82051,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76138,41 +31528,18 @@
+@@ -76251,41 +31704,18 @@
    return 0;
  }
  _ACEOF
@@ -81808,7 +82097,7 @@
  
  fi
  
-@@ -76180,9 +31547,9 @@
+@@ -76293,9 +31723,9 @@
  # look for a working quota system
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -81820,7 +82109,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -76196,14 +31563,10 @@
+@@ -76309,14 +31739,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81837,7 +82126,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4A 1
-@@ -76211,42 +31574,15 @@
+@@ -76324,42 +31750,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81884,7 +82173,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -76258,23 +31594,21 @@
+@@ -76371,23 +31770,21 @@
  	export LDFLAGS;
  
  fi
@@ -81912,7 +82201,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -76288,14 +31622,10 @@
+@@ -76401,14 +31798,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81929,7 +82218,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4B 1
-@@ -76303,42 +31633,15 @@
+@@ -76416,42 +31809,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81976,7 +82265,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -76350,24 +31653,22 @@
+@@ -76463,24 +31829,22 @@
  	export LDFLAGS;
  
  fi
@@ -82005,7 +82294,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -76381,14 +31682,10 @@
+@@ -76494,14 +31858,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -82022,7 +82311,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_3 1
-@@ -76396,42 +31693,15 @@
+@@ -76509,473 +31869,46 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -82057,42 +82346,41 @@
 -
 -( exit $ac_status )
 -samba_cv_HAVE_QUOTACTL_3=no
-+  samba_cv_HAVE_QUOTACTL_3=no
- fi
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
+-fi
 -
- 	CFLAGS="$old_CFLAGS";
- 	old_CFLAGS="";
- 	export CFLAGS;
-@@ -76443,15 +31713,13 @@
- 	export LDFLAGS;
- 
- 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:$LINENO: result: $samba_cv_HAVE_QUOTACTL_3" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_QUOTACTL_3" >&5
- $as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
- if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
-     echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
-     samba_cv_SYSQUOTA_FOUND=yes;
- 
+-$as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
+-if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
+-    echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
+-    samba_cv_SYSQUOTA_FOUND=yes;
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_QUOTACTL_3 1
 -_ACEOF
-+$as_echo "#define HAVE_QUOTACTL_3 1" >>confdefs.h
- 
-     samba_cv_sysquotas_file="lib/sysquotas_3.c"
- fi
-@@ -76459,151 +31727,12 @@
- 
- #################################################
- # check for mntent.h and struct mntent
 -
- for ac_header in mntent.h
+-    samba_cv_sysquotas_file="lib/sysquotas_3.c"
+-fi
+-fi
+-
+-#################################################
+-# check for mntent.h and struct mntent
+-
+-for ac_header in mntent.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
@@ -82234,23 +82522,20 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
-+if test "x$ac_cv_header_mntent_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_MNTENT_H 1
- _ACEOF
- 
- fi
-@@ -76612,102 +31741,12 @@
- 
- #################################################
- # check for setmntent,getmntent,endmntent
+-_ACEOF
 -
+-fi
 -
+-done
 -
- for ac_func in setmntent getmntent endmntent
+-#################################################
+-# check for setmntent,getmntent,endmntent
+-
+-
+-
+-for ac_func in setmntent getmntent endmntent
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -82343,20 +82628,18 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -76718,151 +31757,12 @@
- 
- #################################################
- # check for devnm.h and struct mntent
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
 -
- for ac_header in devnm.h
+-fi
+-done
+-
+-
+-#################################################
+-# check for devnm.h and struct mntent
+-
+-for ac_header in devnm.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
@@ -82488,31 +82771,61 @@
 -  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++  samba_cv_HAVE_QUOTACTL_3=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; }
--
--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_QUOTACTL_3" >&5
++$as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
++if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
++    echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
++    samba_cv_SYSQUOTA_FOUND=yes;
+ 
++$as_echo "#define HAVE_QUOTACTL_3 1" >>confdefs.h
++
++    samba_cv_sysquotas_file="lib/sysquotas_3.c"
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++fi
++
++#################################################
++# check for mntent.h and struct mntent
++for ac_header in mntent.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "devnm.h" "ac_cv_header_devnm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_devnm_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
++if test "x$ac_cv_header_mntent_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_DEVNM_H 1
++#define HAVE_MNTENT_H 1
  _ACEOF
  
  fi
-@@ -76871,102 +31771,12 @@
+@@ -76983,103 +31916,43 @@
+ done
  
  #################################################
- # check for devnm
+-# check for devnm
 -
- for ac_func in devnm
+-for ac_func in devnm
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -82522,7 +82835,16 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++# check for setmntent,getmntent,endmntent
++for ac_func in setmntent getmntent endmntent
++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.  */
@@ -82540,9 +82862,11 @@
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
--
++fi
++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.  */
@@ -82556,7 +82880,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
+ 
 -int
 -main ()
 -{
@@ -82564,7 +82888,15 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++#################################################
++# check for devnm.h and struct mntent
++for ac_header in devnm.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "devnm.h" "ac_cv_header_devnm_h" "$ac_includes_default"
++if test "x$ac_cv_header_devnm_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DEVNM_H 1
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -82590,10 +82922,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	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
@@ -82605,6 +82937,11 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++done
++
++#################################################
++# check for devnm
++for ac_func in devnm
 +do :
 +  ac_fn_c_check_func "$LINENO" "devnm" "ac_cv_func_devnm"
 +if test "x$ac_cv_func_devnm" = x""yes; then :
@@ -82614,7 +82951,7 @@
  _ACEOF
  
  fi
-@@ -76989,19 +31799,15 @@
+@@ -77102,19 +31975,15 @@
  fi
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -82637,7 +82974,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -77019,76 +31825,47 @@
+@@ -77132,76 +32001,47 @@
    return 0;
  }
  _ACEOF
@@ -82725,7 +83062,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -77106,62 +31883,35 @@
+@@ -77219,62 +32059,35 @@
    return 0;
  }
  _ACEOF
@@ -82795,7 +83132,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -77177,56 +31927,33 @@
+@@ -77290,56 +32103,33 @@
    return 0;
  }
  _ACEOF
@@ -82860,7 +83197,7 @@
  $as_echo "no" >&6; }
      fi
  fi
-@@ -77238,12 +31965,12 @@
+@@ -77351,12 +32141,12 @@
  #################################################
  # check for experimental utmp accounting
  
@@ -82875,7 +83212,7 @@
    withval=$with_utmp;  case "$withval" in
    no)
  		WITH_UTMP=no
-@@ -77266,41 +31993,35 @@
+@@ -77379,41 +32169,35 @@
  # Display test results
  
  if test x"$WITH_UTMP" = x"yes"; then
@@ -82925,7 +83262,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -77314,51 +32035,22 @@
+@@ -77427,51 +32211,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -82953,14 +83290,13 @@
 -  (exit $ac_status); }; }; then
 +if ac_fn_c_try_run "$LINENO"; then :
    fu_cv_sys_stat_statvfs64=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
 -
 -( exit $ac_status )
 -fu_cv_sys_stat_statvfs64=no
-+else
 +  fu_cv_sys_stat_statvfs64=no
  fi
 -rm -rf conftest.dSYM
@@ -82984,7 +83320,7 @@
  
    fi
  fi
-@@ -77371,16 +32063,12 @@
+@@ -77484,16 +32239,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -83004,7 +83340,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77392,47 +32080,20 @@
+@@ -77505,47 +32256,20 @@
    return 0;
  }
  _ACEOF
@@ -83058,7 +83394,7 @@
  
    fi
  fi
-@@ -77440,17 +32101,13 @@
+@@ -77553,17 +32277,13 @@
  # smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
  # This is not the case on ancient Linux systems.
  
@@ -83079,7 +83415,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77462,57 +32119,30 @@
+@@ -77575,57 +32295,30 @@
    return 0;
  }
  _ACEOF
@@ -83144,7 +83480,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77524,56 +32154,29 @@
+@@ -77637,56 +32330,29 @@
    return 0;
  }
  _ACEOF
@@ -83208,7 +83544,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77585,55 +32188,28 @@
+@@ -77698,55 +32364,28 @@
    return 0;
  }
  _ACEOF
@@ -83271,7 +83607,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77645,59 +32221,32 @@
+@@ -77758,59 +32397,32 @@
    return 0;
  }
  _ACEOF
@@ -83339,7 +83675,7 @@
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -77710,71 +32259,38 @@
+@@ -77823,71 +32435,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -83421,7 +83757,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -77793,71 +32309,38 @@
+@@ -77906,71 +32485,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -83503,7 +83839,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -77867,71 +32350,38 @@
+@@ -77980,71 +32526,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -83585,7 +83921,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -77947,71 +32397,38 @@
+@@ -78060,71 +32573,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -83667,7 +84003,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -78031,52 +32448,23 @@
+@@ -78144,52 +32624,23 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -83726,7 +84062,7 @@
  
    fi
  fi
-@@ -78089,13 +32477,9 @@
+@@ -78202,13 +32653,9 @@
  # If we don't have all of these then disable large
  # file support.
  #
@@ -83742,7 +84078,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -78112,41 +32496,18 @@
+@@ -78225,41 +32672,18 @@
    return 0;
  }
  _ACEOF
@@ -83788,7 +84124,7 @@
  $as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
  
  #################################################
-@@ -78156,10 +32517,10 @@
+@@ -78269,10 +32693,10 @@
  
  
  # Check whether --with-ctdb was given.
@@ -83801,7 +84137,7 @@
  $as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
      ;;
    *)
-@@ -78173,71 +32534,23 @@
+@@ -78286,71 +32710,23 @@
  CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
  ctdb_broken="missing or broken headers"
  
@@ -83883,31 +84219,41 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -78248,17 +32561,13 @@
+@@ -78361,265 +32737,13 @@
  
  
  
 - { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
- $as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
+-$as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
 -if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+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 "confdefs.h"
-@@ -78279,41 +32588,18 @@
-   return 0;
- }
- _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_TRANS3_COMMIT
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -83926,34 +84272,33 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=yes
- else
+-  ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=no
-+  ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=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: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
- $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&6; }
-  if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
- 
+-$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&6; }
+- if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1
 -_ACEOF
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1" >>confdefs.h
- 
-  fi
- 
-@@ -78324,255 +32610,43 @@
- fi
- 
- # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
+-
+- fi
+-
+-if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
+-	ctdb_broken=no
+-else
+-	ctdb_broken="ctdb transaction support missing or too old"
+-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
@@ -84013,21 +84358,16 @@
 -/* end confdefs.h.  */
 -
 -#include "confdefs.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
+-#define NO_CONFIG_H
 -#include "replace.h"
 -#include "system/wait.h"
 -#include "system/network.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 <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
 -
+-
 -int
 -main ()
 -{
@@ -84076,19 +84416,16 @@
 -{ $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
-+$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
- 
- 
- fi
- 
- 
+-
+-
+-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
@@ -84145,33 +84482,31 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include "confdefs.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 \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
- #include <talloc.h>
- #include <tdb.h>
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
++$as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
++if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include "confdefs.h"
+@@ -78632,202 +32756,109 @@
  #include <ctdb.h>
  #include <ctdb_private.h>
  
 -
--int
--main ()
--{
+ int
+ main ()
+ {
 -if (sizeof ((struct ctdb_control_tcp)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++int i = (int)CTDB_CONTROL_TRANS3_COMMIT
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -84199,33 +84534,43 @@
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
--fi
++  ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_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_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 :
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
++$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&6; }
++ if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
  
- 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_CTDB_CONTROL_TCP 1
 -_ACEOF
-+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1" >>confdefs.h
  
++ fi
  
++if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
++	ctdb_broken=no
  else
-@@ -78582,139 +32656,33 @@
+-
+-	ctdb_broken="missing struct ctdb_control_tcp"
+-
++	ctdb_broken="ctdb transaction support missing or too old"
  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
@@ -84240,16 +84585,24 @@
 -/* end confdefs.h.  */
 -
 -#include "confdefs.h"
--#define NO_CONFIG_H
++# 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" "
++#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>
+ 
++"
++if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
+ 
 -int
 -main ()
 -{
@@ -84283,9 +84636,15 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -#include "confdefs.h"
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
++$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
++
++
++fi
++
++
++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"
@@ -84299,7 +84658,9 @@
  #include <ctdb.h>
  #include <ctdb_private.h>
  
--
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
+ 
 -int
 -main ()
 -{
@@ -84331,30 +84692,45 @@
 -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
--
++$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
++
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
+ 
++	ctdb_broken="missing struct ctdb_control_tcp"
+ 
+ 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
  
  
@@ -84372,7 +84748,7 @@
    withval=$with_cluster_support;
  fi
  
-@@ -78725,44 +32693,38 @@
+@@ -78838,44 +32869,38 @@
  
  if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
  	if test "x$with_cluster_support" = "xyes"; then
@@ -84424,7 +84800,7 @@
    withval=$with_acl_support;  case "$withval" in
  	yes|no)
  		with_acl_support="$withval"
-@@ -78775,105 +32737,85 @@
+@@ -78888,105 +32913,85 @@
  	with_acl_support="auto"
  fi
  
@@ -84551,7 +84927,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78891,60 +32833,31 @@
+@@ -79004,60 +33009,31 @@
    return 0;
  }
  _ACEOF
@@ -84621,7 +84997,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78962,61 +32875,32 @@
+@@ -79075,61 +33051,32 @@
    return 0;
  }
  _ACEOF
@@ -84692,7 +85068,7 @@
  /* end confdefs.h.  */
  
  				#include <sys/types.h>
-@@ -79035,64 +32919,33 @@
+@@ -79148,64 +33095,33 @@
    return 0;
  }
  _ACEOF
@@ -84767,7 +85143,7 @@
  /* end confdefs.h.  */
  
  					#include <sys/types.h>
-@@ -79110,58 +32963,29 @@
+@@ -79223,58 +33139,29 @@
    return 0;
  }
  _ACEOF
@@ -84834,7 +85210,7 @@
  
  		fi
  		;;
-@@ -79173,31 +32997,27 @@
+@@ -79286,32 +33173,28 @@
  #################################################
  # check for AIO support
  
@@ -84854,6 +85230,7 @@
  	case "$host_os" in
  	*)
  		AIO_LIBS=$LIBS
+ 		no_rt_LIBS=$LIBS
 -		{ $as_echo "$as_me:$LINENO: checking for aio_read in -lrt" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aio_read in -lrt" >&5
  $as_echo_n "checking for aio_read in -lrt... " >&6; }
@@ -84872,7 +85249,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -79215,58 +33035,29 @@
+@@ -79329,59 +33212,30 @@
    return 0;
  }
  _ACEOF
@@ -84922,6 +85299,7 @@
    AIO_LIBS="$LIBS -lrt"
  fi
  
+ 		LIBS=$no_rt_LIBS
 -		{ $as_echo "$as_me:$LINENO: checking for aio_read in -laio" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aio_read in -laio" >&5
  $as_echo_n "checking for aio_read in -laio... " >&6; }
@@ -84940,7 +85318,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -79284,59 +33075,30 @@
+@@ -79399,59 +33253,30 @@
    return 0;
  }
  _ACEOF
@@ -85009,7 +85387,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -79348,55 +33110,26 @@
+@@ -79463,55 +33288,26 @@
    return 0;
  }
  _ACEOF
@@ -85073,7 +85451,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -79408,716 +33141,317 @@
+@@ -79523,716 +33319,317 @@
    return 0;
  }
  _ACEOF
@@ -85928,7 +86306,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -80134,30 +33468,26 @@
+@@ -80249,30 +33646,26 @@
  # check for sendfile support
  
  with_sendfile_support=yes
@@ -85965,10 +86343,15 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -80173,53 +33503,24 @@
-   return 0;
- }
- _ACEOF
+@@ -80283,58 +33676,29 @@
+ off64_t offset;
+ size_t total;
+ ssize_t nwritten = sendfile64(tofd, fromfd, &offset, total);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -85990,6 +86373,11 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    samba_cv_HAVE_SENDFILE64=yes
  else
@@ -86027,7 +86415,7 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -80235,54 +33536,25 @@
+@@ -80350,54 +33714,25 @@
    return 0;
  }
  _ACEOF
@@ -86090,7 +86478,7 @@
  /* end confdefs.h.  */
  \
  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -80302,103 +33574,58 @@
+@@ -80417,103 +33752,58 @@
    return 0;
  }
  _ACEOF
@@ -86211,7 +86599,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/types.h>
-@@ -80425,76 +33652,41 @@
+@@ -80540,76 +33830,41 @@
    return 0;
  }
  _ACEOF
@@ -86300,7 +86688,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80518,73 +33710,38 @@
+@@ -80633,73 +33888,38 @@
    return 0;
  }
  _ACEOF
@@ -86386,7 +86774,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80608,77 +33765,41 @@
+@@ -80723,77 +33943,41 @@
    return 0;
  }
  _ACEOF
@@ -86476,7 +86864,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80696,43 +33817,18 @@
+@@ -80811,43 +33995,18 @@
    return 0;
  }
  _ACEOF
@@ -86526,7 +86914,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSENDFILE 1
  _ACEOF
-@@ -80741,17 +33837,13 @@
+@@ -80856,17 +34015,13 @@
  
  fi
  
@@ -86547,7 +86935,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80782,74 +33874,39 @@
+@@ -80897,74 +34052,39 @@
    return 0;
  }
  _ACEOF
@@ -86634,7 +87022,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80880,75 +33937,40 @@
+@@ -80995,75 +34115,40 @@
    return 0;
  }
  _ACEOF
@@ -86722,7 +87110,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80976,59 +33998,28 @@
+@@ -81091,59 +34176,28 @@
    return 0;
  }
  _ACEOF
@@ -86791,7 +87179,7 @@
  $as_echo "no" >&6; };
  	fi
  	;;
-@@ -81037,12 +34028,12 @@
+@@ -81152,12 +34206,12 @@
          esac
          ;;
    *)
@@ -86806,7 +87194,7 @@
  $as_echo "yes" >&6; }
  
  fi
-@@ -81051,17 +34042,13 @@
+@@ -81166,17 +34220,13 @@
  ############################################
  # See if we have the Linux readahead syscall.
  
@@ -86827,7 +87215,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -81076,62 +34063,31 @@
+@@ -81191,62 +34241,31 @@
    return 0;
  }
  _ACEOF
@@ -86899,7 +87287,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -81142,41 +34098,18 @@
+@@ -81257,41 +34276,18 @@
    return 0;
  }
  _ACEOF
@@ -86945,7 +87333,7 @@
  
   fi
  
-@@ -81184,17 +34117,13 @@
+@@ -81299,17 +34295,13 @@
  ############################################
  # See if we have the posix_fadvise syscall.
  
@@ -86966,7 +87354,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -81209,47 +34138,20 @@
+@@ -81324,47 +34316,20 @@
    return 0;
  }
  _ACEOF
@@ -86993,12 +87381,11 @@
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
    samba_cv_HAVE_POSIX_FADVISE=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_POSIX_FADVISE=no
-+else
 +  samba_cv_HAVE_POSIX_FADVISE=no
  fi
 -
@@ -87021,7 +87408,7 @@
  
  fi
  
-@@ -81258,17 +34160,13 @@
+@@ -81373,17 +34338,13 @@
  
  case "$host_os" in
  *linux*)
@@ -87042,7 +87429,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -81283,40 +34181,15 @@
+@@ -81398,40 +34359,15 @@
    return 0;
  }
  _ACEOF
@@ -87088,7 +87475,7 @@
  $as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
  ;;
  *)
-@@ -81326,24 +34199,18 @@
+@@ -81441,24 +34377,18 @@
  
  if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
  
@@ -87117,7 +87504,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -81354,41 +34221,18 @@
+@@ -81469,41 +34399,18 @@
    return 0;
  }
  _ACEOF
@@ -87163,7 +87550,7 @@
  
   fi
  
-@@ -81396,68 +34240,35 @@
+@@ -81511,68 +34418,35 @@
  ############################################
  # See if we have the a broken readlink syscall.
  
@@ -87242,7 +87629,7 @@
  
  fi
  
-@@ -81465,7 +34276,7 @@
+@@ -81580,7 +34454,7 @@
  # Check whether winbind is supported on this platform.  If so we need to
  # build and install client programs, sbin programs and shared libraries
  
@@ -87251,7 +87638,7 @@
  $as_echo_n "checking whether to build winbind... " >&6; }
  
  # Initially, the value of $host_os decides whether winbind is supported
-@@ -81477,7 +34288,7 @@
+@@ -81592,7 +34466,7 @@
  # We define this here so --with-winbind can override it.
  
  # Check whether --with-wbclient was given.
@@ -87260,41 +87647,78 @@
    withval=$with_wbclient;
    case "$withval" in
          no)
-@@ -81575,7 +34386,7 @@
- 
- 
- # Check whether --with-winbind was given.
+@@ -81682,709 +34556,193 @@
+ 		;;
+ 	*)
+ 		HAVE_WINBIND=no
+-		winbind_no_reason=", unsupported on $host_os"
+-		;;
+-esac
+-
+-# Check the setting of --with-winbind
+-
+-
+-# Check whether --with-winbind was given.
 -if test "${with_winbind+set}" = set; then
-+if test "${with_winbind+set}" = set; then :
-   withval=$with_winbind;
-   case "$withval" in
- 	yes)
-@@ -81606,18 +34417,14 @@
- 	WINBIND_WINS_NSS=""
- fi
- if test x"$HAVE_WBCLIENT" = x"yes"; then
+-  withval=$with_winbind;
+-  case "$withval" in
+-	yes)
+-		HAVE_WINBIND=yes
+-		HAVE_WBCLIENT=no
+-		;;
+-        no)
+-		HAVE_WINBIND=no
+-                winbind_reason=""
+-                ;;
+-  esac
+-fi
+-
+-
+-# We need unix domain sockets for winbind
+-
+-if test x"$HAVE_WINBIND" = x"yes"; then
+-	if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"no"; then
+-		winbind_no_reason=", no unix domain socket support on $host_os"
+-		HAVE_WINBIND=no
+-	fi
+-fi
+-
+-# Display test results
+-
+-if test x"$HAVE_WINBIND" = x"no"; then
+-	WINBIND_NSS=""
+-	WINBIND_WINS_NSS=""
+-fi
+-if test x"$HAVE_WBCLIENT" = x"yes"; then
 -        { $as_echo "$as_me:$LINENO: checking for wbcInterfaceDetails in -lwbclient" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wbcInterfaceDetails in -lwbclient" >&5
- $as_echo_n "checking for wbcInterfaceDetails in -lwbclient... " >&6; }
+-$as_echo_n "checking for wbcInterfaceDetails in -lwbclient... " >&6; }
 -if test "${ac_cv_lib_wbclient_wbcInterfaceDetails+set}" = set; then
-+if test "${ac_cv_lib_wbclient_wbcInterfaceDetails+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lwbclient $WBCLIENT_LDFLAGS $LIBS"
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lwbclient $WBCLIENT_LDFLAGS $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.
-@@ -81635,57 +34442,28 @@
-   return 0;
- }
- _ACEOF
+-/* 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 wbcInterfaceDetails ();
+-int
+-main ()
+-{
+-return wbcInterfaceDetails ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -87316,76 +87740,93 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_wbclient_wbcInterfaceDetails=yes
- else
+-  ac_cv_lib_wbclient_wbcInterfaceDetails=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_wbclient_wbcInterfaceDetails=no
-+  ac_cv_lib_wbclient_wbcInterfaceDetails=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
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wbclient_wbcInterfaceDetails" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wbclient_wbcInterfaceDetails" >&5
- $as_echo "$ac_cv_lib_wbclient_wbcInterfaceDetails" >&6; }
+-$as_echo "$ac_cv_lib_wbclient_wbcInterfaceDetails" >&6; }
 -if test "x$ac_cv_lib_wbclient_wbcInterfaceDetails" = x""yes; then
-+if test "x$ac_cv_lib_wbclient_wbcInterfaceDetails" = x""yes; then :
-   LIBWBCLIENT_LIBS="-lwbclient"
- else
+-  LIBWBCLIENT_LIBS="-lwbclient"
+-else
 -  { { $as_echo "$as_me:$LINENO: error: Could not find wbclient" >&5
 -$as_echo "$as_me: error: Could not find wbclient" >&2;}
 -   { (exit 1); exit 1; }; }
-+  as_fn_error "Could not find wbclient" "$LINENO" 5
- fi
- 
- 	LIBWBCLIENT_LIBS="$LIBWBCLIENT_LIBS $WBCLIENT_LDFLAGS"
+-fi
+-
+-	LIBWBCLIENT_LIBS="$LIBWBCLIENT_LIBS $WBCLIENT_LDFLAGS"
 -	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
+-$as_echo "yes" >&6; }
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_WINBIND 1
 -_ACEOF
-+$as_echo "#define WITH_WINBIND 1" >>confdefs.h
- 
- 	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
- else
-@@ -81714,12 +34492,10 @@
- fi
- 
- if test x"$HAVE_WINBIND" = x"yes"; then
+-
+-	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
+-else
+-	if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
+-		BUILD_LIBWBCLIENT_SHARED=no
+-	else
+-		BUILD_LIBWBCLIENT_SHARED=yes
+-	fi
+-
+-	LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
+-	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
+-	LIBWBCLIENT_SOVER=0
+-	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
+-		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
+-		## Only worry about libwbclient if we have shared
+-		# library support
+-		LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
+-		LIBWBCLIENT=libwbclient
+-		INSTALL_LIBWBCLIENT=installlibwbclient
+-		UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
+-		LIBWBCLIENT_LIBS="-lwbclient"
+-	else
+-		LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
+-		LIBWBCLIENT_LIBS=$LIBWBCLIENT_STATIC_TARGET
+-	fi
+-fi
+-
+-if test x"$HAVE_WINBIND" = x"yes"; then
 -        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
+-$as_echo "yes" >&6; }
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_WINBIND 1
 -_ACEOF
-+$as_echo "#define WITH_WINBIND 1" >>confdefs.h
- 
- 
- 	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -81730,7 +34506,7 @@
- 		UNINSTALL_PAM_MODULES="uninstallpammodules"
- 	fi
- else
+-
+-
+-	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
+-	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
+-        if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
+-		PAM_MODULES="$PAM_MODULES pam_winbind"
+-		INSTALL_PAM_MODULES="installpammodules"
+-		UNINSTALL_PAM_MODULES="uninstallpammodules"
+-	fi
+-else
 -        { $as_echo "$as_me:$LINENO: result: no$winbind_no_reason" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no$winbind_no_reason" >&5
- $as_echo "no$winbind_no_reason" >&6; }
- fi
- 
-@@ -81743,108 +34519,11 @@
- 
- 
- # Solaris 10 does have new member in nss_XbyY_key
+-$as_echo "no$winbind_no_reason" >&6; }
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-# 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; }
 -if test "${ac_cv_member_union_nss_XbyY_key_ipnode_af_family+set}" = set; then
@@ -87484,21 +87925,17 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&5
 -$as_echo "$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&6; }
 -if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then
-+ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
-+"
-+if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NSS_XBYY_KEY_IPNODE 1
 -_ACEOF
-+$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
- 
- fi
- 
-@@ -81852,318 +34531,29 @@
- # Solaris has some extra fields in struct passwd that need to be
- # initialised otherwise nscd crashes.
- 
+-
+-fi
+-
+-
+-# Solaris has some extra fields in struct passwd that need to be
+-# initialised otherwise nscd crashes.
+-
 -{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_comment" >&5
 -$as_echo_n "checking for struct passwd.pw_comment... " >&6; }
 -if test "${ac_cv_member_struct_passwd_pw_comment+set}" = set; then
@@ -87585,49 +88022,93 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++		winbind_no_reason=", unsupported on $host_os"
++		;;
++esac
+ 
 -	ac_cv_member_struct_passwd_pw_comment=no
 -fi
--
++# Check the setting of --with-winbind
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++# Check whether --with-winbind was given.
++if test "${with_winbind+set}" = set; then :
++  withval=$with_winbind;
++  case "$withval" in
++	yes)
++		HAVE_WINBIND=yes
++		HAVE_WBCLIENT=no
++		;;
++        no)
++		HAVE_WINBIND=no
++                winbind_reason=""
++                ;;
++  esac
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_comment" >&5
 -$as_echo "$ac_cv_member_struct_passwd_pw_comment" >&6; }
 -if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then
--
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PASSWD_PW_COMMENT 1
 -_ACEOF
--
--fi
--
--
+ 
++# We need unix domain sockets for winbind
++
++if test x"$HAVE_WINBIND" = x"yes"; then
++	if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"no"; then
++		winbind_no_reason=", no unix domain socket support on $host_os"
++		HAVE_WINBIND=no
++	fi
+ fi
+ 
++# Display test results
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_age" >&5
 -$as_echo_n "checking for struct passwd.pw_age... " >&6; }
 -if test "${ac_cv_member_struct_passwd_pw_age+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++if test x"$HAVE_WINBIND" = x"no"; then
++	WINBIND_NSS=""
++	WINBIND_WINS_NSS=""
++fi
++if test x"$HAVE_WBCLIENT" = x"yes"; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wbcInterfaceDetails in -lwbclient" >&5
++$as_echo_n "checking for wbcInterfaceDetails in -lwbclient... " >&6; }
++if test "${ac_cv_lib_wbclient_wbcInterfaceDetails+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="-lwbclient $WBCLIENT_LDFLAGS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <pwd.h>
--
--int
--main ()
--{
+ 
++/* 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 wbcInterfaceDetails ();
+ int
+ main ()
+ {
 -static struct passwd ac_aggr;
 -if (ac_aggr.pw_age)
 -return 0;
--  ;
--  return 0;
--}
--_ACEOF
++return wbcInterfaceDetails ();
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -87647,10 +88128,25 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_passwd_pw_age=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_wbclient_wbcInterfaceDetails=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_lib_wbclient_wbcInterfaceDetails=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_wbclient_wbcInterfaceDetails" >&5
++$as_echo "$ac_cv_lib_wbclient_wbcInterfaceDetails" >&6; }
++if test "x$ac_cv_lib_wbclient_wbcInterfaceDetails" = x""yes; then :
++  LIBWBCLIENT_LIBS="-lwbclient"
++else
++  as_fn_error "Could not find wbclient" "$LINENO" 5
++fi
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -87658,9 +88154,9 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <pwd.h>
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
++	LIBWBCLIENT_LIBS="$LIBWBCLIENT_LIBS $WBCLIENT_LDFLAGS"
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
 -int
 -main ()
@@ -87691,36 +88187,69 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_passwd_pw_age=yes
--else
++$as_echo "#define WITH_WINBIND 1" >>confdefs.h
++
++	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
++	if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
++		BUILD_LIBWBCLIENT_SHARED=no
++	else
++		BUILD_LIBWBCLIENT_SHARED=yes
++	fi
  
 -	ac_cv_member_struct_passwd_pw_age=no
++	LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
++	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
++	LIBWBCLIENT_SOVER=0
++	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
++		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
++		## Only worry about libwbclient if we have shared
++		# library support
++		LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
++		LIBWBCLIENT=libwbclient
++		INSTALL_LIBWBCLIENT=installlibwbclient
++		UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
++		LIBWBCLIENT_LIBS="-lwbclient"
++	else
++		LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
++		LIBWBCLIENT_LIBS=$LIBWBCLIENT_STATIC_TARGET
++	fi
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
++if test x"$HAVE_WINBIND" = x"yes"; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_age" >&5
 -$as_echo "$ac_cv_member_struct_passwd_pw_age" >&6; }
 -if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
++$as_echo "#define WITH_WINBIND 1" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PASSWD_PW_AGE 1
 -_ACEOF
-+$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
  
++	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
++	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
++        if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
++		PAM_MODULES="$PAM_MODULES pam_winbind"
++		INSTALL_PAM_MODULES="installpammodules"
++		UNINSTALL_PAM_MODULES="uninstallpammodules"
++	fi
++else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no$winbind_no_reason" >&5
++$as_echo "no$winbind_no_reason" >&6; }
  fi
  
  
- # AIX 4.3.x and 5.1 do not have as many members in
- # struct secmethod_table as AIX 5.2
+-# AIX 4.3.x and 5.1 do not have as many members in
+-# struct secmethod_table as AIX 5.2
 -{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_attrlist" >&5
 -$as_echo_n "checking for struct secmethod_table.method_attrlist... " >&6; }
 -if test "${ac_cv_member_struct_secmethod_table_method_attrlist+set}" = set; then
@@ -87733,7 +88262,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
--
+ 
 -int
 -main ()
 -{
@@ -87766,7 +88295,7 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -87774,7 +88303,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
--
+ 
 -int
 -main ()
 -{
@@ -87807,25 +88336,28 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_member_struct_secmethod_table_method_attrlist=no
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_attrlist" >&5
 -$as_echo "$ac_cv_member_struct_secmethod_table_method_attrlist" >&6; }
 -if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then
-+ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
+-_ACEOF
++# Solaris 10 does have new member in nss_XbyY_key
++ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
 +"
-+if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
++if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
  
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -82172,104 +34562,9 @@
++$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
  
  fi
  
@@ -87841,7 +88373,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
--
+ 
 -int
 -main ()
 -{
@@ -87874,7 +88406,9 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++# Solaris has some extra fields in struct passwd that need to be
++# initialised otherwise nscd crashes.
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -87882,7 +88416,10 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
+ 
 -int
 -main ()
 -{
@@ -87915,25 +88452,46 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
+ 
 -	ac_cv_member_struct_secmethod_table_method_version=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
++
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
++
++$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
++
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++# AIX 4.3.x and 5.1 do not have as many members in
++# struct secmethod_table as AIX 5.2
++ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
++"
++if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
++_ACEOF
++
++
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
 -$as_echo "$ac_cv_member_struct_secmethod_table_method_version" >&6; }
 -if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then
++
 +ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_version" "ac_cv_member_struct_secmethod_table_method_version" "#include <usersec.h>
 +"
 +if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -82279,17 +34574,13 @@
+@@ -82394,17 +34752,13 @@
  fi
  
  
@@ -87954,7 +88512,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -82304,41 +34595,18 @@
+@@ -82419,41 +34773,18 @@
    return 0;
  }
  _ACEOF
@@ -88000,7 +88558,7 @@
  
  fi
  
-@@ -82348,7 +34616,7 @@
+@@ -82463,7 +34794,7 @@
  
  
  # Check whether --with-included-popt was given.
@@ -88009,7 +88567,7 @@
    withval=$with_included_popt;
    case "$withval" in
  	yes)
-@@ -82361,18 +34629,14 @@
+@@ -82476,18 +34807,14 @@
  fi
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -88031,7 +88589,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82390,43 +34654,18 @@
+@@ -82505,43 +34832,18 @@
    return 0;
  }
  _ACEOF
@@ -88081,7 +88639,7 @@
    INCLUDED_POPT=no
  else
    INCLUDED_POPT=yes
-@@ -82434,16 +34673,16 @@
+@@ -82549,16 +34851,16 @@
  
  fi
  
@@ -88101,7 +88659,7 @@
  $as_echo "no" >&6; }
  	BUILD_POPT=""
      POPTLIBS="-lpopt"
-@@ -82456,7 +34695,7 @@
+@@ -82571,7 +34873,7 @@
  # Check if user wants DNS service discovery support
  
  # Check whether --enable-dnssd was given.
@@ -88110,7 +88668,7 @@
    enableval=$enable_dnssd;
  fi
  
-@@ -82465,151 +34704,12 @@
+@@ -82580,151 +34882,12 @@
  if test x"$enable_dnssd" = x"yes"; then
      have_dnssd_support=yes
  
@@ -88267,7 +88825,7 @@
  _ACEOF
  
  fi
-@@ -82622,102 +34722,12 @@
+@@ -82737,102 +34900,12 @@
  
      # On Darwin the DNSSD API is in libc, but on other platforms it's
      # probably in -ldns_sd
@@ -88375,7 +88933,7 @@
  _ACEOF
  
  fi
-@@ -82725,23 +34735,17 @@
+@@ -82840,23 +34913,17 @@
  
  
  
@@ -88402,15 +88960,10 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82754,59 +34758,33 @@
- int
- main ()
- {
--return DNSServiceRegister ();
--  ;
--  return 0;
--}
--_ACEOF
+@@ -82874,54 +34941,28 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -88432,11 +88985,6 @@
 -	 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
@@ -88474,46 +89022,51 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDNS_SD 1
  _ACEOF
-@@ -82821,7 +34799,6 @@
- 
- 
- fi
+@@ -82930,346 +34971,63 @@
+ 		    *-ldns_sd*)
+ 			;;
+ 		    *)
+-			DNSSD_LIBS="-ldns_sd $DNSSD_LIBS"
+-			;;
+-		esac
 -
-     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
-@@ -82829,15 +34806,11 @@
- 
-     if test x"$have_dnssd_support" = x"yes"; then
- 
+-
+-fi
+-
+-    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
+-    fi
+-
+-    if test x"$have_dnssd_support" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_DNSSD_SUPPORT 1
 -_ACEOF
-+$as_echo "#define WITH_DNSSD_SUPPORT 1" >>confdefs.h
- 
-     else
-     	if test x"$enable_dnssd" = x"yes"; then
+-
+-    else
+-    	if test x"$enable_dnssd" = x"yes"; then
 -	    { { $as_echo "$as_me:$LINENO: error: DNS service discovery support not available" >&5
 -$as_echo "$as_me: error: DNS service discovery support not available" >&2;}
 -   { (exit 1); exit 1; }; }
-+	    as_fn_error "DNS service discovery support not available" "$LINENO" 5
- 	fi
-     fi
- 
-@@ -82847,7 +34820,7 @@
- # Check if user wants avahi support
- 
- # Check whether --enable-avahi was given.
+-	fi
+-    fi
+-
+-fi
+-
+-#################################################
+-# Check if user wants avahi support
+-
+-# Check whether --enable-avahi was given.
 -if test "${enable_avahi+set}" = set; then
-+if test "${enable_avahi+set}" = set; then :
-   enableval=$enable_avahi;
- fi
- 
-@@ -82855,151 +34828,12 @@
- if test x"$enable_avahi" != x"no"; then
-     have_avahi_support=yes
- 
+-  enableval=$enable_avahi;
+-fi
 -
+-
+-if test x"$enable_avahi" != x"no"; then
+-    have_avahi_support=yes
+-
+-
 -for ac_header in avahi-common/watch.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -88651,26 +89204,38 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
++			DNSSD_LIBS="-ldns_sd $DNSSD_LIBS"
++			;;
++		esac
+ 
 -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 avahi-common/watch.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "avahi-common/watch.h" "ac_cv_header_avahi_common_watch_h" "$ac_includes_default"
-+if test "x$ac_cv_header_avahi_common_watch_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_AVAHI_COMMON_WATCH_H 1
- _ACEOF
+-_ACEOF
  
  fi
-@@ -83010,151 +34844,12 @@
- 	have_avahi_support=no
-     fi
++    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
++    fi
  
--
+-done
++    if test x"$have_dnssd_support" = x"yes"; then
+ 
+-    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
+-	have_avahi_support=no
+-    fi
++$as_echo "#define WITH_DNSSD_SUPPORT 1" >>confdefs.h
+ 
++    else
++    	if test x"$enable_dnssd" = x"yes"; then
++	    as_fn_error "DNS service discovery support not available" "$LINENO" 5
++	fi
++    fi
+ 
 -for ac_header in avahi-client/client.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -88679,7 +89244,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
@@ -88719,14 +89284,20 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
--fi
--
++#################################################
++# Check if user wants avahi support
++
++# Check whether --enable-avahi was given.
++if test "${enable_avahi+set}" = set; then :
++  enableval=$enable_avahi;
+ 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; }
@@ -88737,7 +89308,16 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++if test x"$enable_avahi" != x"no"; then
++    have_avahi_support=yes
++
++    for ac_header in avahi-common/watch.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "avahi-common/watch.h" "ac_cv_header_avahi_common_watch_h" "$ac_includes_default"
++if test "x$ac_cv_header_avahi_common_watch_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_AVAHI_COMMON_WATCH_H 1
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -88759,14 +89339,15 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
--fi
--
+ fi
+ 
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
--
++done
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -88808,7 +89389,10 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
++    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
++	have_avahi_support=no
++    fi
+ 
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
@@ -88823,7 +89407,7 @@
  _ACEOF
  
  fi
-@@ -83166,18 +34861,14 @@
+@@ -83281,18 +35039,14 @@
      fi
  
      save_LIBS="$LIBS"
@@ -88845,7 +89429,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83195,58 +34886,29 @@
+@@ -83310,58 +35064,29 @@
    return 0;
  }
  _ACEOF
@@ -88913,7 +89497,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83264,43 +34926,18 @@
+@@ -83379,43 +35104,18 @@
    return 0;
  }
  _ACEOF
@@ -88963,7 +89547,7 @@
    have_avahi_strerror=yes
  fi
  
-@@ -83315,17 +34952,13 @@
+@@ -83430,17 +35130,13 @@
          AVAHI_LIBS="-lavahi-client -lavahi-common"
  
  
@@ -88983,7 +89567,7 @@
  	fi
      fi
  fi
-@@ -83340,18 +34973,14 @@
+@@ -83455,18 +35151,14 @@
  # If it's error, then the user didn't
  # define it.
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -89005,7 +89589,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83369,43 +34998,18 @@
+@@ -83484,43 +35176,18 @@
    return 0;
  }
  _ACEOF
@@ -89055,7 +89639,7 @@
  
  	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
  	     PTHREAD_LDFLAGS="-lpthread"
-@@ -83414,18 +35018,14 @@
+@@ -83529,18 +35196,14 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -89077,7 +89661,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83443,43 +35043,18 @@
+@@ -83558,43 +35221,18 @@
    return 0;
  }
  _ACEOF
@@ -89127,7 +89711,7 @@
  
  	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
  	     PTHREAD_LDFLAGS="-lpthreads"
-@@ -83488,18 +35063,14 @@
+@@ -83603,18 +35241,14 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -89149,7 +89733,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83517,43 +35088,18 @@
+@@ -83632,43 +35266,18 @@
    return 0;
  }
  _ACEOF
@@ -89199,7 +89783,7 @@
  
  		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
  		PTHREAD_LDFLAGS="-pthread"
-@@ -83562,92 +35108,8 @@
+@@ -83677,92 +35286,8 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -89294,7 +89878,7 @@
  
  		 PTHREAD_CFLAGS="-D_REENTRANT"
  		 PTHREAD_LDFLAGS="-lpthread"
-@@ -83658,18 +35120,14 @@
+@@ -83773,18 +35298,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
@@ -89316,7 +89900,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83687,43 +35145,18 @@
+@@ -83802,43 +35323,18 @@
    return 0;
  }
  _ACEOF
@@ -89366,7 +89950,7 @@
  
  		PTHREAD_CFLAGS="-D_REENTRANT"
  		PTHREAD_LDFLAGS="-lpthread"
-@@ -83742,151 +35175,12 @@
+@@ -83857,151 +35353,12 @@
  	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
  	ac_save_LDFLAGS=$LDFLAGS
  	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
@@ -89523,7 +90107,7 @@
  _ACEOF
  
  fi
-@@ -83896,9 +35190,7 @@
+@@ -84011,9 +35368,7 @@
  	CFLAGS=$ac_save_CFLAGS
  	LDFLAGS=$ac_save_LDFLAGS
  
@@ -89534,7 +90118,7 @@
  
  fi
  
-@@ -83906,24 +35198,20 @@
+@@ -84021,24 +35376,20 @@
  # Check if user wants pthreadpool support
  
  # Check whether --enable-pthreadpool was given.
@@ -89545,10 +90129,10 @@
  
  
  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;}
+-	{ { $as_echo "$as_me:$LINENO: error: pthreadpool support cannot be enabled when pthread support was not found" >&5
+-$as_echo "$as_me: error: pthreadpool support cannot be enabled when pthread support was not found" >&2;}
 -   { (exit 1); exit 1; }; }
-+	as_fn_error "pthreadpool support cannot be enabled when pthread support was found" "$LINENO" 5
++	as_fn_error "pthreadpool support cannot be enabled when pthread support was not found" "$LINENO" 5
  fi
  
  if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
@@ -89562,7 +90146,7 @@
  
      PTHREADPOOL_OBJ="lib/pthreadpool.o"
  
-@@ -83934,7 +35222,7 @@
+@@ -84049,7 +35400,7 @@
  
  
  # Check whether --with-included-iniparser was given.
@@ -89571,7 +90155,7 @@
    withval=$with_included_iniparser;
    case "$withval" in
  	yes)
-@@ -83947,18 +35235,14 @@
+@@ -84062,18 +35413,14 @@
  fi
  
  if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -89593,7 +90177,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83976,43 +35260,18 @@
+@@ -84091,43 +35438,18 @@
    return 0;
  }
  _ACEOF
@@ -89643,7 +90227,7 @@
    INCLUDED_INIPARSER=no
  else
    INCLUDED_INIPARSER=yes
-@@ -84020,260 +35279,40 @@
+@@ -84135,16 +35457,16 @@
  
  fi
  
@@ -89655,22 +90239,209 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      BUILD_INIPARSER='$(INIPARSER_OBJ)'
--	INIPARSERLIBS=""
--    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
--else
+ 	INIPARSERLIBS=""
+     FLAGS1="$FLAGS1 -I\$(srcdir)/../lib/iniparser/src"
+ else
 -    { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--	BUILD_INIPARSER=""
--    INIPARSERLIBS="-liniparser"
--fi
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	BUILD_INIPARSER=""
+     INIPARSERLIBS="-liniparser"
+@@ -84157,17 +35479,13 @@
+ # Check for different/missing (set|get|end)netgrent prototypes
+ CFLAGS_SAVE=$CFLAGS
+ CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+-{ $as_echo "$as_me:$LINENO: checking for setnetgrent prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setnetgrent prototype" >&5
+ $as_echo_n "checking for setnetgrent prototype... " >&6; }
+-if test "${samba_cv_setnetgrent_prototype+set}" = set; then
++if test "${samba_cv_setnetgrent_prototype+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include<netdb.h>
+                     #ifdef HAVE_NETGROUP_H
+@@ -84181,54 +35499,27 @@
+   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_setnetgrent_prototype=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	samba_cv_setnetgrent_prototype=no
++  samba_cv_setnetgrent_prototype=no
+ fi
 -
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_setnetgrent_prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_setnetgrent_prototype" >&5
+ $as_echo "$samba_cv_setnetgrent_prototype" >&6; }
+ if test x"$samba_cv_setnetgrent_prototype" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SETNETGRENT_PROTOTYPE 1
+-_ACEOF
++$as_echo "#define HAVE_SETNETGRENT_PROTOTYPE 1" >>confdefs.h
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for getnetgrent prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnetgrent prototype" >&5
+ $as_echo_n "checking for getnetgrent prototype... " >&6; }
+-if test "${samba_cv_getnetgrent_prototype+set}" = set; then
++if test "${samba_cv_getnetgrent_prototype+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include<netdb.h>
+                     #ifdef HAVE_NETGROUP_H
+@@ -84242,54 +35533,27 @@
+   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_getnetgrent_prototype=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	samba_cv_getnetgrent_prototype=no
++  samba_cv_getnetgrent_prototype=no
+ fi
 -
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_getnetgrent_prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_getnetgrent_prototype" >&5
+ $as_echo "$samba_cv_getnetgrent_prototype" >&6; }
+ if test x"$samba_cv_getnetgrent_prototype" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETNETGRENT_PROTOTYPE 1
+-_ACEOF
++$as_echo "#define HAVE_GETNETGRENT_PROTOTYPE 1" >>confdefs.h
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for endnetgrent prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for endnetgrent prototype" >&5
+ $as_echo_n "checking for endnetgrent prototype... " >&6; }
+-if test "${samba_cv_endnetgrent_prototype+set}" = set; then
++if test "${samba_cv_endnetgrent_prototype+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include<netdb.h>
+                     #ifdef HAVE_NETGROUP_H
+@@ -84303,41 +35567,18 @@
+   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_endnetgrent_prototype=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	samba_cv_endnetgrent_prototype=no
++  samba_cv_endnetgrent_prototype=no
+ fi
 -
--# Checks for the vfs_fileid module
--# Start
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_endnetgrent_prototype" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_endnetgrent_prototype" >&5
+ $as_echo "$samba_cv_endnetgrent_prototype" >&6; }
+ if test x"$samba_cv_endnetgrent_prototype" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ENDNETGRENT_PROTOTYPE 1
+-_ACEOF
++$as_echo "#define HAVE_ENDNETGRENT_PROTOTYPE 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -84345,238 +35586,18 @@
+ 
+ # Checks for the vfs_fileid module
+ # Start
 -{ $as_echo "$as_me:$LINENO: checking for getmntent" >&5
 -$as_echo_n "checking for getmntent... " >&6; }
 -if test "${ac_cv_func_getmntent+set}" = set; then
@@ -89746,10 +90517,12 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent"
++if test "x$ac_cv_func_getmntent" = x""yes; then :
+ 
 -	ac_cv_func_getmntent=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
@@ -89758,8 +90531,8 @@
 -$as_echo "$ac_cv_func_getmntent" >&6; }
 -
 -
--
--for ac_header in sys/statfs.h
+ 
+ for ac_header in sys/statfs.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
@@ -89889,37 +90662,18 @@
 -$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
-+	INIPARSERLIBS=""
-+    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
- else
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	BUILD_INIPARSER=""
-+    INIPARSERLIBS="-liniparser"
- 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; }
-+
-+
-+
-+
-+
-+
-+# Checks for the vfs_fileid module
-+# Start
-+ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent"
-+if test "x$ac_cv_func_getmntent" = x""yes; then :
- 
- 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/statfs.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_statfs_h" = x""yes; then :
@@ -89929,7 +90683,7 @@
  _ACEOF
  
  fi
-@@ -84281,20 +35320,16 @@
+@@ -84584,20 +35605,16 @@
  done
  
  
@@ -89954,7 +90708,7 @@
  /* end confdefs.h.  */
  
  		#include <sys/types.h>
-@@ -84306,46 +35341,19 @@
+@@ -84609,46 +35626,19 @@
  			return statfs (".", &fsd);
  		}
  _ACEOF
@@ -90006,7 +90760,7 @@
  $as_echo "$vfsfileid_cv_statfs" >&6; }
  
  if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -84380,7 +35388,7 @@
+@@ -84683,7 +35673,7 @@
  
  
  # Check whether --with-static-modules was given.
@@ -90015,7 +90769,7 @@
    withval=$with_static_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -84392,7 +35400,7 @@
+@@ -84695,7 +35685,7 @@
  
  
  # Check whether --with-shared-modules was given.
@@ -90024,7 +90778,7 @@
    withval=$with_shared_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -84409,7 +35417,7 @@
+@@ -84712,7 +35702,7 @@
  fi
  
  
@@ -90033,7 +90787,7 @@
  $as_echo_n "checking how to build pdb_ldap... " >&6; }
  	if test "$MODULE_pdb_ldap"; then
  		DEST=$MODULE_pdb_ldap
-@@ -84421,12 +35429,10 @@
+@@ -84724,12 +35714,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90048,13 +90802,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -84437,16 +35443,16 @@
+@@ -84740,7 +35728,7 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
  
  		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_pdb="$init_static_modules_pdb  pdb_ldap_init();"
+@@ -84749,16 +35737,16 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
+ 
+ 		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules pdb_ldap"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90068,7 +90831,7 @@
  $as_echo_n "checking how to build pdb_ads... " >&6; }
  	if test "$MODULE_pdb_ads"; then
  		DEST=$MODULE_pdb_ads
-@@ -84458,12 +35464,10 @@
+@@ -84770,12 +35758,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90083,13 +90846,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ads"
-@@ -84474,16 +35478,16 @@
+@@ -84786,7 +35772,7 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_pdb="$init_static_modules_pdb  pdb_ads_init();"
+@@ -84795,16 +35781,16 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules pdb_ads"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90103,7 +90875,7 @@
  $as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
  	if test "$MODULE_pdb_smbpasswd"; then
  		DEST=$MODULE_pdb_smbpasswd
-@@ -84495,12 +35499,10 @@
+@@ -84816,12 +35802,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90118,13 +90890,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -84511,16 +35513,16 @@
+@@ -84832,7 +35816,7 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_pdb="$init_static_modules_pdb  pdb_smbpasswd_init();"
+@@ -84841,16 +35825,16 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules pdb_smbpasswd"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90138,7 +90919,7 @@
  $as_echo_n "checking how to build pdb_tdbsam... " >&6; }
  	if test "$MODULE_pdb_tdbsam"; then
  		DEST=$MODULE_pdb_tdbsam
-@@ -84532,12 +35534,10 @@
+@@ -84862,12 +35846,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90153,13 +90934,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -84548,16 +35548,16 @@
+@@ -84878,7 +35860,7 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_pdb="$init_static_modules_pdb  pdb_tdbsam_init();"
+@@ -84887,16 +35869,16 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules pdb_tdbsam"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90173,7 +90963,7 @@
  $as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
  	if test "$MODULE_pdb_wbc_sam"; then
  		DEST=$MODULE_pdb_wbc_sam
-@@ -84569,12 +35569,10 @@
+@@ -84908,12 +35890,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90188,13 +90978,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -84585,11 +35583,11 @@
+@@ -84924,7 +35904,7 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_pdb="$init_static_modules_pdb  pdb_wbc_sam_init();"
+@@ -84933,11 +35913,11 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules pdb_wbc_sam"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90202,7 +91001,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84611,7 +35609,7 @@
+@@ -84959,7 +35939,7 @@
  
  
  
@@ -90211,7 +91010,7 @@
  $as_echo_n "checking how to build rpc_lsarpc... " >&6; }
  	if test "$MODULE_rpc_lsarpc"; then
  		DEST=$MODULE_rpc_lsarpc
-@@ -84623,12 +35621,10 @@
+@@ -84971,12 +35951,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90226,13 +91025,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -84639,16 +35635,16 @@
+@@ -84987,7 +35965,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_lsarpc_init();"
+@@ -84996,16 +35974,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_lsarpc"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90246,7 +91054,7 @@
  $as_echo_n "checking how to build rpc_winreg... " >&6; }
  	if test "$MODULE_rpc_winreg"; then
  		DEST=$MODULE_rpc_winreg
-@@ -84660,12 +35656,10 @@
+@@ -85017,12 +35995,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90261,13 +91069,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -84676,16 +35670,16 @@
+@@ -85033,7 +36009,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_winreg_init();"
+@@ -85042,16 +36018,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_winreg"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90281,7 +91098,7 @@
  $as_echo_n "checking how to build rpc_initshutdown... " >&6; }
  	if test "$MODULE_rpc_initshutdown"; then
  		DEST=$MODULE_rpc_initshutdown
-@@ -84697,12 +35691,10 @@
+@@ -85063,12 +36039,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90296,13 +91113,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -84713,16 +35705,16 @@
+@@ -85079,7 +36053,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_initshutdown_init();"
+@@ -85088,16 +36062,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_initshutdown"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90316,7 +91142,7 @@
  $as_echo_n "checking how to build rpc_dssetup... " >&6; }
  	if test "$MODULE_rpc_dssetup"; then
  		DEST=$MODULE_rpc_dssetup
-@@ -84734,12 +35726,10 @@
+@@ -85109,12 +36083,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90331,13 +91157,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -84750,16 +35740,16 @@
+@@ -85125,7 +36097,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_dssetup_init();"
+@@ -85134,16 +36106,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_dssetup"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90351,7 +91186,7 @@
  $as_echo_n "checking how to build rpc_wkssvc... " >&6; }
  	if test "$MODULE_rpc_wkssvc"; then
  		DEST=$MODULE_rpc_wkssvc
-@@ -84771,12 +35761,10 @@
+@@ -85155,12 +36127,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90366,13 +91201,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -84787,16 +35775,16 @@
+@@ -85171,7 +36141,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_wkssvc_init();"
+@@ -85180,16 +36150,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_wkssvc"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90386,7 +91230,7 @@
  $as_echo_n "checking how to build rpc_svcctl... " >&6; }
  	if test "$MODULE_rpc_svcctl"; then
  		DEST=$MODULE_rpc_svcctl
-@@ -84808,12 +35796,10 @@
+@@ -85201,12 +36171,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90401,13 +91245,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -84824,16 +35810,16 @@
+@@ -85217,7 +36185,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_svcctl_init();"
+@@ -85226,16 +36194,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_svcctl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90421,7 +91274,7 @@
  $as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
  	if test "$MODULE_rpc_ntsvcs"; then
  		DEST=$MODULE_rpc_ntsvcs
-@@ -84845,12 +35831,10 @@
+@@ -85247,12 +36215,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90436,13 +91289,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -84861,16 +35845,16 @@
+@@ -85263,7 +36229,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_ntsvcs_init();"
+@@ -85272,16 +36238,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_ntsvcs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90456,7 +91318,7 @@
  $as_echo_n "checking how to build rpc_netlogon... " >&6; }
  	if test "$MODULE_rpc_netlogon"; then
  		DEST=$MODULE_rpc_netlogon
-@@ -84882,12 +35866,10 @@
+@@ -85293,12 +36259,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90471,13 +91333,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -84898,16 +35880,16 @@
+@@ -85309,7 +36273,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_netlogon_init();"
+@@ -85318,16 +36282,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_netlogon"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90491,7 +91362,7 @@
  $as_echo_n "checking how to build rpc_netdfs... " >&6; }
  	if test "$MODULE_rpc_netdfs"; then
  		DEST=$MODULE_rpc_netdfs
-@@ -84919,12 +35901,10 @@
+@@ -85339,12 +36303,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90506,13 +91377,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -84935,16 +35915,16 @@
+@@ -85355,7 +36317,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_netdfs_init();"
+@@ -85364,16 +36326,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_netdfs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90526,7 +91406,7 @@
  $as_echo_n "checking how to build rpc_srvsvc... " >&6; }
  	if test "$MODULE_rpc_srvsvc"; then
  		DEST=$MODULE_rpc_srvsvc
-@@ -84956,12 +35936,10 @@
+@@ -85385,12 +36347,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90541,13 +91421,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -84972,16 +35950,16 @@
+@@ -85401,7 +36361,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_srvsvc_init();"
+@@ -85410,16 +36370,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_srvsvc"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90561,7 +91450,7 @@
  $as_echo_n "checking how to build rpc_spoolss... " >&6; }
  	if test "$MODULE_rpc_spoolss"; then
  		DEST=$MODULE_rpc_spoolss
-@@ -84993,12 +35971,10 @@
+@@ -85431,12 +36391,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90576,13 +91465,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -85009,16 +35985,16 @@
+@@ -85447,7 +36405,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_spoolss_init();"
+@@ -85456,16 +36414,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_spoolss"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90596,7 +91494,7 @@
  $as_echo_n "checking how to build rpc_eventlog... " >&6; }
  	if test "$MODULE_rpc_eventlog"; then
  		DEST=$MODULE_rpc_eventlog
-@@ -85030,12 +36006,10 @@
+@@ -85477,12 +36435,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90611,13 +91509,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -85046,16 +36020,16 @@
+@@ -85493,7 +36449,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_eventlog_init();"
+@@ -85502,16 +36458,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_eventlog"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90631,7 +91538,7 @@
  $as_echo_n "checking how to build rpc_samr... " >&6; }
  	if test "$MODULE_rpc_samr"; then
  		DEST=$MODULE_rpc_samr
-@@ -85067,12 +36041,10 @@
+@@ -85523,12 +36479,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90646,13 +91553,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_samr"
-@@ -85083,16 +36055,16 @@
+@@ -85539,7 +36493,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_samr_init();"
+@@ -85548,16 +36502,16 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_samr"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90666,7 +91582,7 @@
  $as_echo_n "checking how to build rpc_rpcecho... " >&6; }
  	if test "$MODULE_rpc_rpcecho"; then
  		DEST=$MODULE_rpc_rpcecho
-@@ -85104,12 +36076,10 @@
+@@ -85569,12 +36523,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90681,13 +91597,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -85120,11 +36090,11 @@
+@@ -85585,7 +36537,7 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_rpc="$init_static_modules_rpc  rpc_rpcecho_init();"
+@@ -85594,11 +36546,11 @@
+ 		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules rpc_rpcecho"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90695,7 +91620,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85145,7 +36115,7 @@
+@@ -85619,7 +36571,7 @@
  
  
  
@@ -90704,7 +91629,7 @@
  $as_echo_n "checking how to build idmap_ldap... " >&6; }
  	if test "$MODULE_idmap_ldap"; then
  		DEST=$MODULE_idmap_ldap
-@@ -85157,12 +36127,10 @@
+@@ -85631,12 +36583,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90719,13 +91644,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -85173,16 +36141,16 @@
+@@ -85647,7 +36597,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_ldap_init();"
+@@ -85656,16 +36606,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_ldap"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90739,7 +91673,7 @@
  $as_echo_n "checking how to build idmap_tdb... " >&6; }
  	if test "$MODULE_idmap_tdb"; then
  		DEST=$MODULE_idmap_tdb
-@@ -85194,12 +36162,10 @@
+@@ -85677,12 +36627,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90754,13 +91688,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -85210,16 +36176,16 @@
+@@ -85693,7 +36641,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_tdb_init();"
+@@ -85702,16 +36650,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_tdb"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90774,7 +91717,7 @@
  $as_echo_n "checking how to build idmap_tdb2... " >&6; }
  	if test "$MODULE_idmap_tdb2"; then
  		DEST=$MODULE_idmap_tdb2
-@@ -85231,12 +36197,10 @@
+@@ -85723,12 +36671,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90789,13 +91732,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -85247,16 +36211,16 @@
+@@ -85739,7 +36685,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_tdb2_init();"
+@@ -85748,16 +36694,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_tdb2"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90809,7 +91761,7 @@
  $as_echo_n "checking how to build idmap_passdb... " >&6; }
  	if test "$MODULE_idmap_passdb"; then
  		DEST=$MODULE_idmap_passdb
-@@ -85268,12 +36232,10 @@
+@@ -85769,12 +36715,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90824,13 +91776,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -85284,16 +36246,16 @@
+@@ -85785,7 +36729,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_passdb_init();"
+@@ -85794,16 +36738,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_passdb"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90844,7 +91805,7 @@
  $as_echo_n "checking how to build idmap_nss... " >&6; }
  	if test "$MODULE_idmap_nss"; then
  		DEST=$MODULE_idmap_nss
-@@ -85305,12 +36267,10 @@
+@@ -85815,12 +36759,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90859,13 +91820,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_nss"
-@@ -85321,16 +36281,16 @@
+@@ -85831,7 +36773,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_nss_init();"
+@@ -85840,16 +36782,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_nss"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90879,7 +91849,7 @@
  $as_echo_n "checking how to build idmap_rid... " >&6; }
  	if test "$MODULE_idmap_rid"; then
  		DEST=$MODULE_idmap_rid
-@@ -85342,12 +36302,10 @@
+@@ -85861,12 +36803,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90894,13 +91864,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_rid"
-@@ -85358,16 +36316,16 @@
+@@ -85877,7 +36817,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_rid_init();"
+@@ -85886,16 +36826,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_rid"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90914,7 +91893,7 @@
  $as_echo_n "checking how to build idmap_ad... " >&6; }
  	if test "$MODULE_idmap_ad"; then
  		DEST=$MODULE_idmap_ad
-@@ -85379,12 +36337,10 @@
+@@ -85907,12 +36847,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90929,13 +91908,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ad"
-@@ -85395,16 +36351,16 @@
+@@ -85923,7 +36861,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_ad_init();"
+@@ -85932,16 +36870,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_ad"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90949,7 +91937,7 @@
  $as_echo_n "checking how to build idmap_hash... " >&6; }
  	if test "$MODULE_idmap_hash"; then
  		DEST=$MODULE_idmap_hash
-@@ -85416,12 +36372,10 @@
+@@ -85953,12 +36891,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90964,13 +91952,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_hash"
-@@ -85432,16 +36386,16 @@
+@@ -85969,7 +36905,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_hash_init();"
+@@ -85978,16 +36914,16 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_hash"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -90984,7 +91981,7 @@
  $as_echo_n "checking how to build idmap_adex... " >&6; }
  	if test "$MODULE_idmap_adex"; then
  		DEST=$MODULE_idmap_adex
-@@ -85453,12 +36407,10 @@
+@@ -85999,12 +36935,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90999,13 +91996,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_adex"
-@@ -85469,11 +36421,11 @@
+@@ -86015,7 +36949,7 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_idmap="$init_static_modules_idmap  idmap_adex_init();"
+@@ -86024,11 +36958,11 @@
+ 		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules idmap_adex"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91013,7 +92019,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85494,7 +36446,7 @@
+@@ -86049,7 +36983,7 @@
  
  
  
@@ -91022,7 +92028,7 @@
  $as_echo_n "checking how to build nss_info_template... " >&6; }
  	if test "$MODULE_nss_info_template"; then
  		DEST=$MODULE_nss_info_template
-@@ -85506,12 +36458,10 @@
+@@ -86061,12 +36995,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91037,13 +92043,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules nss_info_template"
-@@ -85522,11 +36472,11 @@
+@@ -86077,7 +37009,7 @@
  		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_nss_info="$init_static_modules_nss_info  nss_info_template_init();"
+@@ -86086,11 +37018,11 @@
+ 		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules nss_info_template"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91051,7 +92066,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85547,7 +36497,7 @@
+@@ -86111,7 +37043,7 @@
  
  
  
@@ -91060,7 +92075,7 @@
  $as_echo_n "checking how to build charset_weird... " >&6; }
  	if test "$MODULE_charset_weird"; then
  		DEST=$MODULE_charset_weird
-@@ -85559,12 +36509,10 @@
+@@ -86123,12 +37055,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91075,13 +92090,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_weird"
-@@ -85575,16 +36523,16 @@
+@@ -86139,7 +37069,7 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_charset="$init_static_modules_charset  charset_weird_init();"
+@@ -86148,16 +37078,16 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules charset_weird"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91095,7 +92119,7 @@
  $as_echo_n "checking how to build charset_CP850... " >&6; }
  	if test "$MODULE_charset_CP850"; then
  		DEST=$MODULE_charset_CP850
-@@ -85596,12 +36544,10 @@
+@@ -86169,12 +37099,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91110,13 +92134,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP850"
-@@ -85612,16 +36558,16 @@
+@@ -86185,7 +37113,7 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_charset="$init_static_modules_charset  charset_CP850_init();"
+@@ -86194,16 +37122,16 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules charset_CP850"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91130,7 +92163,7 @@
  $as_echo_n "checking how to build charset_CP437... " >&6; }
  	if test "$MODULE_charset_CP437"; then
  		DEST=$MODULE_charset_CP437
-@@ -85633,12 +36579,10 @@
+@@ -86215,12 +37143,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91145,13 +92178,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP437"
-@@ -85649,16 +36593,16 @@
+@@ -86231,7 +37157,7 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_charset="$init_static_modules_charset  charset_CP437_init();"
+@@ -86240,16 +37166,16 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules charset_CP437"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91165,7 +92207,7 @@
  $as_echo_n "checking how to build charset_macosxfs... " >&6; }
  	if test "$MODULE_charset_macosxfs"; then
  		DEST=$MODULE_charset_macosxfs
-@@ -85670,12 +36614,10 @@
+@@ -86261,12 +37187,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91180,13 +92222,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -85686,11 +36628,11 @@
+@@ -86277,7 +37201,7 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_charset="$init_static_modules_charset  charset_macosxfs_init();"
+@@ -86286,11 +37210,11 @@
+ 		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules charset_macosxfs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91194,7 +92245,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85711,7 +36653,7 @@
+@@ -86311,7 +37235,7 @@
  
  
  
@@ -91203,7 +92254,7 @@
  $as_echo_n "checking how to build auth_sam... " >&6; }
  	if test "$MODULE_auth_sam"; then
  		DEST=$MODULE_auth_sam
-@@ -85723,12 +36665,10 @@
+@@ -86323,12 +37247,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91218,13 +92269,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_sam"
-@@ -85739,16 +36679,16 @@
+@@ -86339,7 +37261,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_sam_init();"
+@@ -86348,16 +37270,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_sam"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91238,7 +92298,7 @@
  $as_echo_n "checking how to build auth_unix... " >&6; }
  	if test "$MODULE_auth_unix"; then
  		DEST=$MODULE_auth_unix
-@@ -85760,12 +36700,10 @@
+@@ -86369,12 +37291,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91253,13 +92313,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_unix"
-@@ -85776,16 +36714,16 @@
+@@ -86385,7 +37305,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_unix_init();"
+@@ -86394,16 +37314,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_unix"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91273,7 +92342,7 @@
  $as_echo_n "checking how to build auth_winbind... " >&6; }
  	if test "$MODULE_auth_winbind"; then
  		DEST=$MODULE_auth_winbind
-@@ -85797,12 +36735,10 @@
+@@ -86415,12 +37335,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91288,13 +92357,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_winbind"
-@@ -85813,16 +36749,16 @@
+@@ -86431,7 +37349,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_winbind_init();"
+@@ -86440,16 +37358,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_winbind"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91308,7 +92386,7 @@
  $as_echo_n "checking how to build auth_wbc... " >&6; }
  	if test "$MODULE_auth_wbc"; then
  		DEST=$MODULE_auth_wbc
-@@ -85834,12 +36770,10 @@
+@@ -86461,12 +37379,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91323,13 +92401,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_wbc"
-@@ -85850,16 +36784,16 @@
+@@ -86477,7 +37393,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_wbc_init();"
+@@ -86486,16 +37402,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_wbc"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91343,7 +92430,7 @@
  $as_echo_n "checking how to build auth_server... " >&6; }
  	if test "$MODULE_auth_server"; then
  		DEST=$MODULE_auth_server
-@@ -85871,12 +36805,10 @@
+@@ -86507,12 +37423,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91358,13 +92445,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_server"
-@@ -85887,16 +36819,16 @@
+@@ -86523,7 +37437,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_server_init();"
+@@ -86532,16 +37446,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_server"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91378,7 +92474,7 @@
  $as_echo_n "checking how to build auth_domain... " >&6; }
  	if test "$MODULE_auth_domain"; then
  		DEST=$MODULE_auth_domain
-@@ -85908,12 +36840,10 @@
+@@ -86553,12 +37467,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91393,13 +92489,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_domain"
-@@ -85924,16 +36854,16 @@
+@@ -86569,7 +37481,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_domain_init();"
+@@ -86578,16 +37490,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_domain"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91413,7 +92518,7 @@
  $as_echo_n "checking how to build auth_builtin... " >&6; }
  	if test "$MODULE_auth_builtin"; then
  		DEST=$MODULE_auth_builtin
-@@ -85945,12 +36875,10 @@
+@@ -86599,12 +37511,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91428,13 +92533,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_builtin"
-@@ -85961,16 +36889,16 @@
+@@ -86615,7 +37525,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_builtin_init();"
+@@ -86624,16 +37534,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_builtin"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91448,7 +92562,7 @@
  $as_echo_n "checking how to build auth_script... " >&6; }
  	if test "$MODULE_auth_script"; then
  		DEST=$MODULE_auth_script
-@@ -85982,12 +36910,10 @@
+@@ -86645,12 +37555,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91463,13 +92577,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_script"
-@@ -85998,16 +36924,16 @@
+@@ -86661,7 +37569,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_script_init();"
+@@ -86670,16 +37578,16 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_script"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91483,7 +92606,7 @@
  $as_echo_n "checking how to build auth_netlogond... " >&6; }
  	if test "$MODULE_auth_netlogond"; then
  		DEST=$MODULE_auth_netlogond
-@@ -86019,12 +36945,10 @@
+@@ -86691,12 +37599,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91498,13 +92621,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -86035,11 +36959,11 @@
+@@ -86707,7 +37613,7 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_auth="$init_static_modules_auth  auth_netlogond_init();"
+@@ -86716,11 +37622,11 @@
+ 		AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules auth_netlogond"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91512,7 +92644,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -86060,7 +36984,7 @@
+@@ -86741,7 +37647,7 @@
  
  
  
@@ -91521,7 +92653,7 @@
  $as_echo_n "checking how to build vfs_default... " >&6; }
  	if test "$MODULE_vfs_default"; then
  		DEST=$MODULE_vfs_default
-@@ -86072,12 +36996,10 @@
+@@ -86753,12 +37659,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91536,13 +92668,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default"
-@@ -86088,16 +37010,16 @@
+@@ -86769,7 +37673,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_default_init();"
+@@ -86778,16 +37682,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_default"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91556,7 +92697,7 @@
  $as_echo_n "checking how to build vfs_recycle... " >&6; }
  	if test "$MODULE_vfs_recycle"; then
  		DEST=$MODULE_vfs_recycle
-@@ -86109,12 +37031,10 @@
+@@ -86799,12 +37703,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91571,13 +92712,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -86125,16 +37045,16 @@
+@@ -86815,7 +37717,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_recycle_init();"
+@@ -86824,16 +37726,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_recycle"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91591,7 +92741,7 @@
  $as_echo_n "checking how to build vfs_audit... " >&6; }
  	if test "$MODULE_vfs_audit"; then
  		DEST=$MODULE_vfs_audit
-@@ -86146,12 +37066,10 @@
+@@ -86845,12 +37747,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91606,13 +92756,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_audit"
-@@ -86162,16 +37080,16 @@
+@@ -86861,7 +37761,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_audit_init();"
+@@ -86870,16 +37770,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_audit"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91626,7 +92785,7 @@
  $as_echo_n "checking how to build vfs_extd_audit... " >&6; }
  	if test "$MODULE_vfs_extd_audit"; then
  		DEST=$MODULE_vfs_extd_audit
-@@ -86183,12 +37101,10 @@
+@@ -86891,12 +37791,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91641,13 +92800,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -86199,16 +37115,16 @@
+@@ -86907,7 +37805,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_extd_audit_init();"
+@@ -86916,16 +37814,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_extd_audit"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91661,7 +92829,7 @@
  $as_echo_n "checking how to build vfs_full_audit... " >&6; }
  	if test "$MODULE_vfs_full_audit"; then
  		DEST=$MODULE_vfs_full_audit
-@@ -86220,12 +37136,10 @@
+@@ -86937,12 +37835,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91676,13 +92844,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -86236,16 +37150,16 @@
+@@ -86953,7 +37849,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_full_audit_init();"
+@@ -86962,16 +37858,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_full_audit"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91696,7 +92873,7 @@
  $as_echo_n "checking how to build vfs_netatalk... " >&6; }
  	if test "$MODULE_vfs_netatalk"; then
  		DEST=$MODULE_vfs_netatalk
-@@ -86257,12 +37171,10 @@
+@@ -86983,12 +37879,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91711,13 +92888,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -86273,16 +37185,16 @@
+@@ -86999,7 +37893,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_netatalk_init();"
+@@ -87008,16 +37902,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_netatalk"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91731,7 +92917,7 @@
  $as_echo_n "checking how to build vfs_fake_perms... " >&6; }
  	if test "$MODULE_vfs_fake_perms"; then
  		DEST=$MODULE_vfs_fake_perms
-@@ -86294,12 +37206,10 @@
+@@ -87029,12 +37923,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91746,13 +92932,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -86310,16 +37220,16 @@
+@@ -87045,7 +37937,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_fake_perms_init();"
+@@ -87054,16 +37946,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_fake_perms"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91766,7 +92961,7 @@
  $as_echo_n "checking how to build vfs_default_quota... " >&6; }
  	if test "$MODULE_vfs_default_quota"; then
  		DEST=$MODULE_vfs_default_quota
-@@ -86331,12 +37241,10 @@
+@@ -87075,12 +37967,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91781,13 +92976,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -86347,16 +37255,16 @@
+@@ -87091,7 +37981,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_default_quota_init();"
+@@ -87100,16 +37990,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_default_quota"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91801,7 +93005,7 @@
  $as_echo_n "checking how to build vfs_readonly... " >&6; }
  	if test "$MODULE_vfs_readonly"; then
  		DEST=$MODULE_vfs_readonly
-@@ -86368,12 +37276,10 @@
+@@ -87121,12 +38011,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91816,13 +93020,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -86384,16 +37290,16 @@
+@@ -87137,7 +38025,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_readonly_init();"
+@@ -87146,16 +38034,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_readonly"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91836,7 +93049,7 @@
  $as_echo_n "checking how to build vfs_cap... " >&6; }
  	if test "$MODULE_vfs_cap"; then
  		DEST=$MODULE_vfs_cap
-@@ -86405,12 +37311,10 @@
+@@ -87167,12 +38055,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91851,13 +93064,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cap"
-@@ -86421,16 +37325,16 @@
+@@ -87183,7 +38069,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_cap_init();"
+@@ -87192,16 +38078,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_cap"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91871,7 +93093,7 @@
  $as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
  	if test "$MODULE_vfs_expand_msdfs"; then
  		DEST=$MODULE_vfs_expand_msdfs
-@@ -86442,12 +37346,10 @@
+@@ -87213,12 +38099,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91886,13 +93108,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -86458,16 +37360,16 @@
+@@ -87229,7 +38113,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_expand_msdfs_init();"
+@@ -87238,16 +38122,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_expand_msdfs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91906,7 +93137,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
  	if test "$MODULE_vfs_shadow_copy"; then
  		DEST=$MODULE_vfs_shadow_copy
-@@ -86479,12 +37381,10 @@
+@@ -87259,12 +38143,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91921,13 +93152,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -86495,16 +37395,16 @@
+@@ -87275,7 +38157,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_shadow_copy_init();"
+@@ -87284,16 +38166,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_shadow_copy"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91941,7 +93181,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
  	if test "$MODULE_vfs_shadow_copy2"; then
  		DEST=$MODULE_vfs_shadow_copy2
-@@ -86516,12 +37416,10 @@
+@@ -87305,12 +38187,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91956,13 +93196,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -86532,16 +37430,16 @@
+@@ -87321,7 +38201,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_shadow_copy2_init();"
+@@ -87330,16 +38210,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_shadow_copy2"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -91976,7 +93225,7 @@
  $as_echo_n "checking how to build vfs_afsacl... " >&6; }
  	if test "$MODULE_vfs_afsacl"; then
  		DEST=$MODULE_vfs_afsacl
-@@ -86553,12 +37451,10 @@
+@@ -87351,12 +38231,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91991,13 +93240,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -86569,16 +37465,16 @@
+@@ -87367,7 +38245,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_afsacl_init();"
+@@ -87376,16 +38254,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_afsacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92011,7 +93269,7 @@
  $as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
  	if test "$MODULE_vfs_xattr_tdb"; then
  		DEST=$MODULE_vfs_xattr_tdb
-@@ -86590,12 +37486,10 @@
+@@ -87397,12 +38275,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92026,13 +93284,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -86606,16 +37500,16 @@
+@@ -87413,7 +38289,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_xattr_tdb_init();"
+@@ -87422,16 +38298,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_xattr_tdb"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92046,7 +93313,7 @@
  $as_echo_n "checking how to build vfs_posixacl... " >&6; }
  	if test "$MODULE_vfs_posixacl"; then
  		DEST=$MODULE_vfs_posixacl
-@@ -86627,12 +37521,10 @@
+@@ -87443,12 +38319,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92061,13 +93328,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -86643,16 +37535,16 @@
+@@ -87459,7 +38333,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_posixacl_init();"
+@@ -87468,16 +38342,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_posixacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92081,7 +93357,7 @@
  $as_echo_n "checking how to build vfs_aixacl... " >&6; }
  	if test "$MODULE_vfs_aixacl"; then
  		DEST=$MODULE_vfs_aixacl
-@@ -86664,12 +37556,10 @@
+@@ -87489,12 +38363,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92096,13 +93372,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -86680,16 +37570,16 @@
+@@ -87505,7 +38377,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_aixacl_init();"
+@@ -87514,16 +38386,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_aixacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92116,7 +93401,7 @@
  $as_echo_n "checking how to build vfs_aixacl2... " >&6; }
  	if test "$MODULE_vfs_aixacl2"; then
  		DEST=$MODULE_vfs_aixacl2
-@@ -86701,12 +37591,10 @@
+@@ -87535,12 +38407,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92131,13 +93416,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -86717,16 +37605,16 @@
+@@ -87551,7 +38421,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_aixacl2_init();"
+@@ -87560,16 +38430,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_aixacl2"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92151,7 +93445,7 @@
  $as_echo_n "checking how to build vfs_solarisacl... " >&6; }
  	if test "$MODULE_vfs_solarisacl"; then
  		DEST=$MODULE_vfs_solarisacl
-@@ -86738,12 +37626,10 @@
+@@ -87581,12 +38451,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92166,13 +93460,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -86754,16 +37640,16 @@
+@@ -87597,7 +38465,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_solarisacl_init();"
+@@ -87606,16 +38474,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_solarisacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92186,7 +93489,7 @@
  $as_echo_n "checking how to build vfs_irixacl... " >&6; }
  	if test "$MODULE_vfs_irixacl"; then
  		DEST=$MODULE_vfs_irixacl
-@@ -86775,12 +37661,10 @@
+@@ -87627,12 +38495,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92201,13 +93504,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -86791,16 +37675,16 @@
+@@ -87643,7 +38509,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_irixacl_init();"
+@@ -87652,16 +38518,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_irixacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92221,7 +93533,7 @@
  $as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
  	if test "$MODULE_vfs_hpuxacl"; then
  		DEST=$MODULE_vfs_hpuxacl
-@@ -86812,12 +37696,10 @@
+@@ -87673,12 +38539,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92236,13 +93548,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -86828,16 +37710,16 @@
+@@ -87689,7 +38553,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_hpuxacl_init();"
+@@ -87698,16 +38562,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_hpuxacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92256,7 +93577,7 @@
  $as_echo_n "checking how to build vfs_tru64acl... " >&6; }
  	if test "$MODULE_vfs_tru64acl"; then
  		DEST=$MODULE_vfs_tru64acl
-@@ -86849,12 +37731,10 @@
+@@ -87719,12 +38583,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92271,13 +93592,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -86865,16 +37745,16 @@
+@@ -87735,7 +38597,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_tru64acl_init();"
+@@ -87744,16 +38606,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_tru64acl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92291,7 +93621,7 @@
  $as_echo_n "checking how to build vfs_catia... " >&6; }
  	if test "$MODULE_vfs_catia"; then
  		DEST=$MODULE_vfs_catia
-@@ -86886,12 +37766,10 @@
+@@ -87765,12 +38627,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92306,13 +93636,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_catia"
-@@ -86902,16 +37780,16 @@
+@@ -87781,7 +38641,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_catia_init();"
+@@ -87790,16 +38650,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_catia"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92326,7 +93665,7 @@
  $as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
  	if test "$MODULE_vfs_streams_xattr"; then
  		DEST=$MODULE_vfs_streams_xattr
-@@ -86923,12 +37801,10 @@
+@@ -87811,12 +38671,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92341,13 +93680,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -86939,16 +37815,16 @@
+@@ -87827,7 +38685,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_streams_xattr_init();"
+@@ -87836,16 +38694,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_streams_xattr"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92361,7 +93709,7 @@
  $as_echo_n "checking how to build vfs_streams_depot... " >&6; }
  	if test "$MODULE_vfs_streams_depot"; then
  		DEST=$MODULE_vfs_streams_depot
-@@ -86960,12 +37836,10 @@
+@@ -87857,12 +38715,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92376,13 +93724,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -86976,16 +37850,16 @@
+@@ -87873,7 +38729,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_streams_depot_init();"
+@@ -87882,16 +38738,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_streams_depot"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92396,7 +93753,7 @@
  $as_echo_n "checking how to build vfs_cacheprime... " >&6; }
  	if test "$MODULE_vfs_cacheprime"; then
  		DEST=$MODULE_vfs_cacheprime
-@@ -86997,12 +37871,10 @@
+@@ -87903,12 +38759,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92411,13 +93768,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -87013,16 +37885,16 @@
+@@ -87919,7 +38773,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_cacheprime_init();"
+@@ -87928,16 +38782,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_cacheprime"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92431,7 +93797,7 @@
  $as_echo_n "checking how to build vfs_prealloc... " >&6; }
  	if test "$MODULE_vfs_prealloc"; then
  		DEST=$MODULE_vfs_prealloc
-@@ -87034,12 +37906,10 @@
+@@ -87949,12 +38803,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92446,13 +93812,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -87050,16 +37920,16 @@
+@@ -87965,7 +38817,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_prealloc_init();"
+@@ -87974,16 +38826,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_prealloc"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92466,7 +93841,7 @@
  $as_echo_n "checking how to build vfs_commit... " >&6; }
  	if test "$MODULE_vfs_commit"; then
  		DEST=$MODULE_vfs_commit
-@@ -87071,12 +37941,10 @@
+@@ -87995,12 +38847,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92481,13 +93856,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_commit"
-@@ -87087,16 +37955,16 @@
+@@ -88011,7 +38861,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_commit_init();"
+@@ -88020,16 +38870,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_commit"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92501,7 +93885,7 @@
  $as_echo_n "checking how to build vfs_gpfs... " >&6; }
  	if test "$MODULE_vfs_gpfs"; then
  		DEST=$MODULE_vfs_gpfs
-@@ -87108,12 +37976,10 @@
+@@ -88041,12 +38891,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92516,13 +93900,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -87124,16 +37990,16 @@
+@@ -88057,7 +38905,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_gpfs_init();"
+@@ -88066,16 +38914,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_gpfs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92536,7 +93929,7 @@
  $as_echo_n "checking how to build vfs_readahead... " >&6; }
  	if test "$MODULE_vfs_readahead"; then
  		DEST=$MODULE_vfs_readahead
-@@ -87145,12 +38011,10 @@
+@@ -88087,12 +38935,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92551,13 +93944,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -87161,16 +38025,16 @@
+@@ -88103,7 +38949,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_readahead_init();"
+@@ -88112,16 +38958,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_readahead"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92571,7 +93973,7 @@
  $as_echo_n "checking how to build vfs_tsmsm... " >&6; }
  	if test "$MODULE_vfs_tsmsm"; then
  		DEST=$MODULE_vfs_tsmsm
-@@ -87182,12 +38046,10 @@
+@@ -88133,12 +38979,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92586,13 +93988,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -87198,16 +38060,16 @@
+@@ -88149,7 +38993,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_tsmsm_init();"
+@@ -88158,16 +39002,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_tsmsm"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92606,7 +94017,7 @@
  $as_echo_n "checking how to build vfs_fileid... " >&6; }
  	if test "$MODULE_vfs_fileid"; then
  		DEST=$MODULE_vfs_fileid
-@@ -87219,12 +38081,10 @@
+@@ -88179,12 +39023,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92621,13 +94032,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -87235,16 +38095,16 @@
+@@ -88195,7 +39037,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_fileid_init();"
+@@ -88204,16 +39046,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_fileid"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92641,7 +94061,7 @@
  $as_echo_n "checking how to build vfs_aio_fork... " >&6; }
  	if test "$MODULE_vfs_aio_fork"; then
  		DEST=$MODULE_vfs_aio_fork
-@@ -87256,12 +38116,10 @@
+@@ -88225,12 +39067,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92656,13 +94076,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -87272,16 +38130,16 @@
+@@ -88241,7 +39081,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_aio_fork_init();"
+@@ -88250,16 +39090,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_aio_fork"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92676,7 +94105,7 @@
  $as_echo_n "checking how to build vfs_preopen... " >&6; }
  	if test "$MODULE_vfs_preopen"; then
  		DEST=$MODULE_vfs_preopen
-@@ -87293,12 +38151,10 @@
+@@ -88271,12 +39111,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92691,13 +94120,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -87309,16 +38165,16 @@
+@@ -88287,7 +39125,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_preopen_init();"
+@@ -88296,16 +39134,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_preopen"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92711,7 +94149,7 @@
  $as_echo_n "checking how to build vfs_syncops... " >&6; }
  	if test "$MODULE_vfs_syncops"; then
  		DEST=$MODULE_vfs_syncops
-@@ -87330,12 +38186,10 @@
+@@ -88317,12 +39155,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92726,13 +94164,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -87346,16 +38200,16 @@
+@@ -88333,7 +39169,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_syncops_init();"
+@@ -88342,16 +39178,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_syncops"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92746,7 +94193,7 @@
  $as_echo_n "checking how to build vfs_zfsacl... " >&6; }
  	if test "$MODULE_vfs_zfsacl"; then
  		DEST=$MODULE_vfs_zfsacl
-@@ -87367,12 +38221,10 @@
+@@ -88363,12 +39199,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92761,13 +94208,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -87383,16 +38235,16 @@
+@@ -88379,7 +39213,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_zfsacl_init();"
+@@ -88388,16 +39222,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_zfsacl"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92781,7 +94237,7 @@
  $as_echo_n "checking how to build vfs_notify_fam... " >&6; }
  	if test "$MODULE_vfs_notify_fam"; then
  		DEST=$MODULE_vfs_notify_fam
-@@ -87404,12 +38256,10 @@
+@@ -88409,12 +39243,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92796,13 +94252,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -87420,16 +38270,16 @@
+@@ -88425,7 +39257,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_notify_fam_init();"
+@@ -88434,16 +39266,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_notify_fam"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92816,7 +94281,7 @@
  $as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
  	if test "$MODULE_vfs_acl_xattr"; then
  		DEST=$MODULE_vfs_acl_xattr
-@@ -87441,12 +38291,10 @@
+@@ -88455,12 +39287,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92831,13 +94296,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -87457,16 +38305,16 @@
+@@ -88471,7 +39301,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_acl_xattr_init();"
+@@ -88480,16 +39310,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_acl_xattr"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92851,7 +94325,7 @@
  $as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
  	if test "$MODULE_vfs_acl_tdb"; then
  		DEST=$MODULE_vfs_acl_tdb
-@@ -87478,12 +38326,10 @@
+@@ -88501,12 +39331,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92866,13 +94340,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -87494,16 +38340,16 @@
+@@ -88517,7 +39345,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_acl_tdb_init();"
+@@ -88526,16 +39354,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_acl_tdb"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92886,7 +94369,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
-@@ -87515,12 +38361,10 @@
+@@ -88547,12 +39375,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92901,13 +94384,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -87531,16 +38375,16 @@
+@@ -88563,7 +39389,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_smb_traffic_analyzer_init();"
+@@ -88572,16 +39398,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_smb_traffic_analyzer"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92921,7 +94413,7 @@
  $as_echo_n "checking how to build vfs_onefs... " >&6; }
  	if test "$MODULE_vfs_onefs"; then
  		DEST=$MODULE_vfs_onefs
-@@ -87552,12 +38396,10 @@
+@@ -88593,12 +39419,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92936,13 +94428,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -87568,16 +38410,16 @@
+@@ -88609,7 +39433,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_onefs_init();"
+@@ -88618,16 +39442,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_onefs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92956,7 +94457,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
-@@ -87589,12 +38431,10 @@
+@@ -88639,12 +39463,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92971,13 +94472,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -87605,16 +38445,16 @@
+@@ -88655,7 +39477,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_onefs_shadow_copy_init();"
+@@ -88664,16 +39486,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_onefs_shadow_copy"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -92991,7 +94501,7 @@
  $as_echo_n "checking how to build vfs_dirsort... " >&6; }
  	if test "$MODULE_vfs_dirsort"; then
  		DEST=$MODULE_vfs_dirsort
-@@ -87626,12 +38466,10 @@
+@@ -88685,12 +39507,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93006,13 +94516,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -87642,16 +38480,16 @@
+@@ -88701,7 +39521,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_dirsort_init();"
+@@ -88710,16 +39530,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_dirsort"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93026,7 +94545,7 @@
  $as_echo_n "checking how to build vfs_scannedonly... " >&6; }
  	if test "$MODULE_vfs_scannedonly"; then
  		DEST=$MODULE_vfs_scannedonly
-@@ -87663,12 +38501,10 @@
+@@ -88731,12 +39551,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93041,13 +94560,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_scannedonly"
-@@ -87679,11 +38515,11 @@
+@@ -88747,7 +39565,7 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_scannedonly_init();"
+@@ -88756,16 +39574,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules vfs_scannedonly"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93055,16 +94583,104 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87705,7 +38541,7 @@
  
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_crossrename" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build vfs_crossrename" >&5
+ $as_echo_n "checking how to build vfs_crossrename... " >&6; }
+ 	if test "$MODULE_vfs_crossrename"; then
+ 		DEST=$MODULE_vfs_crossrename
+@@ -88777,12 +39595,10 @@
  
+ 	if test x"$DEST" = xSHARED; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define vfs_crossrename_init init_samba_module
+-_ACEOF
++$as_echo "#define vfs_crossrename_init init_samba_module" >>confdefs.h
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/crossrename.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+ $as_echo "shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_crossrename"
+@@ -88793,7 +39609,7 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CROSSRENAME_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_crossrename_init();"
+@@ -88802,16 +39618,16 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_CROSSRENAME_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_crossrename"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not" >&5
+ $as_echo "not" >&6; }
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_linux_xfs_sgid" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build vfs_linux_xfs_sgid" >&5
+ $as_echo_n "checking how to build vfs_linux_xfs_sgid... " >&6; }
+ 	if test "$MODULE_vfs_linux_xfs_sgid"; then
+ 		DEST=$MODULE_vfs_linux_xfs_sgid
+@@ -88823,12 +39639,10 @@
+ 
+ 	if test x"$DEST" = xSHARED; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define vfs_linux_xfs_sgid_init init_samba_module
+-_ACEOF
++$as_echo "#define vfs_linux_xfs_sgid_init init_samba_module" >>confdefs.h
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/linux_xfs_sgid.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+ $as_echo "shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_linux_xfs_sgid"
+@@ -88839,7 +39653,7 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_LINUX_XFS_SGID_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_vfs="$init_static_modules_vfs  vfs_linux_xfs_sgid_init();"
+@@ -88848,11 +39662,11 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_LINUX_XFS_SGID_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_linux_xfs_sgid"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not" >&5
+ $as_echo "not" >&6; }
+ 	fi
+ 
+@@ -88874,7 +39688,7 @@
+ 
+ 
+ 
 -	{ $as_echo "$as_me:$LINENO: checking how to build perfcount_onefs" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build perfcount_onefs" >&5
  $as_echo_n "checking how to build perfcount_onefs... " >&6; }
  	if test "$MODULE_perfcount_onefs"; then
  		DEST=$MODULE_perfcount_onefs
-@@ -87717,12 +38553,10 @@
+@@ -88886,12 +39700,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93079,13 +94695,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -87733,16 +38567,16 @@
+@@ -88902,7 +39714,7 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_perfcount="$init_static_modules_perfcount  perfcount_onefs_init();"
+@@ -88911,16 +39723,16 @@
+ 		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules perfcount_onefs"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93099,7 +94724,7 @@
  $as_echo_n "checking how to build perfcount_test... " >&6; }
  	if test "$MODULE_perfcount_test"; then
  		DEST=$MODULE_perfcount_test
-@@ -87754,12 +38588,10 @@
+@@ -88932,12 +39744,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93114,13 +94739,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_test"
-@@ -87770,11 +38602,11 @@
+@@ -88948,7 +39758,7 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_perfcount="$init_static_modules_perfcount  perfcount_test_init();"
+@@ -88957,11 +39767,11 @@
+ 		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules perfcount_test"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93128,7 +94762,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87795,7 +38627,7 @@
+@@ -88982,7 +39792,7 @@
  
  
  
@@ -93137,7 +94771,7 @@
  $as_echo_n "checking how to build gpext_registry... " >&6; }
  	if test "$MODULE_gpext_registry"; then
  		DEST=$MODULE_gpext_registry
-@@ -87807,12 +38639,10 @@
+@@ -88994,12 +39804,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93152,13 +94786,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_registry"
-@@ -87823,16 +38653,16 @@
+@@ -89010,7 +39818,7 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_gpext="$init_static_modules_gpext  gpext_registry_init();"
+@@ -89019,16 +39827,16 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules gpext_registry"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93172,7 +94815,7 @@
  $as_echo_n "checking how to build gpext_scripts... " >&6; }
  	if test "$MODULE_gpext_scripts"; then
  		DEST=$MODULE_gpext_scripts
-@@ -87844,12 +38674,10 @@
+@@ -89040,12 +39848,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93187,13 +94830,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -87860,16 +38688,16 @@
+@@ -89056,7 +39862,7 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_gpext="$init_static_modules_gpext  gpext_scripts_init();"
+@@ -89065,16 +39871,16 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules gpext_scripts"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93207,7 +94859,7 @@
  $as_echo_n "checking how to build gpext_security... " >&6; }
  	if test "$MODULE_gpext_security"; then
  		DEST=$MODULE_gpext_security
-@@ -87881,12 +38709,10 @@
+@@ -89086,12 +39892,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -93222,13 +94874,22 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_security"
-@@ -87897,11 +38723,11 @@
+@@ -89102,7 +39906,7 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
  
  
 -		{ $as_echo "$as_me:$LINENO: result: static" >&5
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
  $as_echo "static" >&6; }
+ 	elif test x"$DEST" = xSTATIC; then
+ 		init_static_modules_gpext="$init_static_modules_gpext  gpext_security_init();"
+@@ -89111,11 +39915,11 @@
+ 		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
  	else
  	    string_ignored_modules="$string_ignored_modules gpext_security"
 -		{ $as_echo "$as_me:$LINENO: result: not" >&5
@@ -93236,7 +94897,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87937,18 +38763,16 @@
+@@ -89151,18 +39955,16 @@
  #################################################
  # If run from the build farm, enable NASTY hacks
  #################################################
@@ -93259,7 +94920,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87965,11 +38789,11 @@
+@@ -89179,11 +39981,11 @@
      rt_signal_lease_works=yes
      rt_signal_aio_works=yes
  
@@ -93274,7 +94935,7 @@
  $as_echo "cross" >&6; }
  
  	    # cross compiling, I hope you know what you are doing
-@@ -87977,11 +38801,7 @@
+@@ -89191,11 +39993,7 @@
  
  
  else
@@ -93287,7 +94948,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -88040,41 +38860,16 @@
+@@ -89254,41 +40052,16 @@
  }
  
  _ACEOF
@@ -93333,7 +94994,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -88085,61 +38880,31 @@
+@@ -89299,61 +40072,31 @@
    return 0;
  }
  _ACEOF
@@ -93402,7 +95063,7 @@
  $as_echo "no" >&6; }
  	    case "$ac_status" in
  		1|11|101|111)  rt_signal_lease_ok=no ;;
-@@ -88153,13 +38918,9 @@
+@@ -89367,13 +40110,9 @@
  
  	    # no RT_SIGNAL bug, we are golden
  
@@ -93418,7 +95079,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -88170,65 +38931,39 @@
+@@ -89384,65 +40123,39 @@
    return 0;
  }
  _ACEOF
@@ -93493,7 +95154,7 @@
    enableval=$enable_merged_build;  enable_merged_build=$enableval
  else
     enable_merged_build=auto
-@@ -88237,9 +38972,7 @@
+@@ -89451,9 +40164,7 @@
  
  if test x"$enable_merged_build" = x"yes" -a \
  	x"$merged_build_possible" = x"no" ; then
@@ -93504,7 +95165,7 @@
  fi
  
  
-@@ -88262,9 +38995,9 @@
+@@ -89476,9 +40187,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
@@ -93516,7 +95177,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -88277,14 +39010,14 @@
+@@ -89491,14 +40202,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93534,7 +95195,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88292,10 +39025,10 @@
+@@ -89506,10 +40217,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93547,7 +95208,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88306,9 +39039,9 @@
+@@ -89520,9 +40231,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
@@ -93559,7 +95220,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -88321,14 +39054,14 @@
+@@ -89535,14 +40246,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93577,7 +95238,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88336,10 +39069,10 @@
+@@ -89550,10 +40261,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93590,7 +95251,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88347,7 +39080,7 @@
+@@ -89561,7 +40272,7 @@
  	fi
  	if test -z "$PYTHON"; then
  		working_python=no
@@ -93599,7 +95260,7 @@
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -88358,9 +39091,9 @@
+@@ -89572,9 +40283,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
@@ -93611,7 +95272,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88373,14 +39106,14 @@
+@@ -89587,14 +40298,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93629,7 +95290,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88388,10 +39121,10 @@
+@@ -89602,10 +40313,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93642,7 +95303,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88402,9 +39135,9 @@
+@@ -89616,9 +40327,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
@@ -93654,7 +95315,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88417,14 +39150,14 @@
+@@ -89631,14 +40342,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93672,7 +95333,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88432,10 +39165,10 @@
+@@ -89646,10 +40357,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93685,7 +95346,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88443,7 +39176,7 @@
+@@ -89657,7 +40368,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -93694,7 +95355,7 @@
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -88453,11 +39186,7 @@
+@@ -89667,11 +40378,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93707,7 +95368,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88474,42 +39203,15 @@
+@@ -89688,42 +40395,15 @@
    return 0;
  }
  _ACEOF
@@ -93753,7 +95414,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88521,11 +39223,7 @@
+@@ -89735,11 +40415,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93766,7 +95427,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88542,42 +39240,15 @@
+@@ -89756,42 +40432,15 @@
    return 0;
  }
  _ACEOF
@@ -93812,7 +95473,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88592,11 +39263,7 @@
+@@ -89806,11 +40455,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93825,7 +95486,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88613,42 +39280,15 @@
+@@ -89827,42 +40472,15 @@
    return 0;
  }
  _ACEOF
@@ -93871,7 +95532,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88660,11 +39300,7 @@
+@@ -89874,11 +40492,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93884,7 +95545,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88681,42 +39317,15 @@
+@@ -89895,42 +40509,15 @@
    return 0;
  }
  _ACEOF
@@ -93930,7 +95591,18 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88746,11 +39355,7 @@
+@@ -89942,9 +40529,7 @@
+ 	then
+ 		if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"`
+ 		then
+-			{ { $as_echo "$as_me:$LINENO: error: Python ($PYTHON) is too old. At least version 2.4 is required" >&5
+-$as_echo "$as_me: error: Python ($PYTHON) is too old. At least version 2.4 is required" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "Python ($PYTHON) is too old. At least version 2.4 is required" "$LINENO" 5
+ 		fi
+ 
+ 		DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \
+@@ -89967,11 +40552,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -93943,7 +95615,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88767,64 +39372,37 @@
+@@ -89988,64 +40569,37 @@
    return 0;
  }
  _ACEOF
@@ -94016,9368 +95688,11 @@
  $as_echo "$merged_build_possible" >&6; }
  
  	# Enable merged build automatically if possible, when in developer mode
-@@ -88880,9 +39458,9 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
-+if test "${ac_cv_path_PYTHON+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PYTHON in
-@@ -88895,14 +39473,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
+@@ -90071,151 +40625,12 @@
  
-   ;;
-@@ -88910,10 +39488,10 @@
- fi
- PYTHON=$ac_cv_path_PYTHON
- if test -n "$PYTHON"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
- $as_echo "$PYTHON" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
  
-@@ -88924,9 +39502,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
-+if test "${ac_cv_path_PYTHON+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PYTHON in
-@@ -88939,14 +39517,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
  
-   ;;
-@@ -88954,10 +39532,10 @@
- fi
- PYTHON=$ac_cv_path_PYTHON
- if test -n "$PYTHON"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
- $as_echo "$PYTHON" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -88965,7 +39543,7 @@
- 	fi
- 	if test -z "$PYTHON"; then
- 		working_python=no
--		{ $as_echo "$as_me:$LINENO: WARNING: No python found" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No python found" >&5
- $as_echo "$as_me: WARNING: No python found" >&2;}
- 	fi
- 
-@@ -88976,9 +39554,9 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PYTHON_CONFIG in
-@@ -88991,14 +39569,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -89006,10 +39584,10 @@
- fi
- PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
- if test -n "$PYTHON_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CONFIG" >&5
- $as_echo "$PYTHON_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -89020,9 +39598,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PYTHON_CONFIG in
-@@ -89035,14 +39613,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -89050,10 +39628,10 @@
- fi
- PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
- if test -n "$PYTHON_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CONFIG" >&5
- $as_echo "$PYTHON_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -89061,7 +39639,7 @@
- 	fi
- 
- 	if test -z "$PYTHON_CONFIG"; then
--		{ $as_echo "$as_me:$LINENO: WARNING: No python-config found" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No python-config found" >&5
- $as_echo "$as_me: WARNING: No python-config found" >&2;}
- 	else
- 
-@@ -89071,11 +39649,7 @@
- 		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
- 		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
- 
--		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.  */
- 
-                                 #undef HAVE_UINTPTR_T
-@@ -89092,42 +39666,15 @@
-   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 :
- 
- 				PYTHON_LDFLAGS="`$PYTHON_CONFIG --ldflags`"
- 				PYTHON_CFLAGS="`$PYTHON_CONFIG --includes`"
- 				working_python=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$ac_save_LIBS"
- 		CFLAGS="$ac_save_CFLAGS"
- 	fi
-@@ -89139,11 +39686,7 @@
- 		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
- 		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
- 
--		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.  */
- 
-                                 #undef HAVE_UINTPTR_T
-@@ -89160,42 +39703,15 @@
-   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 :
- 
- 				PYTHON_LDFLAGS="`$PYTHON_CONFIG --ldflags`"
- 				PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`"
- 				working_python=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$ac_save_LIBS"
- 		CFLAGS="$ac_save_CFLAGS"
- 	fi
-@@ -89210,11 +39726,7 @@
- 		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
- 		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
- 
--		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.  */
- 
-                                 #undef HAVE_UINTPTR_T
-@@ -89231,42 +39743,15 @@
-   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 :
- 
- 				PYTHON_LDFLAGS="`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
- 				PYTHON_CFLAGS="`$PYTHON_CONFIG --includes`"
- 				working_python=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$ac_save_LIBS"
- 		CFLAGS="$ac_save_CFLAGS"
- 	fi
-@@ -89278,11 +39763,7 @@
- 		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
- 		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
- 
--		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.  */
- 
-                                 #undef HAVE_UINTPTR_T
-@@ -89299,42 +39780,15 @@
-   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 :
- 
- 				PYTHON_LDFLAGS="`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
- 				PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`"
- 				working_python=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$ac_save_LIBS"
- 		CFLAGS="$ac_save_CFLAGS"
- 	fi
-@@ -89364,11 +39818,7 @@
- 		LIBS="$LIBS $DISTUTILS_LDFLAGS"
- 		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
- 
--		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.  */
- 
-                                 #undef HAVE_UINTPTR_T
-@@ -89385,52 +39835,25 @@
-   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 :
- 
- 				PYTHON_LDFLAGS="$DISTUTILS_LDFLAGS"
- 				PYTHON_CFLAGS="$DISTUTILS_CFLAGS"
- 				working_python=yes
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$ac_save_LIBS"
- 		CFLAGS="$ac_save_CFLAGS"
- 	fi
- 
- 	fi
- 
--	{ $as_echo "$as_me:$LINENO: checking working python module support" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working python module support" >&5
- $as_echo_n "checking working python module support... " >&6; }
- 	if test $working_python = yes; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 
-@@ -89458,20 +39881,18 @@
- 
- 
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
--{ { $as_echo "$as_me:$LINENO: error: Python not found. Please install Python 2.x and its development headers/libraries." >&5
--$as_echo "$as_me: error: Python not found. Please install Python 2.x and its development headers/libraries." >&2;}
--   { (exit 1); exit 1; }; }
-+as_fn_error "Python not found. Please install Python 2.x and its development headers/libraries." "$LINENO" 5
- 
- 	fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking python library directory" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python library directory" >&5
- $as_echo_n "checking python library directory... " >&6; }
- pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
--{ $as_echo "$as_me:$LINENO: result: $pythondir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythondir" >&5
- $as_echo "$pythondir" >&6; }
- 
- 
-@@ -89486,553 +39907,133 @@
- 
- 
- 
--	MAKE_SETTINGS="$MAKE_SETTINGS
--LIBREPLACE_EXT_ENABLE =
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
--
--
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
--LIBREPLACE_NETWORK_CFLAGS =
--LIBREPLACE_NETWORK_CPPFLAGS =
--LIBREPLACE_NETWORK_LDFLAGS =
--"
--
--
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--LIBREPLACE_NETWORK_ENABLE =
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
--
--
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--LIBREPLACE_CFLAGS = -I../lib/replace
--LIBREPLACE_ENABLE = YES
--LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
--"
--
--SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
--###################################
--# Start Subsystem LIBREPLACE
--[SUBSYSTEM::LIBREPLACE]
--PRIVATE_DEPENDENCIES = LIBREPLACE_EXT LIBREPLACE_NETWORK
--CFLAGS = \$(LIBREPLACE_CFLAGS)
--ENABLE = YES
--# End Subsystem LIBREPLACE
--###################################
--"
--
--
--LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
--
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--LIBREPLACE_HOSTCC_CFLAGS = -I../lib/replace
--LIBREPLACE_HOSTCC_ENABLE = YES
--LIBREPLACE_HOSTCC_OBJ_FILES = ${LIBREPLACE_HOSTCC_OBJS}
--"
--
--SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
--###################################
--# Start Subsystem LIBREPLACE_HOSTCC
--[SUBSYSTEM::LIBREPLACE_HOSTCC]
--PRIVATE_DEPENDENCIES =
--CFLAGS = \$(LIBREPLACE_HOSTCC_CFLAGS)
--ENABLE = YES
--# End Subsystem LIBREPLACE_HOSTCC
--###################################
--"
--
--
--###############################################
--# Readline included by default unless explicitly asked not to
--test "${with_readline+set}" != "set" && with_readline=yes
--
--EXTERNAL_READLINE=no
--# 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; }
--
--# 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 readline.h history.h readline/readline.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; }
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_EXT_ENABLE =
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
- 
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
- 
--fi
- 
--done
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
-+LIBREPLACE_NETWORK_CFLAGS =
-+LIBREPLACE_NETWORK_CPPFLAGS =
-+LIBREPLACE_NETWORK_LDFLAGS =
-+"
- 
- 
--for ac_header in readline/history.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
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_NETWORK_ENABLE =
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
- 
--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
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_CFLAGS = -I../lib/replace
-+LIBREPLACE_ENABLE = YES
-+LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
-+"
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
-+###################################
-+# Start Subsystem LIBREPLACE
-+[SUBSYSTEM::LIBREPLACE]
-+PRIVATE_DEPENDENCIES = LIBREPLACE_EXT LIBREPLACE_NETWORK
-+CFLAGS = \$(LIBREPLACE_CFLAGS)
-+ENABLE = YES
-+# End Subsystem LIBREPLACE
-+###################################
-+"
- 
--# 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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
- 
--fi
- 
--done
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_HOSTCC_CFLAGS = -I../lib/replace
-+LIBREPLACE_HOSTCC_ENABLE = YES
-+LIBREPLACE_HOSTCC_OBJ_FILES = ${LIBREPLACE_HOSTCC_OBJS}
-+"
- 
-+SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
-+###################################
-+# Start Subsystem LIBREPLACE_HOSTCC
-+[SUBSYSTEM::LIBREPLACE_HOSTCC]
-+PRIVATE_DEPENDENCIES =
-+CFLAGS = \$(LIBREPLACE_HOSTCC_CFLAGS)
-+ENABLE = YES
-+# End Subsystem LIBREPLACE_HOSTCC
-+###################################
-+"
- 
- 
-+###############################################
-+# Readline included by default unless explicitly asked not to
-+test "${with_readline+set}" != "set" && with_readline=yes
- 
--for ac_header in readline.h readline/readline.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>
-+EXTERNAL_READLINE=no
-+# test for where we get readline() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
-+$as_echo_n "checking whether to use readline... " >&6; }
-+
-+# Check whether --with-readline was given.
-+if test "${with_readline+set}" = set; then :
-+  withval=$with_readline;   case "$with_readline" in
-+  yes)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+    for ac_header in readline.h history.h readline/readline.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) 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; }
-+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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
-+    for ac_header in readline/history.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
-+if test "x$ac_cv_header_readline_history_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_READLINE_HISTORY_H 1
- _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; }
-+done
- 
--# 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 readline.h readline/readline.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 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 "$as_me:${as_lineno-$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
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l${termlib}  $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.
-@@ -90050,63 +40051,32 @@
-   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 :
-   eval "$as_ac_Lib=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Lib=no"
-+  eval "$as_ac_Lib=no"
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+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_Lib'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Lib
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Lib'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Lib
-+   if test "x$as_val" = x""yes; then :
-   TERMLIBS="-l${termlib}"; break
- fi
- 
-       done
--      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-+      { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $TERMLIBS $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.
-@@ -90124,43 +40094,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_readline_rl_callback_handler_install=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_readline_rl_callback_handler_install=no
-+  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
-+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_readline_rl_callback_handler_install" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
- $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
--if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
-+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
-   TERMLIBS="-lreadline $TERMLIBS"
-        EXTERNAL_READLINE=yes
-        break
-@@ -90174,11 +40119,11 @@
- 
-     ;;
-   no)
--    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     ;;
-   *)
--    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
-     # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -90190,151 +40135,12 @@
-     LDFLAGS="-L$with_readline/lib $LDFLAGS"
-     CPPFLAGS="-I$with_readline/include $CPPFLAGS"
- 
--
--
--
--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`
--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 readline.h history.h readline/readline.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
-@@ -90343,151 +40149,12 @@
- 
- done
- 
--
--for ac_header in readline/history.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 readline/history.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
-+if test "x$ac_cv_header_readline_history_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_READLINE_HISTORY_H 1
- _ACEOF
- 
- fi
-@@ -90495,168 +40162,26 @@
- done
- 
- 
--
--
--for ac_header in readline.h readline/readline.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 readline.h readline/readline.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 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 "$as_me:${as_lineno-$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
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l${termlib}  $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.
-@@ -90674,63 +40199,32 @@
-   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 :
-   eval "$as_ac_Lib=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Lib=no"
-+  eval "$as_ac_Lib=no"
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+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_Lib'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Lib
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Lib'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Lib
-+   if test "x$as_val" = x""yes; then :
-   TERMLIBS="-l${termlib}"; break
- fi
- 
-       done
--      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-+      { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $TERMLIBS $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.
-@@ -90748,43 +40242,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_readline_rl_callback_handler_install=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_readline_rl_callback_handler_install=no
-+  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
-+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_readline_rl_callback_handler_install" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
- $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
--if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
-+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
-   TERMLDFLAGS="-L$with_readline/lib"
-        TERMCPPFLAGS="-I$with_readline/include"
-        LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -90804,7 +40273,7 @@
-     ;;
-   esac
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
- fi
-@@ -90813,18 +40282,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.
--{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $TERMLIBS $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.
-@@ -90837,142 +40302,53 @@
- int
- main ()
- {
--return rl_completion_matches ();
--  ;
--  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_lib_readline_rl_completion_matches=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_readline_rl_completion_matches=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
--$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
--if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
--
--fi
--
--
--# 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_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 <stdio.h>
--    #include <readline/readline.h>
--
--
--int
--main ()
--{
--#ifndef rl_event_hook
--  (void) rl_event_hook;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_rl_event_hook=yes
-+return rl_completion_matches ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_readline_rl_completion_matches=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_rl_event_hook=no
-+  ac_cv_lib_readline_rl_completion_matches=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
-+LIBS=$ac_check_lib_save_LIBS
- 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_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 :
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 1
--_ACEOF
-+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
- 
-+fi
- 
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 0
--_ACEOF
- 
-+# not all readline libs have rl_event_hook or history_list
-+ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "
-+    #include <stdio.h>
-+    #include <readline/readline.h>
- 
-+"
-+if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
- fi
- 
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
-+_ACEOF
- 
--{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
-+{ $as_echo "$as_me:${as_lineno-$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 "${ac_cv_lib_readline_history_list+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $TERMLIBS $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.
-@@ -90990,60 +40366,31 @@
-   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_readline_history_list=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_readline_history_list=no
-+  ac_cv_lib_readline_history_list=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+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_readline_history_list" >&5
-+{ $as_echo "$as_me:${as_lineno-$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
-+if test "x$ac_cv_lib_readline_history_list" = x""yes; then :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_HISTORY_LIST 1
--_ACEOF
-+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
- 
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to use extern readline" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use extern readline" >&5
- $as_echo_n "checking whether to use extern readline... " >&6; }
- if test x"$EXTERNAL_READLINE" = x"yes"; then
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBREADLINE 1
--_ACEOF
-+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
- 
- 
- MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -91098,7 +40445,7 @@
- ###################################
- "
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -91107,102 +40454,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for u_char" >&5
--$as_echo_n "checking for u_char... " >&6; }
--if test "${ac_cv_type_u_char+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_type_u_char=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (u_char))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((u_char)))
--	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_u_char=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
-+ac_fn_c_check_type "$LINENO" "u_char" "ac_cv_type_u_char" "$ac_includes_default"
-+if test "x$ac_cv_type_u_char" = x""yes; then :
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_char" >&5
--$as_echo "$ac_cv_type_u_char" >&6; }
--if test "x$ac_cv_type_u_char" = x""yes; then
--  :
- else
- 
- cat >>confdefs.h <<_ACEOF
-@@ -91211,102 +40465,9 @@
- 
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
--$as_echo_n "checking for u_int32_t... " >&6; }
--if test "${ac_cv_type_u_int32_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_type_u_int32_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (u_int32_t))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((u_int32_t)))
--	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_u_int32_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_u_int32_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_u_int32_t" >&5
--$as_echo "$ac_cv_type_u_int32_t" >&6; }
--if test "x$ac_cv_type_u_int32_t" = x""yes; then
--  :
- else
- 
- cat >>confdefs.h <<_ACEOF
-@@ -91316,151 +40477,12 @@
- fi
- 
- 
--
- for ac_header in err.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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "err.h" "ac_cv_header_err_h" "$ac_includes_default"
-+if test "x$ac_cv_header_err_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_ERR_H 1
- _ACEOF
- 
- else
-@@ -91470,151 +40492,12 @@
- done
- 
- 
--
- for ac_header in ifaddrs.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
-+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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_IFADDRS_H 1
- _ACEOF
- 
- else
-@@ -91624,29 +40507,6 @@
- done
- 
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- for ac_header in 				\
- 	crypt.h					\
- 	curses.h				\
-@@ -91672,147 +40532,11 @@
- 	netinet6/in6.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
--  { $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
-+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
-@@ -91822,42 +40546,6 @@
- done
- 
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- for ac_func in 				\
- 	atexit					\
- 	cgetent					\
-@@ -91890,271 +40578,65 @@
- 	warn					\
- 	errx					\
- 	warnx					\
--	flock					\
--	getipnodebyname				\
--	getipnodebyaddr				\
--	freehostent				\
--	writev
--
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--
--
--{ $as_echo "$as_me:$LINENO: checking for bswap16" >&5
--$as_echo_n "checking for bswap16... " >&6; }
--if test "${ac_cv_love_func_bswap16+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifdef HAVE_SYS_BSWAP_H
--#include <sys/bswap.h>
--#endif
--int
--main ()
--{
--bswap16(0)
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "ac_cv_love_func_bswap16=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+	flock					\
-+	getipnodebyname				\
-+	getipnodebyaddr				\
-+	freehostent				\
-+	writev
- 
--	eval "ac_cv_love_func_bswap16=no"
--fi
-+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 \
--      conftest$ac_exeext conftest.$ac_ext
- fi
-+done
- 
- 
--eval "ac_res=\$ac_cv_love_func_bswap16"
- 
--if false; then
- 
--for ac_func in bswap16
--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 bswap16" >&5
-+$as_echo_n "checking for bswap16... " >&6; }
-+if test "${ac_cv_love_func_bswap16+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
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef HAVE_SYS_BSWAP_H
-+#include <sys/bswap.h>
- #endif
--
- int
- main ()
- {
--return $ac_func ();
-+bswap16(0)
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "ac_cv_love_func_bswap16=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  eval "ac_cv_love_func_bswap16=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
--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
-+
-+
-+eval "ac_res=\$ac_cv_love_func_bswap16"
-+
-+if false; then
-+	for ac_func in bswap16
-+do :
-+  ac_fn_c_check_func "$LINENO" "bswap16" "ac_cv_func_bswap16"
-+if test "x$ac_cv_func_bswap16" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BSWAP16 1
- _ACEOF
- 
- fi
-@@ -92170,11 +40652,11 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- esac
-@@ -92184,17 +40666,13 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for bswap32" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32" >&5
- $as_echo_n "checking for bswap32... " >&6; }
--if test "${ac_cv_love_func_bswap32+set}" = set; then
-+if test "${ac_cv_love_func_bswap32+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.  */
- #ifdef HAVE_SYS_BSWAP_H
- #include <sys/bswap.h>
-@@ -92207,140 +40685,25 @@
-   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 :
-   eval "ac_cv_love_func_bswap32=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "ac_cv_love_func_bswap32=no"
-+  eval "ac_cv_love_func_bswap32=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
- 
- 
- eval "ac_res=\$ac_cv_love_func_bswap32"
- 
- if false; then
--
--for ac_func in bswap32
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	for ac_func in bswap32
-+do :
-+  ac_fn_c_check_func "$LINENO" "bswap32" "ac_cv_func_bswap32"
-+if test "x$ac_cv_func_bswap32" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BSWAP32 1
- _ACEOF
- 
- fi
-@@ -92356,11 +40719,11 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- esac
-@@ -92371,25 +40734,21 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for struct winsize" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct winsize" >&5
- $as_echo_n "checking for struct winsize... " >&6; }
--if test "${ac_cv_struct_winsize+set}" = set; then
-+if test "${ac_cv_struct_winsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- ac_cv_struct_winsize=no
- for i in sys/termios.h sys/ioctl.h; do
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <$i>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "struct[ 	]*winsize" >/dev/null 2>&1; then
-+  $EGREP "struct[ 	]*winsize" >/dev/null 2>&1; then :
-   ac_cv_struct_winsize=yes; break
- fi
- rm -f conftest*
-@@ -92399,63 +40758,45 @@
- 
- if test "$ac_cv_struct_winsize" = "yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_WINSIZE 1
--_ACEOF
-+$as_echo "#define HAVE_STRUCT_WINSIZE 1" >>confdefs.h
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_winsize" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_winsize" >&5
- $as_echo "$ac_cv_struct_winsize" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <termios.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "ws_xpixel" >/dev/null 2>&1; then
-+  $EGREP "ws_xpixel" >/dev/null 2>&1; then :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_WS_XPIXEL 1
--_ACEOF
-+$as_echo "#define HAVE_WS_XPIXEL 1" >>confdefs.h
- 
- fi
- rm -f conftest*
- 
--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 <termios.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "ws_ypixel" >/dev/null 2>&1; then
-+  $EGREP "ws_ypixel" >/dev/null 2>&1; then :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_WS_YPIXEL 1
--_ACEOF
-+$as_echo "#define HAVE_WS_YPIXEL 1" >>confdefs.h
- 
- fi
- rm -f conftest*
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+{ $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
-+if test "${ac_cv_type_signal+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <signal.h>
-@@ -92468,35 +40809,14 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_type_signal=int
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_signal=void
-+  ac_cv_type_signal=void
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
- $as_echo "$ac_cv_type_signal" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
-@@ -92506,9 +40826,7 @@
- 
- if test "$ac_cv_type_signal" = "void" ; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define VOID_RETSIGTYPE 1
--_ACEOF
-+$as_echo "#define VOID_RETSIGTYPE 1" >>confdefs.h
- 
- fi
- 
-@@ -92539,18 +40857,14 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for h_errno" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for h_errno" >&5
- $as_echo_n "checking for h_errno... " >&6; }
--if test "${ac_cv_var_h_errno+set}" = set; then
-+if test "${ac_cv_var_h_errno+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.  */
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
-@@ -92567,44 +40881,15 @@
-   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_var_h_errno=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var_h_errno=no
-+  ac_cv_var_h_errno=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
- if test "$ac_cv_var_h_errno" != yes ; then
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- extern int h_errno;
- int foo(void) { return h_errno; }
-@@ -92616,44 +40901,19 @@
-   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_var_h_errno=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var_h_errno=no
-+  ac_cv_var_h_errno=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
- 
- fi
- 
- ac_foo=`eval echo \\$ac_cv_var_h_errno`
--{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
- $as_echo "$ac_foo" >&6; }
- if test "$ac_foo" = yes; then
- 
-@@ -92661,81 +40921,23 @@
- #define HAVE_H_ERRNO 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: checking whether h_errno is declared" >&5
--$as_echo_n "checking whether h_errno is declared... " >&6; }
--if test "${ac_cv_have_decl_h_errno+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifdef HAVE_SYS_TYPES_H
-+	ac_fn_c_check_decl "$LINENO" "h_errno" "ac_cv_have_decl_h_errno" "#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
--
--int
--main ()
--{
--#ifndef h_errno
--  (void) h_errno;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_h_errno=yes
-+"
-+if test "x$ac_cv_have_decl_h_errno" = x""yes; then :
-+  ac_have_decl=1
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_h_errno=no
-+  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_h_errno" >&5
--$as_echo "$ac_cv_have_decl_h_errno" >&6; }
--if test "x$ac_cv_have_decl_h_errno" = x""yes; then
--
- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_H_ERRNO 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_H_ERRNO 0
-+#define HAVE_DECL_H_ERRNO $ac_have_decl
- _ACEOF
- 
--
--fi
--
--
- fi
- 
- 
-@@ -92751,151 +40953,12 @@
- 
- 
- 
--
--
--
- for ac_header in pty.h util.h libutil.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
-+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
-@@ -92907,23 +40970,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lutil $OPENPTY_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
- $as_echo_n "checking for openpty in -lutil... " >&6; }
--if test "${ac_cv_lib_ext_util_openpty+set}" = set; then
-+if test "${ac_cv_lib_ext_util_openpty+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -92941,54 +40998,28 @@
-   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_ext_util_openpty=yes;
- 		  ac_cv_lib_ext_util=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_util_openpty=no;
-+  ac_cv_lib_ext_util_openpty=no;
- 		  ac_cv_lib_ext_util=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_lib_ext_util_openpty" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_util_openpty" >&5
- $as_echo "$ac_cv_lib_ext_util_openpty" >&6; }
--    if test $ac_cv_lib_ext_util_openpty = yes; then
-+    if test $ac_cv_lib_ext_util_openpty = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_OPENPTY 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_util = yes; then
-+if test $ac_cv_lib_ext_util = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBUTIL 1
- _ACEOF
-@@ -93005,7 +41036,6 @@
- fi
- 
- 
--
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- OPENPTY_ENABLE = YES
- "
-@@ -93025,23 +41055,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lintl $INTL_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
- $as_echo_n "checking for gettext in -lintl... " >&6; }
--if test "${ac_cv_lib_ext_intl_gettext+set}" = set; then
-+if test "${ac_cv_lib_ext_intl_gettext+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -93059,54 +41083,28 @@
-   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_ext_intl_gettext=yes;
- 		  ac_cv_lib_ext_intl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_intl_gettext=no;
-+  ac_cv_lib_ext_intl_gettext=no;
- 		  ac_cv_lib_ext_intl=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_lib_ext_intl_gettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_intl_gettext" >&5
- $as_echo "$ac_cv_lib_ext_intl_gettext" >&6; }
--    if test $ac_cv_lib_ext_intl_gettext = yes; then
-+    if test $ac_cv_lib_ext_intl_gettext = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETTEXT 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_intl = yes; then
-+if test $ac_cv_lib_ext_intl = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBINTL 1
- _ACEOF
-@@ -93123,7 +41121,6 @@
- fi
- 
- 
--
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- INTL_ENABLE = YES
- "
-@@ -93147,150 +41144,12 @@
- 
- 
- 
--
--
- for ac_header in arpa/nameser.h dns.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
-+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
-@@ -93300,22 +41159,9 @@
- done
- 
- 
--
- for ac_header in resolv.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-@@ -93326,46 +41172,10 @@
- #include <arpa/nameser.h>
- #endif
- 
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+"
-+if test "x$ac_cv_header_resolv_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_RESOLV_H 1
- _ACEOF
- 
- fi
-@@ -93377,9 +41187,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_search" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search" >&5
- $as_echo_n "checking for res_search... " >&6; }
--if test "${ac_cv_funclib_res_search+set}" = set; then
-+if test "${ac_cv_funclib_res_search+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -93394,11 +41204,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_LIBS"
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <stdio.h>
-@@ -93420,148 +41226,31 @@
- {
- res_search(0,0,0,0,0)
-   ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--	done
--	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
--	LIBS="$ac_save_LIBS"
--fi
--
--fi
--
--
--eval "ac_res=\$ac_cv_funclib_res_search"
--
--if false; then
--
--for ac_func in res_search
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	done
-+	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
-+	LIBS="$ac_save_LIBS"
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
- 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
-+
-+
-+eval "ac_res=\$ac_cv_funclib_res_search"
-+
-+if false; then
-+	for ac_func in res_search
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-+if test "x$ac_cv_func_res_search" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_SEARCH 1
- _ACEOF
- 
- fi
-@@ -93581,13 +41270,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_search=no"
- 	eval "LIB_res_search="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -93601,7 +41290,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -93616,9 +41305,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_nsearch" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch" >&5
- $as_echo_n "checking for res_nsearch... " >&6; }
--if test "${ac_cv_funclib_res_nsearch+set}" = set; then
-+if test "${ac_cv_funclib_res_nsearch+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -93633,11 +41322,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_LIBS"
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <stdio.h>
-@@ -93662,38 +41347,11 @@
-   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 :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_nsearch=$ac_lib; else ac_cv_funclib_res_nsearch=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -93705,102 +41363,12 @@
- eval "ac_res=\$ac_cv_funclib_res_nsearch"
- 
- if false; then
--
--for ac_func in res_nsearch
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	for ac_func in res_nsearch
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
-+if test "x$ac_cv_func_res_nsearch" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_NSEARCH 1
- _ACEOF
- 
- fi
-@@ -93820,13 +41388,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_nsearch=no"
- 	eval "LIB_res_nsearch="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -93840,7 +41408,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -93855,9 +41423,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_ndestroy" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5
- $as_echo_n "checking for res_ndestroy... " >&6; }
--if test "${ac_cv_funclib_res_ndestroy+set}" = set; then
-+if test "${ac_cv_funclib_res_ndestroy+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -93872,11 +41440,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_LIBS"
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <stdio.h>
-@@ -93901,38 +41465,11 @@
-   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 :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_ndestroy=$ac_lib; else ac_cv_funclib_res_ndestroy=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -93944,102 +41481,12 @@
- eval "ac_res=\$ac_cv_funclib_res_ndestroy"
- 
- if false; then
--
--for ac_func in res_ndestroy
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	for ac_func in res_ndestroy
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
-+if test "x$ac_cv_func_res_ndestroy" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_NDESTROY 1
- _ACEOF
- 
- fi
-@@ -94059,13 +41506,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_ndestroy=no"
- 	eval "LIB_res_ndestroy="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -94079,7 +41526,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -94093,9 +41540,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for dns_search" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search" >&5
- $as_echo_n "checking for dns_search... " >&6; }
--if test "${ac_cv_funclib_dns_search+set}" = set; then
-+if test "${ac_cv_funclib_dns_search+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -94110,11 +41557,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_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.  */
- 
- #ifdef HAVE_DNS_H
-@@ -94129,38 +41572,11 @@
-   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 :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dns_search=$ac_lib; else ac_cv_funclib_dns_search=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -94172,102 +41588,12 @@
- eval "ac_res=\$ac_cv_funclib_dns_search"
- 
- if false; then
--
--for ac_func in dns_search
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	for ac_func in dns_search
-+do :
-+  ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
-+if test "x$ac_cv_func_dns_search" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DNS_SEARCH 1
- _ACEOF
- 
- fi
-@@ -94287,13 +41613,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_dns_search=no"
- 	eval "LIB_dns_search="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -94307,7 +41633,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -94319,9 +41645,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for dn_expand" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand" >&5
- $as_echo_n "checking for dn_expand... " >&6; }
--if test "${ac_cv_funclib_dn_expand+set}" = set; then
-+if test "${ac_cv_funclib_dn_expand+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -94336,11 +41662,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_LIBS"
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <stdio.h>
-@@ -94365,38 +41687,11 @@
-   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 :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -94408,102 +41703,12 @@
- eval "ac_res=\$ac_cv_funclib_dn_expand"
- 
- if false; then
--
--for ac_func in dn_expand
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+	for ac_func in dn_expand
-+do :
-+  ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
-+if test "x$ac_cv_func_dn_expand" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DN_EXPAND 1
- _ACEOF
- 
- fi
-@@ -94523,13 +41728,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_dn_expand=no"
- 	eval "LIB_dn_expand="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -94543,7 +41748,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -94555,18 +41760,14 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for _res" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _res" >&5
- $as_echo_n "checking for _res... " >&6; }
--if test "${ac_cv_var__res+set}" = set; then
-+if test "${ac_cv_var__res+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 <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
-@@ -94590,44 +41791,15 @@
-   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_var__res=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var__res=no
-+  ac_cv_var__res=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
- if test "$ac_cv_var__res" != yes ; then
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- extern int _res;
- int foo(void) { return _res; }
-@@ -94639,44 +41811,19 @@
-   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_var__res=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var__res=no
-+  ac_cv_var__res=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
- 
- fi
- 
- ac_foo=`eval echo \\$ac_cv_var__res`
--{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
- $as_echo "$ac_foo" >&6; }
- if test "$ac_foo" = yes; then
- 
-@@ -94684,18 +41831,7 @@
- #define HAVE__RES 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: checking whether _res is declared" >&5
--$as_echo_n "checking whether _res is declared... " >&6; }
--if test "${ac_cv_have_decl__res+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 <stdio.h>
-+	ac_fn_c_check_decl "$LINENO" "_res" "ac_cv_have_decl__res" "#include <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-@@ -94708,64 +41844,17 @@
- #ifdef HAVE_RESOLV_H
- #include <resolv.h>
- #endif
--
--int
--main ()
--{
--#ifndef _res
--  (void) _res;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl__res=yes
-+"
-+if test "x$ac_cv_have_decl__res" = x""yes; then :
-+  ac_have_decl=1
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl__res=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_have_decl=0
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__res" >&5
--$as_echo "$ac_cv_have_decl__res" >&6; }
--if test "x$ac_cv_have_decl__res" = x""yes; then
- 
- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL__RES 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL__RES 0
-+#define HAVE_DECL__RES $ac_have_decl
- _ACEOF
- 
--
--fi
--
--
- fi
- 
- 
-@@ -94831,9 +41920,9 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_LEX+set}" = set; then
-+if test "${ac_cv_prog_LEX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$LEX"; then
-@@ -94844,24 +41933,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_LEX="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; then
--  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
- $as_echo "$LEX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -94890,20 +41979,20 @@
-   return ! yylex () + ! yywrap ();
- }
- _ACEOF
--{ (ac_try="$LEX conftest.l"
-+{ { ac_try="$LEX conftest.l"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$LEX conftest.l") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
- $as_echo_n "checking lex output file root... " >&6; }
--if test "${ac_cv_prog_lex_root+set}" = set; then
-+if test "${ac_cv_prog_lex_root+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -94912,19 +42001,17 @@
- elif test -f lexyy.c; then
-   ac_cv_prog_lex_root=lexyy
- else
--  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
--$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
- $as_echo "$ac_cv_prog_lex_root" >&6; }
- LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
- 
- if test -z "${LEXLIB+set}"; then
--  { $as_echo "$as_me:$LINENO: checking lex library" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
- $as_echo_n "checking lex library... " >&6; }
--if test "${ac_cv_lib_lex+set}" = set; then
-+if test "${ac_cv_lib_lex+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -94932,55 +42019,29 @@
-     ac_cv_lib_lex='none needed'
-     for ac_lib in '' -lfl -ll; do
-       LIBS="$ac_lib $ac_save_LIBS"
--      cat >conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- `cat $LEX_OUTPUT_ROOT.c`
- _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_lex=$ac_lib
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-       test "$ac_cv_lib_lex" != 'none needed' && break
-     done
-     LIBS=$ac_save_LIBS
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
- $as_echo "$ac_cv_lib_lex" >&6; }
-   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
- $as_echo_n "checking whether yytext is a pointer... " >&6; }
--if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -94989,52 +42050,24 @@
- ac_cv_prog_lex_yytext_pointer=no
- ac_save_LIBS=$LIBS
- LIBS="$LEXLIB $ac_save_LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- #define YYTEXT_POINTER 1
- `cat $LEX_OUTPUT_ROOT.c`
- _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_prog_lex_yytext_pointer=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_save_LIBS
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
- $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
- if test $ac_cv_prog_lex_yytext_pointer = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define YYTEXT_POINTER 1
--_ACEOF
-+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
- 
- fi
- rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -95044,9 +42077,9 @@
- if test x"$LEX_BASENAME" = x"flex"; then
- 	# "flex 2.5.33"
- 	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
--	{ $as_echo "$as_me:$LINENO: checking flex version" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking flex version" >&5
- $as_echo_n "checking flex version... " >&6; }
--	{ $as_echo "$as_me:$LINENO: result: $FLEX_VERSION" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX_VERSION" >&5
- $as_echo "$FLEX_VERSION" >&6; }
- 	FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
- 	FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -95059,9 +42092,9 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_YACC+set}" = set; then
-+if test "${ac_cv_prog_YACC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$YACC"; then
-@@ -95072,24 +42105,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_YACC="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
--  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
- $as_echo "$YACC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -95102,9 +42135,9 @@
- if test x"$YACC_BASENAME" = x"bison -y"; then
- 	# bison (GNU Bison) 2.3
- 	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
--	{ $as_echo "$as_me:$LINENO: checking bison version" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking bison version" >&5
- $as_echo_n "checking bison version... " >&6; }
--	{ $as_echo "$as_me:$LINENO: result: $BISON_VERSION" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON_VERSION" >&5
- $as_echo "$BISON_VERSION" >&6; }
- 	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
- 	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -95112,7 +42145,7 @@
- 	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking working LEX YACC combination" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working LEX YACC combination" >&5
- $as_echo_n "checking working LEX YACC combination... " >&6; }
- LEX_YACC="no"
- if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-@@ -95128,7 +42161,7 @@
- 	LEX=false
- 	YACC=false
- fi
--{ $as_echo "$as_me:$LINENO: result: $LEX_YACC" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX_YACC" >&5
- $as_echo "$LEX_YACC" >&6; }
- 
- # Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -95136,21 +42169,15 @@
- 
- # if we ever get to using a host kerberos, we might add conditionals here
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_COM_ERR 1
--_ACEOF
-+$as_echo "#define HAVE_COM_ERR 1" >>confdefs.h
- 
- HAVE_COM_ERR=YES
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_KRB5 1
--_ACEOF
-+$as_echo "#define HAVE_KRB5 1" >>confdefs.h
- 
- HAVE_KRB5=YES
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GSSAPI 1
--_ACEOF
-+$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
- 
- HAVE_GSSAPI=YES
- 
-@@ -95230,193 +42257,48 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
- 
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
--
--fi
--
--VPATH="$VPATH:\$(HEIMDAL_VPATH)"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define SAMBA4_INTERNAL_HEIMDAL 1
--_ACEOF
--
--
--
--SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
--mkinclude heimdal_build/internal.mk
--"
--
--
--
--for ac_header in execinfo.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; }
--
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
-+
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+
-+VPATH="$VPATH:\$(HEIMDAL_VPATH)"
-+
-+
-+$as_echo "#define SAMBA4_INTERNAL_HEIMDAL 1" >>confdefs.h
-+
-+
-+
-+SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
-+mkinclude heimdal_build/internal.mk
-+"
-+
-+
-+for ac_header in execinfo.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_EXECINFO_H 1
- _ACEOF
- 
- fi
- 
- done
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
- $as_echo_n "checking for library containing backtrace... " >&6; }
--if test "${ac_cv_search_ext_backtrace+set}" = set; then
-+if test "${ac_cv_search_ext_backtrace+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- ac_func_search_ext_save_LIBS=$LIBS
- ac_cv_search_ext_backtrace=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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -95434,46 +42316,15 @@
-   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_search_ext_backtrace="none required"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_ext_backtrace" = no; then
-   for ac_lib in execinfo; do
-     LIBS="-l$ac_lib $EXECINFO_LIBS  $ac_func_search_save_ext_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.
-@@ -95491,65 +42342,32 @@
-   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_search_ext_backtrace="-l$ac_lib"
- break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_ext_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ext_backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_backtrace" >&5
- $as_echo "$ac_cv_search_ext_backtrace" >&6; }
--if test "$ac_cv_search_ext_backtrace" != no; then
-+if test "$ac_cv_search_ext_backtrace" != no; then :
-   test "$ac_cv_search_ext_backtrace" = "none required" || EXECINFO_LIBS="$ac_cv_search_ext_backtrace $EXECINFO_LIBS"
- 
- fi
- 
- 
--
--
-     ac_check_func_ext_save_LIBS=$LIBS
-     LIBS="$EXECINFO_LIBS $LIBS"
--        { $as_echo "$as_me:$LINENO: checking for backtrace" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace" >&5
- $as_echo_n "checking for backtrace... " >&6; }
--if test "${ac_cv_func_ext_backtrace+set}" = set; then
-+if test "${ac_cv_func_ext_backtrace+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 backtrace to an innocuous variant, in case <limits.h> declares backtrace.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -95590,43 +42408,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_backtrace=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_ext_backtrace=no
-+  ac_cv_func_ext_backtrace=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_backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_backtrace" >&5
- $as_echo "$ac_cv_func_ext_backtrace" >&6; }
-     LIBS=$ac_check_func_ext_save_LIBS
--    if test $ac_cv_func_ext_backtrace = yes; then
-+    if test $ac_cv_func_ext_backtrace = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_BACKTRACE 1
- _ACEOF
-@@ -95634,7 +42427,6 @@
- fi
- 
- 
--
- if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -95720,102 +42512,12 @@
- 
- 
- 
--
--
--
- for ac_func in sigprocmask sigblock sigaction
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -95824,102 +42526,12 @@
- done
- 
- 
--
- for ac_func in setsid
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
-+if test "x$ac_cv_func_setsid" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SETSID 1
- _ACEOF
- 
- fi
-@@ -95928,153 +42540,14 @@
- 
- #################################################
- # these tests are taken from the GNU fileutils package
--{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
- $as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
--
--
--
- for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.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
-+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
-@@ -96084,65 +42557,16 @@
- done
- 
- 
--
- for ac_header in sys/mount.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+"
-+if test "x$ac_cv_header_sys_mount_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SYS_MOUNT_H 1
- _ACEOF
- 
- fi
-@@ -96155,19 +42579,15 @@
- # Test for statvfs64.
- if test $space = no; then
-   # SVR4
--  { $as_echo "$as_me:$LINENO: checking statvfs64 function (SVR4)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs64 function (SVR4)" >&5
- $as_echo_n "checking statvfs64 function (SVR4)... " >&6; }
--if test "${fu_cv_sys_stat_statvfs64+set}" = set; then
-+if test "${fu_cv_sys_stat_statvfs64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statvfs64=cross
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #if defined(HAVE_UNISTD_H)
-@@ -96181,51 +42601,22 @@
-     exit (statvfs64 (".", &fsd));
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statvfs64=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statvfs64=no
-+  fu_cv_sys_stat_statvfs64=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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: $fu_cv_sys_stat_statvfs64" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs64" >&5
- $as_echo "$fu_cv_sys_stat_statvfs64" >&6; }
-   if test $fu_cv_sys_stat_statvfs64 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATVFS64 1
--_ACEOF
-+$as_echo "#define STAT_STATVFS64 1" >>confdefs.h
- 
-   fi
- fi
-@@ -96238,16 +42629,12 @@
- # is what it gets when this test fails.
- if test $space = no; then
-   # SVR4
--  { $as_echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs function (SVR4)" >&5
- $as_echo_n "checking statvfs function (SVR4)... " >&6; }
--if test "${fu_cv_sys_stat_statvfs+set}" = set; then
-+if test "${fu_cv_sys_stat_statvfs+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/statvfs.h>
-@@ -96259,64 +42646,33 @@
-   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 :
-   fu_cv_sys_stat_statvfs=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	fu_cv_sys_stat_statvfs=no
-+  fu_cv_sys_stat_statvfs=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5
- $as_echo "$fu_cv_sys_stat_statvfs" >&6; }
-   if test $fu_cv_sys_stat_statvfs = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATVFS 1
--_ACEOF
-+$as_echo "#define STAT_STATVFS 1" >>confdefs.h
- 
-   fi
- fi
- 
- # fsusage.c assumes that statvfs has an f_frsize entry. Some weird
- # systems use f_bsize.
--{ $as_echo "$as_me:$LINENO: checking that statvfs.f_frsize works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.f_frsize works" >&5
- $as_echo_n "checking that statvfs.f_frsize works... " >&6; }
--if test "${samba_cv_frsize+set}" = set; then
-+if test "${samba_cv_frsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/statvfs.h>
-@@ -96328,59 +42684,32 @@
-   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_frsize=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	samba_cv_frsize=no
-+  samba_cv_frsize=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_frsize" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_frsize" >&5
- $as_echo "$samba_cv_frsize" >&6; }
- if test x"$samba_cv_frsize" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FRSIZE 1
--_ACEOF
-+$as_echo "#define HAVE_FRSIZE 1" >>confdefs.h
- 
- fi
- 
- if test $space = no; then
-   # DEC Alpha running OSF/1
--  { $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5
- $as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs3_osf1=no
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <sys/param.h>
-@@ -96393,71 +42722,38 @@
-     exit (statfs (".", &fsd, sizeof (struct statfs)));
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs3_osf1=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs3_osf1=no
-+  fu_cv_sys_stat_statfs3_osf1=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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: $fu_cv_sys_stat_statfs3_osf1" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5
- $as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; }
-   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS3_OSF1 1
--_ACEOF
-+$as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # AIX
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
- $as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs2_bsize=no
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -96476,71 +42772,38 @@
-   exit (statfs (".", &fsd));
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs2_bsize=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs2_bsize=no
-+  fu_cv_sys_stat_statfs2_bsize=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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: $fu_cv_sys_stat_statfs2_bsize" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5
- $as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; }
-   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_BSIZE 1
--_ACEOF
-+$as_echo "#define STAT_STATFS2_BSIZE 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # SVR3
--  { $as_echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
- $as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs4+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs4+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs4=no
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/statfs.h>
-@@ -96550,71 +42813,38 @@
-   exit (statfs (".", &fsd, sizeof fsd, 0));
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs4=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs4=no
-+  fu_cv_sys_stat_statfs4=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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: $fu_cv_sys_stat_statfs4" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5
- $as_echo "$fu_cv_sys_stat_statfs4" >&6; }
-   if test $fu_cv_sys_stat_statfs4 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS4 1
--_ACEOF
-+$as_echo "#define STAT_STATFS4 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # 4.4BSD and NetBSD
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
- $as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs2_fsize=no
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -96630,71 +42860,38 @@
-   exit (statfs (".", &fsd));
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs2_fsize=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs2_fsize=no
-+  fu_cv_sys_stat_statfs2_fsize=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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: $fu_cv_sys_stat_statfs2_fsize" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5
- $as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; }
-   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_FSIZE 1
--_ACEOF
-+$as_echo "#define STAT_STATFS2_FSIZE 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
-   # Ultrix
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
- $as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
--  if test "${fu_cv_sys_stat_fs_data+set}" = set; then
-+  if test "${fu_cv_sys_stat_fs_data+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_fs_data=no
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -96714,201 +42911,33 @@
-   exit (statfs (".", &fsd) != 1);
-   }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  fu_cv_sys_stat_fs_data=yes
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_fs_data=no
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--
--  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
--$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
--  if test $fu_cv_sys_stat_fs_data = yes; then
--    space=yes
--
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_FS_DATA 1
--_ACEOF
--
--  fi
--fi
--
--
--
--
--for ac_header in sys/attributes.h attr/xattr.h sys/xattr.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
-+if ac_fn_c_try_run "$LINENO"; then :
-+  fu_cv_sys_stat_fs_data=yes
- else
--  eval "$as_ac_Header=\$ac_header_preproc"
-+  fu_cv_sys_stat_fs_data=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: $fu_cv_sys_stat_fs_data" >&5
-+$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
-+  if test $fu_cv_sys_stat_fs_data = yes; then
-+    space=yes
- 
-+$as_echo "#define STAT_STATFS2_FS_DATA 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/attributes.h attr/xattr.h sys/xattr.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
-@@ -96917,19 +42946,15 @@
- 
- done
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing flistxattr" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing flistxattr" >&5
- $as_echo_n "checking for library containing flistxattr... " >&6; }
--if test "${ac_cv_search_ext_flistxattr+set}" = set; then
-+if test "${ac_cv_search_ext_flistxattr+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- ac_func_search_ext_save_LIBS=$LIBS
- ac_cv_search_ext_flistxattr=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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -96947,46 +42972,15 @@
-   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_search_ext_flistxattr="none required"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_ext_flistxattr" = no; then
-   for ac_lib in attr; do
-     LIBS="-l$ac_lib $XATTR_LIBS  $ac_func_search_save_ext_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.
-@@ -97004,65 +42998,32 @@
-   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_search_ext_flistxattr="-l$ac_lib"
- break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_ext_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ext_flistxattr" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_flistxattr" >&5
- $as_echo "$ac_cv_search_ext_flistxattr" >&6; }
--if test "$ac_cv_search_ext_flistxattr" != no; then
-+if test "$ac_cv_search_ext_flistxattr" != no; then :
-   test "$ac_cv_search_ext_flistxattr" = "none required" || XATTR_LIBS="$ac_cv_search_ext_flistxattr $XATTR_LIBS"
- 
- fi
- 
- 
--
--
-     ac_check_func_ext_save_LIBS=$LIBS
-     LIBS="$XATTR_LIBS $LIBS"
--        { $as_echo "$as_me:$LINENO: checking for flistxattr" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flistxattr" >&5
- $as_echo_n "checking for flistxattr... " >&6; }
--if test "${ac_cv_func_ext_flistxattr+set}" = set; then
-+if test "${ac_cv_func_ext_flistxattr+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 flistxattr to an innocuous variant, in case <limits.h> declares flistxattr.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -97103,50 +43064,24 @@
-   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_flistxattr=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_ext_flistxattr=no
-+  ac_cv_func_ext_flistxattr=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_flistxattr" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_flistxattr" >&5
- $as_echo "$ac_cv_func_ext_flistxattr" >&6; }
-     LIBS=$ac_check_func_ext_save_LIBS
--    if test $ac_cv_func_ext_flistxattr = yes; then
-+    if test $ac_cv_func_ext_flistxattr = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_FLISTXATTR 1
- _ACEOF
- 
- fi
- 
--
- MAKE_SETTINGS="$MAKE_SETTINGS
- XATTR_LIBS = ${XATTR_LIBS}
- XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -97156,18 +43091,14 @@
- 
- 
- if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
--	{ $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xattr interface takes additional options" >&5
- $as_echo_n "checking whether xattr interface takes additional options... " >&6; }
--if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
-+if test "${smb_attr_cv_xattr_add_opt+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   old_LIBS=$LIBS
- 	 LIBS="$LIBS $XATTRLIBS"
--	 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>
-@@ -97190,48 +43121,23 @@
-   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 :
-   smb_attr_cv_xattr_add_opt=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	smb_attr_cv_xattr_add_opt=no
-+  smb_attr_cv_xattr_add_opt=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 	  LIBS=$old_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
-+{ $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
- 
--cat >>confdefs.h <<\_ACEOF
--#define XATTR_ADDITIONAL_OPTIONS 1
--_ACEOF
-+$as_echo "#define XATTR_ADDITIONAL_OPTIONS 1" >>confdefs.h
- 
- 	fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_XATTR_SUPPORT 1
--_ACEOF
-+$as_echo "#define HAVE_XATTR_SUPPORT 1" >>confdefs.h
- 
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97243,20 +43149,16 @@
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for irix specific capabilities" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for irix specific capabilities" >&5
- $as_echo_n "checking for irix specific capabilities... " >&6; }
--if test "${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES+set}" = set; then
-+if test "${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then :
-   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross
- 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/capability.h>
-@@ -97271,117 +43173,55 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=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_IRIX_SPECIFIC_CAPABILITIES=no
-+  samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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_HAVE_IRIX_SPECIFIC_CAPABILITIES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" >&5
- $as_echo "$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" >&6; }
- if test x"$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_IRIX_SPECIFIC_CAPABILITIES 1
--_ACEOF
-+$as_echo "#define HAVE_IRIX_SPECIFIC_CAPABILITIES 1" >>confdefs.h
- 
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes tz argument" >&5
- $as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
--if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then
-+if test "${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then :
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <sys/time.h>
- #include <unistd.h>
- main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=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_GETTIMEOFDAY_TZ=no
-+  samba_cv_HAVE_GETTIMEOFDAY_TZ=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_GETTIMEOFDAY_TZ" >&5
- $as_echo "$samba_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
- if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTIMEOFDAY_TZ 1
--_ACEOF
-+$as_echo "#define HAVE_GETTIMEOFDAY_TZ 1" >>confdefs.h
- 
- fi
- 
-@@ -97389,7 +43229,7 @@
- INCLUDED_POPT=auto
- 
- # Check whether --with-included-popt was given.
--if test "${with_included_popt+set}" = set; then
-+if test "${with_included_popt+set}" = set; then :
-   withval=$with_included_popt;  INCLUDED_POPT=$withval
- fi
- 
-@@ -97398,169 +43238,26 @@
- 
- 
- if test x"$INCLUDED_POPT" != x"yes"; then
--
--for ac_header in popt.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 popt.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
-+if test "x$ac_cv_header_popt_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_POPT_H 1
- _ACEOF
- 
- fi
- 
- done
- 
--	{ $as_echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5
- $as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
--if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then
-+if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpopt  $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.
-@@ -97578,43 +43275,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_popt_poptGetContext=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_popt_poptGetContext=no
-+  ac_cv_lib_popt_poptGetContext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+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_popt_poptGetContext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5
- $as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
--if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then
-+if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then :
-    POPT_LIBS="-lpopt"
- fi
- 
-@@ -97626,9 +43298,9 @@
- 	fi
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking whether to use included popt" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use included popt" >&5
- $as_echo_n "checking whether to use included popt... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $INCLUDED_POPT" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INCLUDED_POPT" >&5
- $as_echo "$INCLUDED_POPT" >&6; }
- if test x"$INCLUDED_POPT" != x"no"; then
- 			poptdir=""
-@@ -97642,156 +43314,16 @@
- 		fi
- 	done
-         if test x"$poptdir" = "x"; then
--		{ { $as_echo "$as_me:$LINENO: error: cannot find popt source in $poptpaths" >&5
--$as_echo "$as_me: error: cannot find popt source in $poptpaths" >&2;}
--   { (exit 1); exit 1; }; }
-+		as_fn_error "cannot find popt source in $poptpaths" "$LINENO" 5
- 	fi
- 	POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
- 
--
--
--for ac_header in float.h alloca.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 float.h alloca.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
-@@ -97830,12 +43362,10 @@
- LOOK_DIRS="/usr /usr/local /sw"
- 
- # Check whether --with-libiconv was given.
--if test "${with_libiconv+set}" = set; then
-+if test "${with_libiconv+set}" = set; then :
-   withval=$with_libiconv;
-   if test "$withval" = "no" ; then
--    { { $as_echo "$as_me:$LINENO: error: I won't take no for an answer" >&5
--$as_echo "$as_me: error: I won't take no for an answer" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "I won't take no for an answer" "$LINENO" 5
-   else
-      if test "$withval" != "yes" ; then
- 
-@@ -97847,26 +43377,20 @@
- 	LIBS=-liconv
- 
- 
--  { $as_echo "$as_me:$LINENO: checking Whether iconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether iconv.h is present" >&5
- $as_echo_n "checking Whether iconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
- $as_echo "cross" >&6; };
-         LIBS=-lgiconv
- 
--  { $as_echo "$as_me:$LINENO: checking Whether giconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether giconv.h is present" >&5
- $as_echo_n "checking Whether giconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
--$as_echo "cross" >&6; }; { { $as_echo "$as_me:$LINENO: error: No iconv library found in $withval" >&5
--$as_echo "$as_me: error: No iconv library found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
-+$as_echo "cross" >&6; }; as_fn_error "No iconv library found in $withval" "$LINENO" 5
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <giconv.h>
-@@ -97879,33 +43403,10 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes;
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97913,29 +43414,17 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }; { { $as_echo "$as_me:$LINENO: error: No iconv library found in $withval" >&5
--$as_echo "$as_me: error: No iconv library found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }; as_fn_error "No iconv library found in $withval" "$LINENO" 5
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
--
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <iconv.h>
-@@ -97948,33 +43437,10 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_ICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes;
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97982,28 +43448,17 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
-         LIBS=-lgiconv
- 
--  { $as_echo "$as_me:$LINENO: checking Whether giconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether giconv.h is present" >&5
- $as_echo_n "checking Whether giconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
--$as_echo "cross" >&6; }; { { $as_echo "$as_me:$LINENO: error: No iconv library found in $withval" >&5
--$as_echo "$as_me: error: No iconv library found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
-+$as_echo "cross" >&6; }; as_fn_error "No iconv library found in $withval" "$LINENO" 5
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <giconv.h>
-@@ -98016,33 +43471,10 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes;
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -98050,31 +43482,22 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }; { { $as_echo "$as_me:$LINENO: error: No iconv library found in $withval" >&5
--$as_echo "$as_me: error: No iconv library found in $withval" >&2;}
--   { (exit 1); exit 1; }; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }; as_fn_error "No iconv library found in $withval" "$LINENO" 5
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
--
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
--
- 	CPPFLAGS="$save_CPPFLAGS"
- 	LDFLAGS="$save_LDFLAGS"
- 	LIBS="$save_LIBS"
-@@ -98087,17 +43510,13 @@
- 
- if test x$ICONV_FOUND = xno; then
- 
--  { $as_echo "$as_me:$LINENO: checking Whether iconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether iconv.h is present" >&5
- $as_echo_n "checking Whether iconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
- $as_echo "cross" >&6; };
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <iconv.h>
-@@ -98110,49 +43529,20 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_ICONV_H 1" >>confdefs.h
-  ICONV_FOUND=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 )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
--
- fi
- 
- for i in $LOOK_DIRS ; do
-@@ -98169,24 +43559,20 @@
- 	LIBS=-liconv
- 
- 
--  { $as_echo "$as_me:$LINENO: checking Whether iconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether iconv.h is present" >&5
- $as_echo_n "checking Whether iconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
- $as_echo "cross" >&6; };
-         LIBS=-lgiconv
- 
--  { $as_echo "$as_me:$LINENO: checking Whether giconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether giconv.h is present" >&5
- $as_echo_n "checking Whether giconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
- $as_echo "cross" >&6; };
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <giconv.h>
-@@ -98199,33 +43585,10 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -98233,27 +43596,17 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
--
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <iconv.h>
-@@ -98266,33 +43619,10 @@
- }
- 
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ICONV_H 1
--_ACEOF
-+$as_echo "#define HAVE_ICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -98300,26 +43630,17 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
-         LIBS=-lgiconv
- 
--  { $as_echo "$as_me:$LINENO: checking Whether giconv.h is present" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether giconv.h is present" >&5
- $as_echo_n "checking Whether giconv.h is present... " >&6; }
--  if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: result: cross" >&5
-+  if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross" >&5
- $as_echo "cross" >&6; };
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <giconv.h>
-@@ -98331,304 +43652,92 @@
-    return 0;
- }
- 
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GICONV_H 1
--_ACEOF
--
--		ICONV_FOUND=yes
--		ICONV_CPPFLAGS="$CPPFLAGS"
--		ICONV_LIBS="$LIBS"
--		ICONV_LDFLAGS="$LDFLAGS"
--
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; };
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--
--
--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
--
--
--
--
--	CPPFLAGS="$save_CPPFLAGS"
--	LDFLAGS="$save_LDFLAGS"
--	LIBS="$save_LIBS"
--
--done
--
--if test x"$ICONV_FOUND" = x"no"; then
--    { $as_echo "$as_me:$LINENO: WARNING: Sufficient support for iconv function was not found.
--    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
--$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
--    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--ICONV_ENABLE = NO
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"ICONV\"} = \"NO\";"
--
--else
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NATIVE_ICONV 1
--_ACEOF
--
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--ICONV_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"ICONV\"} = \"YES\";"
--
--fi
--
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--ICONV_LIBS = ${ICONV_LIBS}
--ICONV_CFLAGS = ${ICONV_CFLAGS}
--ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
--ICONV_LDFLAGS = ${ICONV_LDFLAGS}
--"
--
--
--
--
--for ac_func in writev
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; };
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
- 
--	eval "$as_ac_var=no"
--fi
-+		ICONV_FOUND=yes
-+		ICONV_CPPFLAGS="$CPPFLAGS"
-+		ICONV_LIBS="$LIBS"
-+		ICONV_LDFLAGS="$LDFLAGS"
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; };
- 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
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
- 
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+
-+	CPPFLAGS="$save_CPPFLAGS"
-+	LDFLAGS="$save_LDFLAGS"
-+	LIBS="$save_LIBS"
-+
- done
- 
-+if test x"$ICONV_FOUND" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficient support for iconv function was not found.
-+    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
-+$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
-+    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+ICONV_ENABLE = NO
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"ICONV\"} = \"NO\";"
- 
--for ac_func in readv
--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.  */
-+$as_echo "#define HAVE_NATIVE_ICONV 1" >>confdefs.h
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+ICONV_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"ICONV\"} = \"YES\";"
- 
--/* 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
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
-+
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+ICONV_LIBS = ${ICONV_LIBS}
-+ICONV_CFLAGS = ${ICONV_CFLAGS}
-+ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
-+ICONV_LDFLAGS = ${ICONV_LDFLAGS}
-+"
-+
-+
-+
-+for ac_func in writev
-+do :
-+  ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev"
-+if test "x$ac_cv_func_writev" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_WRITEV 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"
- 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
--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 readv
-+do :
-+  ac_fn_c_check_func "$LINENO" "readv" "ac_cv_func_readv"
-+if test "x$ac_cv_func_readv" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_READV 1
- _ACEOF
- 
- fi
-@@ -98707,151 +43816,12 @@
- 
- 
- 
--
  for ac_header in zlib.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -103529,7 +95844,7 @@
  _ACEOF
  
  fi
-@@ -98861,23 +43831,17 @@
+@@ -90225,23 +40640,17 @@
  
  
  
@@ -103556,7 +95871,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -98895,54 +43859,28 @@
+@@ -90259,54 +40668,28 @@
    return 0;
  }
  _ACEOF
@@ -103618,7 +95933,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -98958,18 +43896,13 @@
+@@ -90322,18 +40705,13 @@
  
  fi
  
@@ -103640,7 +95955,7 @@
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -98987,40 +43920,19 @@
+@@ -90351,40 +40729,19 @@
    return 0;
  }
  _ACEOF
@@ -103683,6084 +95998,16 @@
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -99079,9 +43991,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -99094,14 +44006,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
+@@ -90406,7 +40763,7 @@
  
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99110,10 +44022,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
  
-@@ -99129,52 +44041,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.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.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.1'`"
- 				OLD_CFLAGS="$CFLAGS"
- 				CFLAGS="$CFLAGS $LIBTALLOC_CFLAGS"
--				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTALLOC_CFLAGS" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler can use the LIBTALLOC_CFLAGS" >&5
- $as_echo_n "checking that the C compiler can use the LIBTALLOC_CFLAGS... " >&6; }
--				if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
-+				if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run when cross-compiling" >&5
- $as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
- 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 "${srcdir-.}/../tests/trivial.c"
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- LIBTALLOC_ENABLE = YES
-@@ -99182,22 +44069,16 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"LIBTALLOC\"} = \"YES\";"
- 
--					{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- 				CFLAGS="$OLD_CFLAGS"
- 
- 				ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.1'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.1'`"
-@@ -99258,7 +44139,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.1'
- 				ac_cv_LIBTALLOC_found=no
-@@ -99292,9 +44173,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -99307,14 +44188,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99323,10 +44204,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -99342,52 +44223,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.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.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.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
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler can use the LIBTDB_CFLAGS" >&5
- $as_echo_n "checking that the C compiler can use the LIBTDB_CFLAGS... " >&6; }
--				if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
-+				if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run when cross-compiling" >&5
- $as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
- 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 "${srcdir-.}/../tests/trivial.c"
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- LIBTDB_ENABLE = YES
-@@ -99395,22 +44251,16 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"LIBTDB\"} = \"YES\";"
- 
--					{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- 				CFLAGS="$OLD_CFLAGS"
- 
- 				ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.2.1'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.2.1'`"
-@@ -99471,7 +44321,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.2.1'
- 				ac_cv_LIBTDB_found=no
-@@ -99496,9 +44346,7 @@
- 	fi
- done
- if test x"$tdbdir" = "x"; then
--   { { $as_echo "$as_me:$LINENO: error: cannot find tdb source in $tdbpaths" >&5
--$as_echo "$as_me: error: cannot find tdb source in $tdbpaths" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
- 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"
-@@ -99511,104 +44359,12 @@
- TDB_CFLAGS="-I$tdbdir/include"
- 
- 
--
--
--
--
--
- for ac_func in mmap pread pwrite getpagesize utime
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -99616,151 +44372,12 @@
- fi
- done
- 
--
--
--
- for ac_header in getopt.h sys/select.h sys/time.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
-+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
-@@ -99771,17 +44388,13 @@
- 
- 
- 
-- { $as_echo "$as_me:$LINENO: checking for pread declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pread declaration" >&5
- $as_echo_n "checking for pread declaration... " >&6; }
--if test "${ac_cv_have_pread_decl+set}" = set; then
-+if test "${ac_cv_have_pread_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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <unistd.h>
- int
-@@ -99792,56 +44405,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 :
-   ac_cv_have_pread_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_pread_decl=no
-+  ac_cv_have_pread_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pread_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pread_decl" >&5
- $as_echo "$ac_cv_have_pread_decl" >&6; }
-  if test x"$ac_cv_have_pread_decl" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PREAD_DECL 1
--_ACEOF
-+$as_echo "#define HAVE_PREAD_DECL 1" >>confdefs.h
- 
-  fi
- 
- 
-- { $as_echo "$as_me:$LINENO: checking for pwrite declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pwrite declaration" >&5
- $as_echo_n "checking for pwrite declaration... " >&6; }
--if test "${ac_cv_have_pwrite_decl+set}" = set; then
-+if test "${ac_cv_have_pwrite_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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <unistd.h>
- int
-@@ -99852,41 +44438,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_have_pwrite_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_pwrite_decl=no
-+  ac_cv_have_pwrite_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pwrite_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pwrite_decl" >&5
- $as_echo "$ac_cv_have_pwrite_decl" >&6; }
-  if test x"$ac_cv_have_pwrite_decl" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PWRITE_DECL 1
--_ACEOF
-+$as_echo "#define HAVE_PWRITE_DECL 1" >>confdefs.h
- 
-  fi
- 
-@@ -99917,9 +44480,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -99932,14 +44495,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99948,10 +44511,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -99967,52 +44530,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 tevent = 0.9.8" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tevent = 0.9.8" >&5
- $as_echo_n "checking for tevent = 0.9.8... " >&6; }
- 
- 			if $PKG_CONFIG --exists 'tevent = 0.9.8' ; then
--				{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 				LIBTEVENT_CFLAGS="`$PKG_CONFIG --cflags 'tevent = 0.9.8'`"
- 				OLD_CFLAGS="$CFLAGS"
- 				CFLAGS="$CFLAGS $LIBTEVENT_CFLAGS"
--				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTEVENT_CFLAGS" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler can use the LIBTEVENT_CFLAGS" >&5
- $as_echo_n "checking that the C compiler can use the LIBTEVENT_CFLAGS... " >&6; }
--				if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
-+				if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run when cross-compiling" >&5
- $as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
- 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 "${srcdir-.}/../tests/trivial.c"
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- LIBTEVENT_ENABLE = YES
-@@ -100020,22 +44558,16 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"LIBTEVENT\"} = \"YES\";"
- 
--					{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- 				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'`"
-@@ -100096,7 +44628,7 @@
- 				ac_cv_LIBTEVENT_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 'tevent = 0.9.8'
- 				ac_cv_LIBTEVENT_found=no
-@@ -100117,281 +44649,50 @@
- 
- if test x"$teventdir" = "x"; then
- 	teventdir=""
--	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
--	for d in $teventpaths; do
--		if test -f "$d/tevent.c"; then
--			teventdir="$d"
--			break;
--		fi
--	done
--	if test x"$teventdir" = "x"; then
--	   { { $as_echo "$as_me:$LINENO: error: cannot find libtevent source in $teventpaths" >&5
--$as_echo "$as_me: error: cannot find libtevent source in $teventpaths" >&2;}
--   { (exit 1); exit 1; }; }
--	fi
--fi
--
--TEVENT_OBJ=""
--TEVENT_CFLAGS=""
--TEVENT_LIBS=""
--
--
--
--
--TEVENT_CFLAGS="-I$teventdir"
--
--TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
--TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
--TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
--TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
--
--
--for ac_header in sys/epoll.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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
-+	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+	for d in $teventpaths; do
-+		if test -f "$d/tevent.c"; then
-+			teventdir="$d"
-+			break;
-+		fi
-+	done
-+	if test x"$teventdir" = "x"; then
-+	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
-+	fi
- fi
- 
--done
--
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
- 
--for ac_func in epoll_create
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef $ac_func
-+TEVENT_CFLAGS="-I$teventdir"
- 
--/* 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
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
-+for ac_header in sys/epoll.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_EPOLL_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"
- 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
-+done
-+
-+for ac_func in epoll_create
-+do :
-+  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
-+if test "x$ac_cv_func_epoll_create" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_EPOLL_CREATE 1
- _ACEOF
- 
- fi
-@@ -100400,9 +44701,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"
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_EPOLL 1
--_ACEOF
-+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
- 
- fi
- 
-@@ -100458,9 +44757,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -100473,14 +44772,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100489,10 +44788,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -100508,52 +44807,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.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.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.10'`"
- 				OLD_CFLAGS="$CFLAGS"
- 				CFLAGS="$CFLAGS $LIBLDB_CFLAGS"
--				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBLDB_CFLAGS" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler can use the LIBLDB_CFLAGS" >&5
- $as_echo_n "checking that the C compiler can use the LIBLDB_CFLAGS... " >&6; }
--				if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
-+				if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run when cross-compiling" >&5
- $as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
- 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 "${srcdir-.}/../tests/trivial.c"
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- LIBLDB_ENABLE = YES
-@@ -100561,22 +44835,16 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"LIBLDB\"} = \"YES\";"
- 
--					{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- 				CFLAGS="$OLD_CFLAGS"
- 
- 				ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.10'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.10'`"
-@@ -100637,7 +44905,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.10'
- 				ac_cv_LIBLDB_found=no
-@@ -100683,12 +44951,12 @@
- 
- SQLITE3_LIBS=""
- with_sqlite3_support=no
--{ $as_echo "$as_me:$LINENO: checking for SQLITE3 support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3 support" >&5
- $as_echo_n "checking for SQLITE3 support... " >&6; }
- 
- 
- # Check whether --with-sqlite3 was given.
--if test "${with_sqlite3+set}" = set; then
-+if test "${with_sqlite3+set}" = set; then :
-   withval=$with_sqlite3;  case "$withval" in
-     yes|no|auto)
- 	with_sqlite3_support=$withval
-@@ -100697,157 +44965,18 @@
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: result: $with_sqlite3_support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite3_support" >&5
- $as_echo "$with_sqlite3_support" >&6; }
- 
- if test x"$with_sqlite3_support" != x"no"; then
-   ##################################################################
-   # first test for sqlite3.h
--
--for ac_header in sqlite3.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 sqlite3.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SQLITE3_H 1
- _ACEOF
- 
- fi
-@@ -100857,11 +44986,9 @@
- 
-   if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
- 	if test x"$with_sqlite3_support" = x"yes"; then
--	 { { $as_echo "$as_me:$LINENO: error: sqlite3.h is needed for SQLITE3 support" >&5
--$as_echo "$as_me: error: sqlite3.h is needed for SQLITE3 support" >&2;}
--   { (exit 1); exit 1; }; }
-+	 as_fn_error "sqlite3.h is needed for SQLITE3 support" "$LINENO" 5
- 	else
--	 { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h is needed for SQLITE3 support" >&5
-+	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sqlite3.h is needed for SQLITE3 support" >&5
- $as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
- 	fi
- 
-@@ -100876,23 +45003,17 @@
-   # now see if we can find the sqlite3 libs in standard paths
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lsqlite3 $SQLITE3_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
- $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
--if test "${ac_cv_lib_ext_sqlite3_sqlite3_open+set}" = set; then
-+if test "${ac_cv_lib_ext_sqlite3_sqlite3_open+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -100910,54 +45031,28 @@
-   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_ext_sqlite3_sqlite3_open=yes;
- 		  ac_cv_lib_ext_sqlite3=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_sqlite3_sqlite3_open=no;
-+  ac_cv_lib_ext_sqlite3_sqlite3_open=no;
- 		  ac_cv_lib_ext_sqlite3=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_lib_ext_sqlite3_sqlite3_open" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_sqlite3_sqlite3_open" >&5
- $as_echo "$ac_cv_lib_ext_sqlite3_sqlite3_open" >&6; }
--    if test $ac_cv_lib_ext_sqlite3_sqlite3_open = yes; then
-+    if test $ac_cv_lib_ext_sqlite3_sqlite3_open = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_SQLITE3_OPEN 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_sqlite3 = yes; then
-+if test $ac_cv_lib_ext_sqlite3 = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSQLITE3 1
- _ACEOF
-@@ -100973,21 +45068,16 @@
- 
- fi
- 
--
-   if test x"$ac_cv_lib_ext_sqlite3_sqlite3_open" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SQLITE3 1
--_ACEOF
-+$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LDB_SQLITE3 1
--_ACEOF
-+$as_echo "#define HAVE_LDB_SQLITE3 1" >>confdefs.h
- 
--    { $as_echo "$as_me:$LINENO: checking whether SQLITE3 support is used" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SQLITE3 support is used" >&5
- $as_echo_n "checking whether SQLITE3 support is used... " >&6; }
--    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     with_sqlite3_support=yes
- 
-@@ -100999,11 +45089,9 @@
- 
-   else
-     if test x"$with_sqlite3_support" = x"yes"; then
--	{ { $as_echo "$as_me:$LINENO: error: libsqlite3 is needed for SQLITE3 support" >&5
--$as_echo "$as_me: error: libsqlite3 is needed for SQLITE3 support" >&2;}
--   { (exit 1); exit 1; }; }
-+	as_fn_error "libsqlite3 is needed for SQLITE3 support" "$LINENO" 5
-     else
--	{ $as_echo "$as_me:$LINENO: WARNING: libsqlite3 is needed for SQLITE3 support" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsqlite3 is needed for SQLITE3 support" >&5
- $as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
-     fi
- 
-@@ -101073,7 +45161,7 @@
- 
- use_gnutls=auto
- # Check whether --enable-gnutls was given.
--if test "${enable_gnutls+set}" = set; then
-+if test "${enable_gnutls+set}" = set; then :
-   enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
-         use_gnutls=no
-     fi
-@@ -101087,9 +45175,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -101102,14 +45190,14 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -101118,10 +45206,10 @@
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -101137,52 +45225,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 gnutls >= 1.4.0" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 1.4.0" >&5
- $as_echo_n "checking for gnutls >= 1.4.0... " >&6; }
- 
- 			if $PKG_CONFIG --exists 'gnutls >= 1.4.0' ; then
--				{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 				GNUTLS_CFLAGS="`$PKG_CONFIG --cflags 'gnutls >= 1.4.0'`"
- 				OLD_CFLAGS="$CFLAGS"
- 				CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
--				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the GNUTLS_CFLAGS" >&5
-+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler can use the GNUTLS_CFLAGS" >&5
- $as_echo_n "checking that the C compiler can use the GNUTLS_CFLAGS... " >&6; }
--				if test "$cross_compiling" = yes; then
--  { $as_echo "$as_me:$LINENO: WARNING: cannot run when cross-compiling" >&5
-+				if test "$cross_compiling" = yes; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run when cross-compiling" >&5
- $as_echo "$as_me: WARNING: cannot run when cross-compiling" >&2;}
- 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 "${srcdir-.}/../tests/trivial.c"
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- GNUTLS_ENABLE = YES
-@@ -101190,22 +45253,16 @@
- SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{\"GNUTLS\"} = \"YES\";"
- 
--					{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- 				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'`"
-@@ -101266,7 +45323,7 @@
- 				ac_cv_GNUTLS_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 'gnutls >= 1.4.0'
- 				ac_cv_GNUTLS_found=no
-@@ -101286,151 +45343,12 @@
- fi
- 
- if test x$use_gnutls = xauto; then
--
--for ac_header in gnutls/gnutls.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 gnutls/gnutls.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_GNUTLS_GNUTLS_H 1
- _ACEOF
- 
- fi
-@@ -101439,23 +45357,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lgnutls $GNUTLS_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for gnutls_global_init in -lgnutls" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
- $as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
--if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then
-+if test "${ac_cv_lib_ext_gnutls_gnutls_global_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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -101473,580 +45385,116 @@
-   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_ext_gnutls_gnutls_global_init=yes;
--		  ac_cv_lib_ext_gnutls=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_gnutls_gnutls_global_init=no;
--		  ac_cv_lib_ext_gnutls=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
--$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
--    if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_GNUTLS_GLOBAL_INIT 1
--_ACEOF
--
--fi
--
--LIBS=$ac_check_lib_ext_save_LIBS
--
--if test $ac_cv_lib_ext_gnutls = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBGNUTLS 1
--_ACEOF
--
--		case "$GNUTLS_LIBS" in
--		    *-lgnutls*)
--			;;
--		    *)
--			GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
--			;;
--		esac
--
--
--fi
--
--	{ $as_echo "$as_me:$LINENO: checking whether gnutls_x509_crt_set_version is declared" >&5
--$as_echo_n "checking whether gnutls_x509_crt_set_version is declared... " >&6; }
--if test "${ac_cv_have_decl_gnutls_x509_crt_set_version+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 <gnutls/gnutls.h>
--	#include <gnutls/x509.h>
--
--
--int
--main ()
--{
--#ifndef gnutls_x509_crt_set_version
--  (void) gnutls_x509_crt_set_version;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_gnutls_x509_crt_set_version=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_gnutls_x509_crt_set_version=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gnutls_x509_crt_set_version" >&5
--$as_echo "$ac_cv_have_decl_gnutls_x509_crt_set_version" >&6; }
--if test "x$ac_cv_have_decl_gnutls_x509_crt_set_version" = x""yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GNUTLS_X509_CRT_SET_VERSION 1
--_ACEOF
--
--fi
--
--	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--GNUTLS_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"GNUTLS\"} = \"YES\";"
--
--		{ $as_echo "$as_me:$LINENO: checking whether gnutls_x509_crt_set_subject_key_id is declared" >&5
--$as_echo_n "checking whether gnutls_x509_crt_set_subject_key_id is declared... " >&6; }
--if test "${ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--	#include <gnutls/gnutls.h>
--	#include <gnutls/x509.h>
--
--
--int
--main ()
--{
--#ifndef gnutls_x509_crt_set_subject_key_id
--  (void) gnutls_x509_crt_set_subject_key_id;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&5
--$as_echo "$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&6; }
--if test "x$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" = x""yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID 1
--_ACEOF
--
--fi
--
--	fi
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--GNUTLS_LIBS = $GNUTLS_LIBS
--GNUTLS_CFLAGS =
--GNUTLS_CPPFLAGS =
--GNUTLS_LDFLAGS =
--"
--
--
--fi
--if test x$use_gnutls = xyes; then
--	#Some older versions have a different type name
--	{ $as_echo "$as_me:$LINENO: checking for gnutls_datum" >&5
--$as_echo_n "checking for gnutls_datum... " >&6; }
--if test "${ac_cv_type_gnutls_datum+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_type_gnutls_datum=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "gnutls/gnutls.h"
--
--int
--main ()
--{
--if (sizeof (gnutls_datum))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "gnutls/gnutls.h"
--
--int
--main ()
--{
--if (sizeof ((gnutls_datum)))
--	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_gnutls_datum=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum" >&5
--$as_echo "$ac_cv_type_gnutls_datum" >&6; }
--if test "x$ac_cv_type_gnutls_datum" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_GNUTLS_DATUM 1
--_ACEOF
--
--
--fi
--
--	{ $as_echo "$as_me:$LINENO: checking for gnutls_datum_t" >&5
--$as_echo_n "checking for gnutls_datum_t... " >&6; }
--if test "${ac_cv_type_gnutls_datum_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_type_gnutls_datum_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "gnutls/gnutls.h"
--
--int
--main ()
--{
--if (sizeof (gnutls_datum_t))
--       return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include "gnutls/gnutls.h"
--
--int
--main ()
--{
--if (sizeof ((gnutls_datum_t)))
--	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
-+		  ac_cv_lib_ext_gnutls=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_ext_gnutls_gnutls_global_init=no;
-+		  ac_cv_lib_ext_gnutls=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: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
-+$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
-+    if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_GLOBAL_INIT 1
-+_ACEOF
- 
--	ac_cv_type_gnutls_datum_t=yes
- fi
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
--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 test $ac_cv_lib_ext_gnutls = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGNUTLS 1
-+_ACEOF
-+
-+		case "$GNUTLS_LIBS" in
-+		    *-lgnutls*)
-+			;;
-+		    *)
-+			GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
-+			;;
-+		esac
- 
- 
- fi
-+	ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_version" "ac_cv_have_decl_gnutls_x509_crt_set_version" "
-+	#include <gnutls/gnutls.h>
-+	#include <gnutls/x509.h>
-+
-+"
-+if test "x$ac_cv_have_decl_gnutls_x509_crt_set_version" = x""yes; then :
-+
-+$as_echo "#define HAVE_GNUTLS_X509_CRT_SET_VERSION 1" >>confdefs.h
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum_t" >&5
--$as_echo "$ac_cv_type_gnutls_datum_t" >&6; }
--if test "x$ac_cv_type_gnutls_datum_t" = x""yes; then
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_GNUTLS_DATUM_T 1
--_ACEOF
-+	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+GNUTLS_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"GNUTLS\"} = \"YES\";"
-+
-+		ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_subject_key_id" "ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" "
-+	#include <gnutls/gnutls.h>
-+	#include <gnutls/x509.h>
-+
-+"
-+if test "x$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" = x""yes; then :
- 
-+$as_echo "#define HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID 1" >>confdefs.h
- 
- fi
- 
-+	fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_GNUTLS 1
--_ACEOF
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+GNUTLS_LIBS = $GNUTLS_LIBS
-+GNUTLS_CFLAGS =
-+GNUTLS_CPPFLAGS =
-+GNUTLS_LDFLAGS =
-+"
- 
- 
--for ac_header in gcrypt.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>
-+if test x$use_gnutls = xyes; then
-+	#Some older versions have a different type name
-+	ac_fn_c_check_type "$LINENO" "gnutls_datum" "ac_cv_type_gnutls_datum" "#include \"gnutls/gnutls.h\"
-+"
-+if test "x$ac_cv_type_gnutls_datum" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_DATUM 1
- _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; }
-+	ac_fn_c_check_type "$LINENO" "gnutls_datum_t" "ac_cv_type_gnutls_datum_t" "#include \"gnutls/gnutls.h\"
-+"
-+if test "x$ac_cv_type_gnutls_datum_t" = x""yes; then :
- 
--# 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>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_DATUM_T 1
- _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; }
-+$as_echo "#define ENABLE_GNUTLS 1" >>confdefs.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 gcrypt.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gcrypt_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_GCRYPT_H 1
- _ACEOF
- 
- fi
-@@ -102055,23 +45503,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lgcrypt $GCRYPT_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for gcry_control in -lgcrypt" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_control in -lgcrypt" >&5
- $as_echo_n "checking for gcry_control in -lgcrypt... " >&6; }
--if test "${ac_cv_lib_ext_gcrypt_gcry_control+set}" = set; then
-+if test "${ac_cv_lib_ext_gcrypt_gcry_control+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102089,54 +45531,28 @@
-   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_ext_gcrypt_gcry_control=yes;
- 		  ac_cv_lib_ext_gcrypt=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_gcrypt_gcry_control=no;
-+  ac_cv_lib_ext_gcrypt_gcry_control=no;
- 		  ac_cv_lib_ext_gcrypt=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_lib_ext_gcrypt_gcry_control" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_gcrypt_gcry_control" >&5
- $as_echo "$ac_cv_lib_ext_gcrypt_gcry_control" >&6; }
--    if test $ac_cv_lib_ext_gcrypt_gcry_control = yes; then
-+    if test $ac_cv_lib_ext_gcrypt_gcry_control = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GCRY_CONTROL 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_gcrypt = yes; then
-+if test $ac_cv_lib_ext_gcrypt = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGCRYPT 1
- _ACEOF
-@@ -102152,7 +45568,6 @@
- 
- fi
- 
--
- MAKE_SETTINGS="$MAKE_SETTINGS
- GCRYPT_LIBS = $GCRYPT_LIBS
- GCRYPT_CFLAGS =
-@@ -102169,7 +45584,7 @@
- 
- use_netapi=auto
- # Check whether --enable-netapi was given.
--if test "${enable_netapi+set}" = set; then
-+if test "${enable_netapi+set}" = set; then :
-   enableval=$enable_netapi; if test x$enable_netapi = xno; then
-         use_netapi=no
-     fi
-@@ -102191,151 +45606,12 @@
- \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
- 
- if test x$use_netapi != xno; then
--
--for ac_header in netapi.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 netapi.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "netapi.h" "ac_cv_header_netapi_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netapi_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_NETAPI_H 1
- _ACEOF
- 
- fi
-@@ -102344,23 +45620,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for libnetapi_init in -lnetapi" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnetapi_init in -lnetapi" >&5
- $as_echo_n "checking for libnetapi_init in -lnetapi... " >&6; }
--if test "${ac_cv_lib_ext_netapi_libnetapi_init+set}" = set; then
-+if test "${ac_cv_lib_ext_netapi_libnetapi_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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102378,54 +45648,28 @@
-   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_ext_netapi_libnetapi_init=yes;
- 		  ac_cv_lib_ext_netapi=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_netapi_libnetapi_init=no;
-+  ac_cv_lib_ext_netapi_libnetapi_init=no;
- 		  ac_cv_lib_ext_netapi=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_lib_ext_netapi_libnetapi_init" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_libnetapi_init" >&5
- $as_echo "$ac_cv_lib_ext_netapi_libnetapi_init" >&6; }
--    if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then
-+    if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI_INIT 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_netapi = yes; then
-+if test $ac_cv_lib_ext_netapi = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI 1
- _ACEOF
-@@ -102442,24 +45686,17 @@
- fi
- 
- 
--
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for NetUserModalsGet in -lnetapi" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserModalsGet in -lnetapi" >&5
- $as_echo_n "checking for NetUserModalsGet in -lnetapi... " >&6; }
--if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+set}" = set; then
-+if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102477,54 +45714,28 @@
-   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_ext_netapi_NetUserModalsGet=yes;
- 		  ac_cv_lib_ext_netapi=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_netapi_NetUserModalsGet=no;
-+  ac_cv_lib_ext_netapi_NetUserModalsGet=no;
- 		  ac_cv_lib_ext_netapi=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_lib_ext_netapi_NetUserModalsGet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserModalsGet" >&5
- $as_echo "$ac_cv_lib_ext_netapi_NetUserModalsGet" >&6; }
--    if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then
-+    if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_NETUSERMODALSGET 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_netapi = yes; then
-+if test $ac_cv_lib_ext_netapi = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI 1
- _ACEOF
-@@ -102541,24 +45752,17 @@
- fi
- 
- 
--
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for NetUserGetGroups in -lnetapi" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetGroups in -lnetapi" >&5
- $as_echo_n "checking for NetUserGetGroups in -lnetapi... " >&6; }
--if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+set}" = set; then
-+if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102576,54 +45780,28 @@
-   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_ext_netapi_NetUserGetGroups=yes;
- 		  ac_cv_lib_ext_netapi=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_netapi_NetUserGetGroups=no;
-+  ac_cv_lib_ext_netapi_NetUserGetGroups=no;
- 		  ac_cv_lib_ext_netapi=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_lib_ext_netapi_NetUserGetGroups" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetGroups" >&5
- $as_echo "$ac_cv_lib_ext_netapi_NetUserGetGroups" >&6; }
--    if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then
-+    if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_NETUSERGETGROUPS 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_netapi = yes; then
-+if test $ac_cv_lib_ext_netapi = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI 1
- _ACEOF
-@@ -102640,24 +45818,17 @@
- fi
- 
- 
--
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for NetUserGetInfo in -lnetapi" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetInfo in -lnetapi" >&5
- $as_echo_n "checking for NetUserGetInfo in -lnetapi... " >&6; }
--if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+set}" = set; then
-+if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102675,54 +45846,28 @@
-   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_ext_netapi_NetUserGetInfo=yes;
- 		  ac_cv_lib_ext_netapi=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_netapi_NetUserGetInfo=no;
-+  ac_cv_lib_ext_netapi_NetUserGetInfo=no;
- 		  ac_cv_lib_ext_netapi=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_lib_ext_netapi_NetUserGetInfo" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetInfo" >&5
- $as_echo "$ac_cv_lib_ext_netapi_NetUserGetInfo" >&6; }
--    if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then
-+    if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_NETUSERGETINFO 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_netapi = yes; then
-+if test $ac_cv_lib_ext_netapi = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI 1
- _ACEOF
-@@ -102739,24 +45884,17 @@
- fi
- 
- 
--
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for NetUserSetInfo in -lnetapi" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserSetInfo in -lnetapi" >&5
- $as_echo_n "checking for NetUserSetInfo in -lnetapi... " >&6; }
--if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+set}" = set; then
-+if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -102774,54 +45912,28 @@
-   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_ext_netapi_NetUserSetInfo=yes;
- 		  ac_cv_lib_ext_netapi=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_netapi_NetUserSetInfo=no;
-+  ac_cv_lib_ext_netapi_NetUserSetInfo=no;
- 		  ac_cv_lib_ext_netapi=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_lib_ext_netapi_NetUserSetInfo" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserSetInfo" >&5
- $as_echo "$ac_cv_lib_ext_netapi_NetUserSetInfo" >&6; }
--    if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then
-+    if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_NETUSERSETINFO 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_netapi = yes; then
-+if test $ac_cv_lib_ext_netapi = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNETAPI 1
- _ACEOF
-@@ -102836,12 +45948,9 @@
- 
- 
- fi
--
- 	if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then
- 
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_LIBNETAPI 1
--_ACEOF
-+$as_echo "#define ENABLE_LIBNETAPI 1" >>confdefs.h
- 
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102859,9 +45968,7 @@
- 
- 	else
- 		if test x$use_netapi != xauto; then
--			{ { $as_echo "$as_me:$LINENO: error: --enable-netapi: libnetapi not found" >&5
--$as_echo "$as_me: error: --enable-netapi: libnetapi not found" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "--enable-netapi: libnetapi not found" "$LINENO" 5
- 		fi
- 	fi
- 
-@@ -102902,19 +46009,17 @@
- 
- #################################################
- # check for pthread support
--{ $as_echo "$as_me:$LINENO: checking whether to use pthreads" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use pthreads" >&5
- $as_echo_n "checking whether to use pthreads... " >&6; }
- 
- # Check whether --with-pthreads was given.
--if test "${with_pthreads+set}" = set; then
-+if test "${with_pthreads+set}" = set; then :
-   withval=$with_pthreads;  case "$withval" in
- 	yes)
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$ac_cv_func_pread" != x"yes" -o x"$ac_cv_func_pwrite" != x"yes";then
--			{ { $as_echo "$as_me:$LINENO: error: You cannot enable threads when you don't have pread/pwrite!" >&5
--$as_echo "$as_me: error: You cannot enable threads when you don't have pread/pwrite!" >&2;}
--   { (exit 1); exit 1; }; }
-+			as_fn_error "You cannot enable threads when you don't have pread/pwrite!" "$LINENO" 5
- 		fi
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102932,12 +46037,12 @@
- 
- 	;;
- 	*)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   esac
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
- fi
-@@ -102953,274 +46058,45 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to search for setproctitle support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to search for setproctitle support" >&5
- $as_echo_n "checking whether to search for setproctitle support... " >&6; }
- 
- # Check whether --with-setproctitle was given.
--if test "${with_setproctitle+set}" = set; then
-+if test "${with_setproctitle+set}" = set; then :
-   withval=$with_setproctitle;  case "$withval" in
- 	yes)
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--
--for ac_header in setproctitle.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 setproctitle.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "setproctitle.h" "ac_cv_header_setproctitle_h" "$ac_includes_default"
-+if test "x$ac_cv_header_setproctitle_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SETPROCTITLE_H 1
- _ACEOF
- 
- fi
- 
- done
- 
--		{ $as_echo "$as_me:$LINENO: checking for setproctitle" >&5
--$as_echo_n "checking for setproctitle... " >&6; }
--if test "${ac_cv_func_setproctitle+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 setproctitle to an innocuous variant, in case <limits.h> declares setproctitle.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define setproctitle innocuous_setproctitle
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char setproctitle (); 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 setproctitle
--
--/* 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 setproctitle ();
--/* 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_setproctitle || defined __stub___setproctitle
--choke me
--#endif
--
--int
--main ()
--{
--return setproctitle ();
--  ;
--  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_setproctitle=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_setproctitle=no
--fi
-+		ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-+if test "x$ac_cv_func_setproctitle" = x""yes; then :
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
--$as_echo "$ac_cv_func_setproctitle" >&6; }
--if test "x$ac_cv_func_setproctitle" = x""yes; then
--  :
- else
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lsetproctitle $SETPROCTITLE_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for setproctitle in -lsetproctitle" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lsetproctitle" >&5
- $as_echo_n "checking for setproctitle in -lsetproctitle... " >&6; }
--if test "${ac_cv_lib_ext_setproctitle_setproctitle+set}" = set; then
-+if test "${ac_cv_lib_ext_setproctitle_setproctitle+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -103238,54 +46114,28 @@
-   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_ext_setproctitle_setproctitle=yes;
- 		  ac_cv_lib_ext_setproctitle=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_setproctitle_setproctitle=no;
-+  ac_cv_lib_ext_setproctitle_setproctitle=no;
- 		  ac_cv_lib_ext_setproctitle=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_lib_ext_setproctitle_setproctitle" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_setproctitle_setproctitle" >&5
- $as_echo "$ac_cv_lib_ext_setproctitle_setproctitle" >&6; }
--    if test $ac_cv_lib_ext_setproctitle_setproctitle = yes; then
-+    if test $ac_cv_lib_ext_setproctitle_setproctitle = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_SETPROCTITLE 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_setproctitle = yes; then
-+if test $ac_cv_lib_ext_setproctitle = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSETPROCTITLE 1
- _ACEOF
-@@ -103301,15 +46151,14 @@
- 
- fi
- 
--
- fi
- 
--		{ $as_echo "$as_me:$LINENO: checking whether to use setproctitle" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use setproctitle" >&5
- $as_echo_n "checking whether to use setproctitle... " >&6; }
- 		if test x"$ac_cv_func_setproctitle" = x"yes" -o \
- 		   \( x"$ac_cv_header_setproctitle_h" = x"yes" -a \
- 		    x"$ac_cv_lib_ext_setproctitle_setproctitle" = x"yes" \) ; then
--			{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103319,22 +46168,20 @@
- \$enabled{\"SETPROCTITLE\"} = \"YES\";"
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SETPROCTITLE 1
--_ACEOF
-+$as_echo "#define HAVE_SETPROCTITLE 1" >>confdefs.h
- 
- 		else
--			{ $as_echo "$as_me:$LINENO: result: no" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		fi
- 	;;
- 	*)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
-   esac
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
- fi
-@@ -103352,238 +46199,68 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for tv_nsec nanosecond fields in struct stat" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec nanosecond fields in struct stat" >&5
- $as_echo_n "checking for tv_nsec nanosecond fields in struct stat... " >&6; }
--if test "${ac_cv_have_stat_tv_nsec+set}" = set; then
-+if test "${ac_cv_have_stat_tv_nsec+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- 
--int
--main ()
--{
--struct stat st;
-- st.st_mtim.tv_nsec;
-- st.st_atim.tv_nsec;
-- st.st_ctim.tv_nsec;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_decl_have_stat_tv_nsec=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_decl_have_stat_tv_nsec=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_stat_tv_nsec" >&5
--$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
--if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_TV_NSEC 1
--_ACEOF
--
--fi
--
--
--for ac_header in blkid/blkid.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; }
-+int
-+main ()
-+{
-+struct stat st;
-+ st.st_mtim.tv_nsec;
-+ st.st_atim.tv_nsec;
-+ st.st_ctim.tv_nsec;
- 
--# 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>
-+  ;
-+  return 0;
-+}
- _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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_decl_have_stat_tv_nsec=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_decl_have_stat_tv_nsec=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  ac_header_preproc=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_stat_tv_nsec" >&5
-+$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
-+if test x"$ac_cv_decl_have_stat_tv_nsec" = 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_STAT_TV_NSEC 1" >>confdefs.h
- 
--# 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 blkid/blkid.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "blkid/blkid.h" "ac_cv_header_blkid_blkid_h" "$ac_includes_default"
-+if test "x$ac_cv_header_blkid_blkid_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_BLKID_BLKID_H 1
- _ACEOF
- 
- fi
- 
- done
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing blkid_get_cache" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing blkid_get_cache" >&5
- $as_echo_n "checking for library containing blkid_get_cache... " >&6; }
--if test "${ac_cv_search_ext_blkid_get_cache+set}" = set; then
-+if test "${ac_cv_search_ext_blkid_get_cache+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- ac_func_search_ext_save_LIBS=$LIBS
- ac_cv_search_ext_blkid_get_cache=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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -103601,46 +46278,15 @@
-   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_search_ext_blkid_get_cache="none required"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_ext_blkid_get_cache" = no; then
-   for ac_lib in blkid; do
-     LIBS="-l$ac_lib $BLKID_LIBS  $ac_func_search_save_ext_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.
-@@ -103658,65 +46304,32 @@
-   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_search_ext_blkid_get_cache="-l$ac_lib"
- break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_ext_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ext_blkid_get_cache" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_blkid_get_cache" >&5
- $as_echo "$ac_cv_search_ext_blkid_get_cache" >&6; }
--if test "$ac_cv_search_ext_blkid_get_cache" != no; then
-+if test "$ac_cv_search_ext_blkid_get_cache" != no; then :
-   test "$ac_cv_search_ext_blkid_get_cache" = "none required" || BLKID_LIBS="$ac_cv_search_ext_blkid_get_cache $BLKID_LIBS"
- 
- fi
- 
- 
--
--
-     ac_check_func_ext_save_LIBS=$LIBS
-     LIBS="$BLKID_LIBS $LIBS"
--        { $as_echo "$as_me:$LINENO: checking for blkid_get_cache" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_get_cache" >&5
- $as_echo_n "checking for blkid_get_cache... " >&6; }
--if test "${ac_cv_func_ext_blkid_get_cache+set}" = set; then
-+if test "${ac_cv_func_ext_blkid_get_cache+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 blkid_get_cache to an innocuous variant, in case <limits.h> declares blkid_get_cache.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -103757,50 +46370,24 @@
-   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_blkid_get_cache=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_ext_blkid_get_cache=no
-+  ac_cv_func_ext_blkid_get_cache=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_blkid_get_cache" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_blkid_get_cache" >&5
- $as_echo "$ac_cv_func_ext_blkid_get_cache" >&6; }
-     LIBS=$ac_check_func_ext_save_LIBS
--    if test $ac_cv_func_ext_blkid_get_cache = yes; then
-+    if test $ac_cv_func_ext_blkid_get_cache = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_BLKID_GET_CACHE 1
- _ACEOF
- 
- fi
- 
--
- MAKE_SETTINGS="$MAKE_SETTINGS
- BLKID_LIBS = ${BLKID_LIBS}
- BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -103811,9 +46398,7 @@
- 
- if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBBLKID 1
--_ACEOF
-+$as_echo "#define HAVE_LIBBLKID 1" >>confdefs.h
- 
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103841,102 +46426,12 @@
- 
- fi
- 
--
- for ac_func in setgroups
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_func "$LINENO" "setgroups" "ac_cv_func_setgroups"
-+if test "x$ac_cv_func_setgroups" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SETGROUPS 1
- _ACEOF
- 
- fi
-@@ -103946,151 +46441,12 @@
- ###############################
- # start SMB_EXT_LIB_PAM
- # check for security/pam_appl.h and -lpam
--
- for ac_header in security/pam_appl.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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SECURITY_PAM_APPL_H 1
- _ACEOF
- 
- fi
-@@ -104099,23 +46455,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lpam $PAM_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
- $as_echo_n "checking for pam_start in -lpam... " >&6; }
--if test "${ac_cv_lib_ext_pam_pam_start+set}" = set; then
-+if test "${ac_cv_lib_ext_pam_pam_start+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -104133,54 +46483,28 @@
-   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_ext_pam_pam_start=yes;
- 		  ac_cv_lib_ext_pam=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_pam_pam_start=no;
-+  ac_cv_lib_ext_pam_pam_start=no;
- 		  ac_cv_lib_ext_pam=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_pam_pam_start" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_pam_pam_start" >&5
- $as_echo "$ac_cv_lib_ext_pam_pam_start" >&6; }
--    if test $ac_cv_lib_ext_pam_pam_start = yes; then
-+    if test $ac_cv_lib_ext_pam_pam_start = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_PAM_START 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_pam = yes; then
-+if test $ac_cv_lib_ext_pam = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPAM 1
- _ACEOF
-@@ -104195,7 +46519,6 @@
- 
- 
- fi
--
- 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
-@@ -104221,23 +46544,17 @@
- # test for where we get crypt() from
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lcrypt $CRYPT_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
- $as_echo_n "checking for crypt in -lcrypt... " >&6; }
--if test "${ac_cv_lib_ext_crypt_crypt+set}" = set; then
-+if test "${ac_cv_lib_ext_crypt_crypt+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -104255,54 +46572,28 @@
-   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_ext_crypt_crypt=yes;
- 		  ac_cv_lib_ext_crypt=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_crypt_crypt=no;
-+  ac_cv_lib_ext_crypt_crypt=no;
- 		  ac_cv_lib_ext_crypt=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_lib_ext_crypt_crypt" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_crypt_crypt" >&5
- $as_echo "$ac_cv_lib_ext_crypt_crypt" >&6; }
--    if test $ac_cv_lib_ext_crypt_crypt = yes; then
-+    if test $ac_cv_lib_ext_crypt_crypt = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_CRYPT 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_crypt = yes; then
-+if test $ac_cv_lib_ext_crypt = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBCRYPT 1
- _ACEOF
-@@ -104318,7 +46609,6 @@
- 
- fi
- 
--
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- CRYPT_ENABLE = YES
- "
-@@ -104335,102 +46625,12 @@
- 
- 
- 
--
--
--
- for ac_func in crypt16 getauthuid 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
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -104439,151 +46639,12 @@
- done
- 
- 
--
- for ac_header in sasl/sasl.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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sasl_sasl_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SASL_SASL_H 1
- _ACEOF
- 
- fi
-@@ -104592,23 +46653,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lsasl2 $SASL_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
- $as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
--if test "${ac_cv_lib_ext_sasl2_sasl_client_init+set}" = set; then
-+if test "${ac_cv_lib_ext_sasl2_sasl_client_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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -104626,54 +46681,28 @@
-   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_ext_sasl2_sasl_client_init=yes;
- 		  ac_cv_lib_ext_sasl2=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_sasl2_sasl_client_init=no;
-+  ac_cv_lib_ext_sasl2_sasl_client_init=no;
- 		  ac_cv_lib_ext_sasl2=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_lib_ext_sasl2_sasl_client_init" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
- $as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
--    if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then
-+    if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_SASL_CLIENT_INIT 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_sasl2 = yes; then
-+if test $ac_cv_lib_ext_sasl2 = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSASL2 1
- _ACEOF
-@@ -104689,7 +46718,6 @@
- 
- fi
- 
--
- 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
-@@ -104735,312 +46763,88 @@
-             ac_new_flags="$ac_new_flags$s$i";
-         else
-             ac_new_flags="$ac_new_flags$s$l $i";
--        fi
--        l=""
--        ;;
--    esac
--  done
--  SASL_LDFLAGS=$ac_new_flags
--
--
--  ac_new_flags=""
--  for i in $SASL_CPPFLAGS; do
--    case $i in
--    -I/usr/include|-I/usr/include/) ;;
--    *) ac_new_flags="$ac_new_flags $i" ;;
--    esac
--  done
--  SASL_CPPFLAGS=$ac_new_flags
--
--
--  ac_new_flags=""
--  for i in $SASL_CFLAGS; do
--    case $i in
--    -I/usr/include|-I/usr/include/) ;;
--    *) ac_new_flags="$ac_new_flags $i" ;;
--    esac
--  done
--  SASL_CFLAGS=$ac_new_flags
--
--else
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--cyrus_sasl_ENABLE = NO
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"cyrus_sasl\"} = \"NO\";"
--
--fi
--
--
--MAKE_SETTINGS="$MAKE_SETTINGS
--SASL_LIBS = $SASL_LIBS
--SASL_CFLAGS = ${SASL_CFLAGS}
--SASL_CPPFLAGS = ${SASL_CPPFLAGS}
--SASL_LDFLAGS = ${SASL_LDFLAGS}
--"
--
--
--
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--server_service_kdc_ENABLE = $HAVE_KRB5
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
--
--
--
--
--
--for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--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
-+        fi
-+        l=""
-+        ;;
-+    esac
-+  done
-+  SASL_LDFLAGS=$ac_new_flags
- 
--  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; }
-+  ac_new_flags=""
-+  for i in $SASL_CPPFLAGS; do
-+    case $i in
-+    -I/usr/include|-I/usr/include/) ;;
-+    *) ac_new_flags="$ac_new_flags $i" ;;
-+    esac
-+  done
-+  SASL_CPPFLAGS=$ac_new_flags
-+
-+
-+  ac_new_flags=""
-+  for i in $SASL_CFLAGS; do
-+    case $i in
-+    -I/usr/include|-I/usr/include/) ;;
-+    *) ac_new_flags="$ac_new_flags $i" ;;
-+    esac
-+  done
-+  SASL_CFLAGS=$ac_new_flags
- 
--# 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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+cyrus_sasl_ENABLE = NO
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"cyrus_sasl\"} = \"NO\";"
- 
- fi
- 
--done
- 
--{ $as_echo "$as_me:$LINENO: checking for inotify_init" >&5
--$as_echo_n "checking for inotify_init... " >&6; }
--if test "${ac_cv_func_inotify_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 inotify_init to an innocuous variant, in case <limits.h> declares inotify_init.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define inotify_init innocuous_inotify_init
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+SASL_LIBS = $SASL_LIBS
-+SASL_CFLAGS = ${SASL_CFLAGS}
-+SASL_CPPFLAGS = ${SASL_CPPFLAGS}
-+SASL_LDFLAGS = ${SASL_LDFLAGS}
-+"
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char inotify_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 inotify_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 inotify_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_inotify_init || defined __stub___inotify_init
--choke me
--#endif
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+server_service_kdc_ENABLE = $HAVE_KRB5
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
- 
--int
--main ()
--{
--return inotify_init ();
--  ;
--  return 0;
--}
-+
-+for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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 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_inotify_init=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_func_inotify_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
-+done
-+
-+ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
-+if test "x$ac_cv_func_inotify_init" = x""yes; then :
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inotify_init" >&5
--$as_echo "$ac_cv_func_inotify_init" >&6; }
- 
- 
-- { $as_echo "$as_me:$LINENO: checking for __NR_inotify_init declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __NR_inotify_init declaration" >&5
- $as_echo_n "checking for __NR_inotify_init declaration... " >&6; }
--if test "${ac_cv_have___NR_inotify_init_decl+set}" = set; then
-+if test "${ac_cv_have___NR_inotify_init_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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <asm/unistd.h>
- int
-@@ -105051,41 +46855,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_have___NR_inotify_init_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have___NR_inotify_init_decl=no
-+  ac_cv_have___NR_inotify_init_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have___NR_inotify_init_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___NR_inotify_init_decl" >&5
- $as_echo "$ac_cv_have___NR_inotify_init_decl" >&6; }
-  if test x"$ac_cv_have___NR_inotify_init_decl" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE___NR_INOTIFY_INIT_DECL 1
--_ACEOF
-+$as_echo "#define HAVE___NR_INOTIFY_INIT_DECL 1" >>confdefs.h
- 
-  fi
- 
-@@ -105129,17 +46910,13 @@
- fi
- 
- 
-- { $as_echo "$as_me:$LINENO: checking for F_SETLEASE declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F_SETLEASE declaration" >&5
- $as_echo_n "checking for F_SETLEASE declaration... " >&6; }
--if test "${ac_cv_have_F_SETLEASE_decl+set}" = set; then
-+if test "${ac_cv_have_F_SETLEASE_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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <fcntl.h>
- int
-@@ -105150,56 +46927,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 :
-   ac_cv_have_F_SETLEASE_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_F_SETLEASE_decl=no
-+  ac_cv_have_F_SETLEASE_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_F_SETLEASE_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_F_SETLEASE_decl" >&5
- $as_echo "$ac_cv_have_F_SETLEASE_decl" >&6; }
-  if test x"$ac_cv_have_F_SETLEASE_decl" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_F_SETLEASE_DECL 1
--_ACEOF
-+$as_echo "#define HAVE_F_SETLEASE_DECL 1" >>confdefs.h
- 
-  fi
- 
- 
-- { $as_echo "$as_me:$LINENO: checking for SA_SIGINFO declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SA_SIGINFO declaration" >&5
- $as_echo_n "checking for SA_SIGINFO declaration... " >&6; }
--if test "${ac_cv_have_SA_SIGINFO_decl+set}" = set; then
-+if test "${ac_cv_have_SA_SIGINFO_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
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <signal.h>
- int
-@@ -105210,41 +46960,18 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_have_SA_SIGINFO_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_SA_SIGINFO_decl=no
-+  ac_cv_have_SA_SIGINFO_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_SA_SIGINFO_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_SA_SIGINFO_decl" >&5
- $as_echo "$ac_cv_have_SA_SIGINFO_decl" >&6; }
-  if test x"$ac_cv_have_SA_SIGINFO_decl" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SA_SIGINFO_DECL 1
--_ACEOF
-+$as_echo "#define HAVE_SA_SIGINFO_DECL 1" >>confdefs.h
- 
-  fi
- 
-@@ -105268,151 +46995,12 @@
- 
- fi
- 
--
--
--
- for ac_header in nss.h nss_common.h ns_api.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
-+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
-@@ -105726,151 +47314,12 @@
- 
- 
- 
--
- for ac_header in zlib.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to 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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_ZLIB_H 1
- _ACEOF
- 
- fi
-@@ -105880,23 +47329,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lz $ZLIB_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
- $as_echo_n "checking for zlibVersion in -lz... " >&6; }
--if test "${ac_cv_lib_ext_z_zlibVersion+set}" = set; then
-+if test "${ac_cv_lib_ext_z_zlibVersion+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -105914,54 +47357,28 @@
-   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_ext_z_zlibVersion=yes;
- 		  ac_cv_lib_ext_z=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_z_zlibVersion=no;
-+  ac_cv_lib_ext_z_zlibVersion=no;
- 		  ac_cv_lib_ext_z=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_lib_ext_z_zlibVersion" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_z_zlibVersion" >&5
- $as_echo "$ac_cv_lib_ext_z_zlibVersion" >&6; }
--    if test $ac_cv_lib_ext_z_zlibVersion = yes; then
-+    if test $ac_cv_lib_ext_z_zlibVersion = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_ZLIBVERSION 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_z = yes; then
-+if test $ac_cv_lib_ext_z = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBZ 1
- _ACEOF
-@@ -105977,18 +47394,13 @@
- 
- fi
- 
--
--{ $as_echo "$as_me:$LINENO: checking for zlib >= 1.2.3" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.3" >&5
- $as_echo_n "checking for zlib >= 1.2.3... " >&6; }
--if test "${samba_cv_zlib_1_2_3+set}" = set; then
-+if test "${samba_cv_zlib_1_2_3+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 <zlib.h>
-@@ -106006,40 +47418,19 @@
-   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_zlib_1_2_3=yes
- 
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- 
- 		samba_cv_zlib_1_2_3=no
- 
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_zlib_1_2_3" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_zlib_1_2_3" >&5
- $as_echo "$samba_cv_zlib_1_2_3" >&6; }
- 
- if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -106061,7 +47452,7 @@
- 
- 
  # Check whether --enable-dmalloc was given.
 -if test "${enable_dmalloc+set}" = set; then
 +if test "${enable_dmalloc+set}" = set; then :
    enableval=$enable_dmalloc;
  fi
  
-@@ -106069,14 +47460,10 @@
+@@ -90414,14 +40771,10 @@
  if test "x$enable_dmalloc" = xyes
  then
  
@@ -109777,7 +96024,7 @@
  
  	LIBS="$LIBS -ldmalloc"
  fi
-@@ -106174,87 +47561,54 @@
+@@ -90519,87 +40872,54 @@
  #################################################
  # Display summary of libraries detected
  
@@ -109881,7 +96128,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
-@@ -106313,13 +47667,13 @@
+@@ -90645,13 +40965,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -109897,7 +96144,7 @@
        esac ;;
      esac
    done
-@@ -106327,8 +47681,8 @@
+@@ -90659,8 +40979,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -109908,7 +96155,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -106351,11 +47705,11 @@
+@@ -90683,11 +41003,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" &&
@@ -109922,7 +96169,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -106375,8 +47729,8 @@
+@@ -90707,8 +41027,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.
@@ -109933,7 +96180,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -106400,9 +47754,10 @@
+@@ -90722,9 +41042,10 @@
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -109946,7 +96193,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -106412,17 +47767,18 @@
+@@ -90734,17 +41055,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -109972,7 +96219,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -106430,23 +47786,15 @@
+@@ -90752,23 +41074,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -110001,7 +96248,7 @@
  as_nl='
  '
  export as_nl
-@@ -106454,7 +47802,13 @@
+@@ -90776,7 +41090,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
@@ -110016,7 +96263,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -106465,7 +47819,7 @@
+@@ -90787,7 +41107,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -110025,7 +96272,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -106488,13 +47842,6 @@
+@@ -90810,13 +41130,6 @@
    }
  fi
  
@@ -110039,7 +96286,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -106504,15 +47851,15 @@
+@@ -90826,15 +41139,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -110058,7 +96305,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -106524,12 +47871,16 @@
+@@ -90846,12 +41159,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -110079,7 +96326,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -106541,7 +47892,89 @@
+@@ -90863,7 +41180,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -110170,7 +96417,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -106555,8 +47988,12 @@
+@@ -90877,8 +41276,12 @@
    as_basename=false
  fi
  
@@ -110184,7 +96431,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -106576,76 +48013,25 @@
+@@ -90898,76 +41301,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -110272,7 +96519,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -106674,8 +48060,56 @@
+@@ -90996,8 +41348,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -110330,7 +96577,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -106694,10 +48128,10 @@
+@@ -91016,10 +41416,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -110343,7 +96590,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -106712,13 +48146,19 @@
+@@ -91034,13 +41434,19 @@
  
  
  exec 6>&1
@@ -110365,7 +96612,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -106750,13 +48190,15 @@
+@@ -91072,13 +41478,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -110384,7 +96631,7 @@
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -106775,16 +48217,17 @@
+@@ -91097,16 +41505,17 @@
  Configuration commands:
  $config_commands
  
@@ -110406,7 +96653,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -106819,6 +48262,8 @@
+@@ -91141,6 +41550,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -110415,7 +96662,7 @@
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -106826,20 +48271,19 @@
+@@ -91148,20 +41559,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -110440,7 +96687,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -106847,11 +48291,10 @@
+@@ -91169,11 +41579,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -110455,7 +96702,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -106944,9 +48387,7 @@
+@@ -91248,9 +41657,7 @@
      "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
      "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
  
@@ -110466,7 +96713,7 @@
    esac
  done
  
-@@ -106973,7 +48414,7 @@
+@@ -91277,7 +41684,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -110475,7 +96722,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -106984,11 +48425,7 @@
+@@ -91288,11 +41695,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -110488,7 +96735,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -106996,10 +48433,16 @@
+@@ -91300,10 +41703,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -110508,7 +96755,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -107013,24 +48456,18 @@
+@@ -91317,24 +41726,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -110536,7 +96783,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -107052,7 +48489,7 @@
+@@ -91356,7 +41759,7 @@
  t delim
  :nl
  h
@@ -110545,7 +96792,7 @@
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -107066,7 +48503,7 @@
+@@ -91370,7 +41773,7 @@
  t nl
  :delim
  h
@@ -110554,7 +96801,7 @@
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -107119,9 +48556,7 @@
+@@ -91423,9 +41826,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -110565,7 +96812,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -107162,9 +48597,7 @@
+@@ -91466,9 +41867,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -110576,7 +96823,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -107249,9 +48682,7 @@
+@@ -91553,9 +41952,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -110587,7 +96834,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -107264,9 +48695,7 @@
+@@ -91568,9 +41965,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -110598,7 +96845,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -107294,12 +48723,10 @@
+@@ -91598,12 +41993,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -110613,7 +96860,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -107310,7 +48737,7 @@
+@@ -91614,7 +42007,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -110622,7 +96869,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -107323,9 +48750,7 @@
+@@ -91627,9 +42020,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -110633,7 +96880,7 @@
      esac
      ;;
    esac
-@@ -107353,47 +48778,7 @@
+@@ -91657,47 +42048,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -110682,7 +96929,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -107445,7 +48830,6 @@
+@@ -91749,7 +42100,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=
@@ -110690,7 +96937,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -107455,12 +48839,11 @@
+@@ -91759,12 +42109,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -110705,7 +96952,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
-@@ -107470,7 +48853,7 @@
+@@ -91774,7 +42123,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -110714,7 +96961,7 @@
  esac
  _ACEOF
  
-@@ -107498,14 +48881,12 @@
+@@ -91802,14 +42151,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -110731,7 +96978,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;}
-@@ -107515,9 +48896,7 @@
+@@ -91819,9 +42166,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -110742,7 +96989,7 @@
   ;;
    :H)
    #
-@@ -107528,29 +48907,23 @@
+@@ -91832,29 +42177,23 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -110777,7 +97024,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -107576,15 +48949,12 @@
+@@ -91875,15 +42214,12 @@
  done # for ac_tag
  
  
@@ -110795,7 +97042,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -107605,10 +48975,10 @@
+@@ -91904,10 +42240,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.
@@ -110808,7 +97055,7 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-@@ -107619,8 +48989,8 @@
+@@ -91916,8 +42252,8 @@
  # Print very concise instructions on building/use
  if test "x$enable_dmalloc" = xyes
  then

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

Modified: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2010-08-03 23:30:47 UTC (rev 3552)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2010-08-03 23:34:48 UTC (rev 3553)
@@ -6,13 +6,13 @@
 Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
 Forwarded: yes
 
-Index: experimental/source3/smbd/server.c
+Index: samba-3.6.0pre1/source3/smbd/server_reload.c
 ===================================================================
---- experimental.orig/source3/smbd/server.c
-+++ experimental/source3/smbd/server.c
-@@ -710,6 +710,10 @@
- 	int pnum = lp_servicenumber(PRINTERS_NAME);
- 	const char *pname;
+--- samba-3.6.0pre1.orig/source3/smbd/server_reload.c
++++ samba-3.6.0pre1/source3/smbd/server_reload.c
+@@ -39,6 +39,10 @@
+ 	NTSTATUS status;
+ 	bool skip = false;
  
 +	if (!lp_load_printers()
 +	    && (lp_auto_services() == NULL || !strcmp(lp_auto_services(),"")))
@@ -20,4 +20,4 @@
 +
  	pcap_cache_reload();
  
- 	/* remove stale printers */
+ 	status = make_server_info_system(talloc_tos(), &server_info);

Modified: branches/samba/experimental/debian/patches/smbtar-bashism.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbtar-bashism.patch	2010-08-03 23:30:47 UTC (rev 3552)
+++ branches/samba/experimental/debian/patches/smbtar-bashism.patch	2010-08-03 23:34:48 UTC (rev 3553)
@@ -3,10 +3,10 @@
 Bug-Debian: http://bugs.debian.org/486056
 Forwarded: no
 
-Index: experimental/source3/script/smbtar
+Index: samba-3.6.0pre1/source3/script/smbtar
 ===================================================================
---- experimental.orig/source3/script/smbtar
-+++ experimental/source3/script/smbtar
+--- samba-3.6.0pre1.orig/source3/script/smbtar
++++ samba-3.6.0pre1/source3/script/smbtar
 @@ -151,7 +151,7 @@
  if [ -z "$verbose" ]; then
        echo "server    is $server"





More information about the Pkg-samba-maint mailing list