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

bubulle at alioth.debian.org bubulle at alioth.debian.org
Sat May 29 17:38:34 UTC 2010


Author: bubulle
Date: 2010-05-29 17:38:30 +0000 (Sat, 29 May 2010)
New Revision: 3499

Modified:
   branches/samba/experimental/debian/patches/autoconf.patch
Log:
Regenerate autoconf.patch


Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch	2010-05-24 17:08:06 UTC (rev 3498)
+++ branches/samba/experimental/debian/patches/autoconf.patch	2010-05-29 17:38:30 UTC (rev 3499)
@@ -7066,7 +7066,7 @@
  _ACEOF
  
  
-@@ -7521,30401 +6403,2005 @@
+@@ -7521,31415 +6403,2192 @@
  # 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.
@@ -7508,7 +7508,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_short" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -7526,39 +7526,17 @@
 -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"
-+
-+
-+
-+
-+
-+
-+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
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
- 
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
- 
- 
+-
+-
+-
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_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]];'.
@@ -7582,8 +7560,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 -test_array [0] = 0
-+TEVENT_CFLAGS="-I$teventdir"
- 
+-
 -  ;
 -  return 0;
 -}
@@ -7620,21 +7597,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,31 +7624,24 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
- 
+-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.  */
@@ -7691,7 +7651,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -7728,9 +7688,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 -test_array [0] = 0
-+fi
-+done
- 
+-
 -  ;
 -  return 0;
 -}
@@ -7757,33 +7715,27 @@
 -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
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
- 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
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=tevent.exports
- 
+-
 -	ac_lo= ac_hi=
- 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
@@ -7800,7 +7752,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -7827,28 +7779,10 @@
 -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
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -7880,7 +7814,7 @@
 -int
 -main ()
 -{
- 
+-
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -7901,7 +7835,7 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
- 
+-
 -  ;
 -  return 0;
 -}
@@ -7933,7 +7867,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
@@ -7954,14 +7888,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]];'.
@@ -7985,7 +7919,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8022,7 +7956,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8049,7 +7983,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=
@@ -8057,13 +7991,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
@@ -8076,7 +8010,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8113,7 +8047,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8140,7 +8074,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=
@@ -8148,19 +8082,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
@@ -8177,7 +8111,7 @@
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8204,10 +8138,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
@@ -8239,7 +8173,7 @@
 -int
 -main ()
 -{
- 
+-
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -8260,7 +8194,7 @@
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
- 
+-
 -  ;
 -  return 0;
 -}
@@ -8292,7 +8226,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_long" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -8313,15 +8247,15 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 -$as_echo "$ac_cv_sizeof_long_long" >&6; }
- 
- 
- 
+-
+-
+-
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 -_ACEOF
- 
- 
- 
+-
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
 -$as_echo_n "checking for uint_t... " >&6; }
 -if test "${ac_cv_type_uint_t+set}" = set; then
@@ -8400,18 +8334,18 @@
 -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
@@ -8419,13 +8353,13 @@
 -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 +8438,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 +8457,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 +8542,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 +8561,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 +8646,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 +8750,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 +8856,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 +8875,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 +8960,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 +8979,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 +9032,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 +9042,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 +9062,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 +9084,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 +9112,7 @@
 -  ;
 -  return 0;
 -}
-+
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -12395,14 +12206,13 @@
 -fi
 -
 -
--LD=ld
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-{ $as_echo "$as_me:$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
 -  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-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_prog_gnu_ld=no
@@ -12413,7 +12223,7 @@
 -
 -
 -if test "$ac_cv_prog_gnu_ld" = "yes"; then
--	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
+-	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1`
 -	{ $as_echo "$as_me:$LINENO: checking GNU ld release date" >&5
 -$as_echo_n "checking GNU ld release date... " >&6; }
 -		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'`
@@ -29690,6 +29500,144 @@
 -fi
 -fi
 -
+-{ $as_echo "$as_me:$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
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h> /* for NULL */
+-#include <sys/socket.h>
+-#include <sys/types.h>
+-#include <netdb.h>
+-#include <netinet/in.h>
+-
+-int
+-main ()
+-{
+-
+-#ifndef IPV6_V6ONLY
+-#error no IPV6_V6ONLY
+-#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
+-
+-		libreplace_cv_HAVE_IPV6_V6ONLY=yes
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-		libreplace_cv_HAVE_IPV6_V6ONLY=no
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:$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:$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.  */
+-
+-	#include <linux/in6.h>
+-
+-int
+-main ()
+-{
+-
+-	#if (IPV6_V6ONLY != 26)
+-	#error no linux IPV6_V6ONLY
+-	#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
+-
+-		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:$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
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_IPV6_V6ONLY_26 1
+-_ACEOF
+-
+-	fi
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for ipv6 support" >&5
 -$as_echo_n "checking for ipv6 support... " >&6; }
 -if test "${libreplace_cv_HAVE_IPV6+set}" = set; then
@@ -29723,6 +29671,14 @@
 -	const char *es = gai_strerror(ret);
 -}
 -freeaddrinfo(ai);
+-{
+-	int val = 1;
+-	#ifdef HAVE_LINUX_IPV6_V6ONLY_26
+-	#define IPV6_V6ONLY 26
+-	#endif
+-	ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+-			 (const void *)&val, sizeof(val));
+-}
 -
 -  ;
 -  return 0;
@@ -35021,13 +34977,11 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -( exit $ac_status )
 -if test "$ac_cv_type_short" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -35040,26 +34994,24 @@
 -   else
 -     ac_cv_sizeof_short=0
 -   fi
-+  samba_cv_HAVE_Werror_implicit_function_declaration=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
 -rm -f conftest.val
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
--
--
--
++echo "LIBREPLACE_CC_CHECKS: END"
+ 
+ 
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
--
--
--
+ 
+ 
+ 
 -{ $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
@@ -35071,7 +35023,20 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++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
+ 
 -int
 -main ()
 -{
@@ -35099,7 +35064,10 @@
 -  { /* SCO 3.2v4 cc rejects this.  */
 -    char *t;
 -    char const *s = 0 ? (char *) 0 : (char const *) 0;
--
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
+ 
 -    *t++ = 0;
 -    if (s) return 0;
 -  }
@@ -35128,7 +35096,22 @@
 -  ;
 -  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
@@ -35151,43 +35134,29 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
  
 -	ac_cv_c_const=no
--fi
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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
-+{ $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
++done
  
 -cat >>confdefs.h <<\_ACEOF
 -#define const /**/
--_ACEOF
-+	# krb5developer is like developer, except we don't get
-+	# -Wstrict-prototypes.
-+       if test x"$krb5_developer" != x"$yes" ; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+       fi
++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
  
-+       if test x"$picky_developer" = x"yes"; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+       fi
  fi
++done
  
 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
 -$as_echo_n "checking for inline... " >&6; }
@@ -35207,7 +35176,9 @@
 -static $ac_kw foo_t static_foo () {return 0; }
 -$ac_kw foo_t foo () {return 0; }
 -#endif
--
++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"
+ 
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -35231,36 +35202,38 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+#################################################
-+# 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 "#define HAVE_EPOLL 1" >>confdefs.h
++
++fi
  
-+# 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; }
++if test x"$VERSIONSCRIPT" != "x"; then
++    EXPORTSFILE=tevent.exports
  
--fi
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  test "$ac_cv_c_inline" != no && break
--done
-+    samba_cv_WITH_PROFILE=yes
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    samba_cv_WITH_PROFILE=no
-+    ;;
-+  esac
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++
++
++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_c_inline" >&5
 -$as_echo "$ac_cv_c_inline" >&6; }
@@ -35280,21 +35253,13 @@
 -_ACEOF
 -    ;;
 -esac
-+merged_build_possible=yes
  
  
 - { $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
-+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_c_bigendian=unknown
 -    # See if we're dealing with a universal compiler.
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -35307,7 +35272,7 @@
 -	       not a universal capable compiler
 -	     #endif
 -	     typedef int dummy;
--
+ 
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -35327,23 +35292,6 @@
 -	 test -z "$ac_c_werror_flag" ||
 -	 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
-+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
  
 -	# Check for potential -arch flags.  It is not universal unless
 -	# there are some -arch flags.  Note that *ppc* also matches
@@ -35351,23 +35299,12 @@
 -	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
 -	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
 -	esac
-+fi
-+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
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    if test $ac_cv_c_bigendian = unknown; then
@@ -35380,7 +35317,6 @@
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -	     #include <sys/param.h>
-+# Check for GNU make
  
 -int
 -main ()
@@ -35461,50 +35397,13 @@
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
+-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
  
-+  ;;
-+esac
-+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:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
  
+-fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    fi
 -    if test $ac_cv_c_bigendian = unknown; then
@@ -35516,7 +35415,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
--
+ 
 -int
 -main ()
 -{
@@ -35554,8 +35453,6 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
-+  test -n "$MAKE" && break
-+done
  
 -int
 -main ()
@@ -35587,36 +35484,21 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_bigendian=yes
-+{ $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
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_c_bigendian=no
-+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
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+	merged_build_possible=no
- fi
  
+ 
+-fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    fi
 -    if test $ac_cv_c_bigendian = unknown; then
@@ -35685,7 +35567,6 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Check for perl
  
  
 -fi
@@ -35739,100 +35620,21 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_bigendian=no
-+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: program exited with status $ac_status" >&5
 -$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
  
 -( exit $ac_status )
 -ac_cv_c_bigendian=yes
-+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+  ;;
-+esac
- 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
-+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:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
  
  
 -    fi
-+		;;
-+	*)
-+		# 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
-+  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
-+
-+  ;;
-+esac
-+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; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -$as_echo "$ac_cv_c_bigendian" >&6; }
 - case $ac_cv_c_bigendian in #(
@@ -35857,33 +35659,13 @@
 - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 -   { (exit 1); exit 1; }; } ;;
 - esac
-+		;;
-+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
-+else
-+	if test x"$debug" = x"yes";then
-+		PERL="$PERL -W"
-+	fi
-+	export PERL
-+	true
-+fi
  
  
 -{ $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
-+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
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -35896,7 +35678,7 @@
 -{
 -static int test_array [1 - 2 * !(((char) -1) < 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -35920,61 +35702,30 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_char_unsigned=no
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # 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_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
- fi
--
+-fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$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
 -  cat >>confdefs.h <<\_ACEOF
 -#define __CHAR_UNSIGNED__ 1
 -_ACEOF
--
-+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
  
+-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
-+fi
-+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
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -35983,7 +35734,7 @@
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -#include <signal.h>
--
+ 
 -int
 -main ()
 -{
@@ -36011,70 +35762,52 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_type_signal=int
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_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
  
 -	ac_cv_type_signal=void
++
++
++
++
++
++
++
++
++
++
++
++# 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
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++  enableval=$enable_socket_wrapper;
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 -$as_echo "$ac_cv_type_signal" >&6; }
-+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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define RETSIGTYPE $ac_cv_type_signal
 -_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
  
  
 -{ $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
-+LD=ld
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${ac_cv_prog_gnu_ld+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -36087,125 +35820,69 @@
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "uid_t" >/dev/null 2>&1; then
 -  ac_cv_type_uid_t=yes
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
- else
+-else
 -  ac_cv_type_uid_t=no
-+  ac_cv_prog_gnu_ld=no
- fi
+-fi
 -rm -f conftest*
--
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
+ 
++if eval "test x$developer = xyes"; then
++	enable_socket_wrapper=yes
  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
-+{ $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 test "$ac_cv_prog_gnu_ld" = "yes"; then
-+	ac_cv_gnu_ld_version=`$LD -v 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
-+fi
++if eval "test x$enable_socket_wrapper = xyes"; then
  
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
 -#define gid_t int
 -_ACEOF
++	DEFAULT_TEST_OPTIONS=--socket-wrapper
++	HAVE_SOCKET_WRAPPER=yes
  
-+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; }
++	# this is only used for samba3
++	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
  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
-+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
+-  $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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* 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
-+# 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
@@ -36233,19 +35910,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
@@ -36258,18 +35929,21 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_type_mode_t=yes
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
+ 
+ 
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++  enableval=$enable_nss_wrapper;
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
@@ -36277,13 +35951,16 @@
 -if test "x$ac_cv_type_mode_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define mode_t int
 -_ACEOF
--
--fi
--
++HAVE_NSS_WRAPPER=no
+ 
++if eval "test x$developer = xyes"; then
++	enable_nss_wrapper=yes
+ fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
 -$as_echo_n "checking for off_t... " >&6; }
 -if test "${ac_cv_type_off_t+set}" = set; then
@@ -36309,24 +35986,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
@@ -36354,21 +36020,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
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) 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
@@ -36378,50 +36036,27 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+  $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
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++if eval "test x$enable_nss_wrapper = xyes"; then
++
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
++
++	HAVE_NSS_WRAPPER=yes
+ 
 -	ac_cv_type_off_t=yes
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
++	# this is only used for samba3
++	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
  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; }
- 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; }
  
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
  
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
@@ -36429,26 +36064,19 @@
 -$as_echo "$ac_cv_type_off_t" >&6; }
 -if test "x$ac_cv_type_off_t" = x""yes; then
 -  :
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+      BROKEN_CC=
- else
--
+-else
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define off_t long int
 -_ACEOF
--
-+      BROKEN_CC=#
- fi
  
+-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 "$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
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_size_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -36522,44 +36150,32 @@
 -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_size_t=yes
--fi
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+	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
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
-+  int main(void)
-+  {
-+  	return 0;
-+  }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror=yes
-+else
-+  samba_cv_HAVE_Werror=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
- fi
+-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
@@ -36569,26 +36185,22 @@
 -cat >>confdefs.h <<_ACEOF
 -#define size_t unsigned int
 -_ACEOF
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
  
- fi
--
+-fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
 -$as_echo_n "checking for pid_t... " >&6; }
 -if test "${ac_cv_type_pid_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
-+$as_echo "$samba_cv_HAVE_Werror" >&6; }
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+   Werror_FLAGS="-Werror"
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
++    	DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
++	# Add -Wdeclaration-after-statement if compiler supports it
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  ac_cv_type_pid_t=no
 -cat >conftest.$ac_ext <<_ACEOF
@@ -36630,7 +36242,22 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	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.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36640,7 +36267,12 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -36660,87 +36292,84 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
-+$as_echo_n "checking that the C compiler understands -w2... " >&6; }
-+if test "${samba_cv_HAVE_w2+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_pid_t=yes
--fi
++  samba_cv_HAVE_Wdeclaration_after_statement=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -w2";
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
 +	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
 +	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
 +	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_w2=cross
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
-+  int main(void)
-+  {
-+  	return 0;
-+  }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_w2=yes
-+else
-+  samba_cv_HAVE_w2=no
+ 
  fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $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
++	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 pid_t int
 -_ACEOF
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
++	#-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
--
+-fi
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
 -$as_echo_n "checking for struct stat.st_rdev... " >&6; }
 -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+   Werror_FLAGS="-w2"
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Werror_implicit_function_declaration=cross
  else
 -  cat >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 ()
@@ -36771,11 +36400,7 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36784,21 +36409,7 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$CFLAGS -errwarn=%all";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_errwarn=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36809,11 +36420,10 @@
 -  ;
 -  return 0;
 -}
-+
-+   int main(void)
-+   {
-+	return 0;
-+   }
++	    int main(void)
++	    {
++	    	return 0;
++	    }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -36835,16 +36445,25 @@
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_errwarn=yes
++  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_errwarn=no
-+fi
+-
+-	ac_cv_member_struct_stat_st_rdev=no
++  samba_cv_HAVE_Werror_implicit_function_declaration=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
+ 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_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
 +	CFLAGS="$old_CFLAGS";
 +	old_CFLAGS="";
 +	export CFLAGS;
@@ -36855,85 +36474,35 @@
 +	old_LDFLAGS="";
 +	export LDFLAGS;
  
--	ac_cv_member_struct_stat_st_rdev=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+   Werror_FLAGS="-errwarn=%all"
-+fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
--$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
--if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
- 
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_STAT_ST_RDEV 1
 -_ACEOF
-+############################################
-+# 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;
-+		}
  
-+		return 0;
-+	}
++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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_ST_RDEV 1
- _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
++	# 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:${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
  
++#################################################
++# 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 d_off in dirent" >&5
 -$as_echo_n "checking for d_off in dirent... " >&6; }
@@ -36946,30 +36515,24 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++# 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; }
  
 -#include <unistd.h>
 -#include <sys/types.h>
 -#include <dirent.h>
-+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 ()
- {
+-int
+-main ()
+-{
 -struct dirent d; d.d_off;
-+ 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,61 +36552,67 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_dirent_d_off=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
++$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
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_dirent_d_off=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
+ 
+-	ac_cv_dirent_d_off=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_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
--
++merged_build_possible=yes
+ 
 -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_n "(cached) " >&6
--else
++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
 -  ac_cv_type_ssize_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+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 (ssize_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
@@ -37067,35 +36636,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 -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 ((ssize_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
@@ -37115,71 +36666,94 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++  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_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_ssize_t=yes
--fi
+ 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
++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
 -  $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
++fi
++
++
++  test -n "$AWK" && break
++done
++
++# Check for GNU make
+ 
+ 
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 -$as_echo "$ac_cv_type_ssize_t" >&6; }
 -if test "x$ac_cv_type_ssize_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define ssize_t int
 -_ACEOF
--
+ 
 -fi
--
+ 
 -{ $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
--else
++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_type_wchar_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 (wchar_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
@@ -37203,41 +36777,44 @@
 -_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 ((wchar_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
++  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
++
++  ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -37251,9 +36828,11 @@
 -	 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
++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
@@ -37262,142 +36841,134 @@
 +  { $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 conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
++  test -n "$MAKE" && break
++done
++
++
++{ $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
+ 
++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
-+if test "`uname`" = "HP-UX"; then
-+  if test "$ac_cv_c_compiler_gnu" = no; then
-+	# special override for broken HP-UX compiler - I can't find a way to test
-+	# this properly (its a compiler bug)
-+	CFLAGS="$CFLAGS -AC99";
-+	c99_init=yes;
-+  fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
 -$as_echo "$ac_cv_type_wchar_t" >&6; }
 -if test "x$ac_cv_type_wchar_t" = x""yes; then
 -  :
--else
++{ $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
++	merged_build_possible=no
++fi
  
 -cat >>confdefs.h <<_ACEOF
 -#define wchar_t unsigned short
 -_ACEOF
-+if test x"$c99_init" = x"yes"; then
-+    saved_CFLAGS=""
  
-+else
-+    CFLAGS="$saved_CFLAGS"
-+    saved_CFLAGS=""
-+    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
- fi
+-fi
++# Check for perl
  
  
 -############################################
 -# for cups support we need libcups, and a handful of header files
-+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
-+$as_echo_n "checking uname -s... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
-+$as_echo "${UNAME_S}" >&6; }
  
 -# Check whether --enable-cups was given.
 -if test "${enable_cups+set}" = set; then
 -  enableval=$enable_cups;
 -fi
-+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
-+$as_echo_n "checking uname -r... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
-+$as_echo "${UNAME_R}" >&6; }
  
-+UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
-+$as_echo_n "checking uname -m... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
-+$as_echo "${UNAME_M}" >&6; }
  
 -if test x$enable_cups != xno; then
 -	# Extract the first word of "cups-config", so it can be a program name with args.
 -set dummy cups-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++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_CUPS_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_path_PERL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  case $CUPS_CONFIG in
--  [\\/]* | ?:[\\/]*)
++  case $PERL in
+   [\\/]* | ?:[\\/]*)
 -  ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  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=.
++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
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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
--done
--IFS=$as_save_IFS
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
-+$as_echo_n "checking uname -p... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
-+$as_echo "${UNAME_P}" >&6; }
++  done
+ IFS=$as_save_IFS
  
--  ;;
-+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
-+	;;
++  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
+   ;;
  esac
--fi
+ fi
 -CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
 -if test -n "$CUPS_CONFIG"; then
 -  { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
 -$as_echo "$CUPS_CONFIG" >&6; }
--else
++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:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
-+DYNEXP=
  
-+LDSHFLAGS_Z_DEFS=
- 
+-
 -        if test "x$CUPS_CONFIG" != x; then
-+LDSHFLAGS_Z_NODEFS=
- 
+-
 -		ac_save_CFLAGS=$CFLAGS
 -		ac_save_LDFLAGS=$LDFLAGS
 -		ac_save_PRINT_LIBS=$PRINT_LIBS
 -		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 -		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
 -		PRINT_LIBS="$PRINT_LIBS -lcups"
- 
-+default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
- 
+-
+-
 -for ac_header in cups/cups.h cups/language.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37405,13 +36976,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
++		;;
++	*)
++		# 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
 -fi
 -ac_res=`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; }
@@ -37429,7 +37007,28 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++  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
++
++  ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -37443,34 +37042,23 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++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; }
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
- 
+-
 -	ac_header_compiler=no
-+if test "x$developer" = xyes; then
-+   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
-+   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+#
-+# Config CPPFLAG settings for strange OS's that must be set
-+# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
-+# case statement; its first reference must be unconditional.
-+#
-+case "$host_os" in
-+    *hpux*)
-+#
-+# Defines needed for HPUX support.
-+# HPUX has bigcrypt but (sometimes?) doesn't use it for
-+# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
-+#
-+      case `uname -r` in
-+		*9*|*10*|*11)
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -37487,7 +37075,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_cpp conftest.$ac_ext") 2>conftest.er1
@@ -37504,24 +37093,23 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
  
 -  ac_header_preproc=no
--fi
-+		;;
-+      esac
-+      ;;
++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
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+#
-+# CRAY Unicos has broken const handling
-+       *unicos*)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
-+$as_echo "disabling const" >&6; }
-+	  CPPFLAGS="$CPPFLAGS -Dconst="
-+	  ;;
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -37556,153 +37144,192 @@
 -{ $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
++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
 -  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; }
-+#
-+# 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"
++  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
  
--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 "#define _LARGE_FILES 1" >>confdefs.h
+-
++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
  
--fi
-+      ;;
-+#
-+# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
-+# to the existance of large files..
-+# Note that -D_LARGEFILE64_SOURCE is different from the Sun
-+# recommendations on large file support, however it makes the
-+# compile work using gcc 2.7 and 2.8, whereas using the Sun
-+# recommendation makes the compile fail on gcc2.7. JRA.
-+#
-+# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
-+#
-+	*solaris*)
- 
 -done
-+$as_echo "#define SYSV 1" >>confdefs.h
  
 -		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
 -		        x"$ac_cv_header_cups_language_h" = xyes; then
-+		case `uname -r` in
-+			5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
-+	  			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
-+$as_echo "no large file support" >&6; }
-+				;;
-+			5.*)
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+			if test "$ac_cv_c_compiler_gnu" = yes; then
-+				${CC-cc} -v >conftest.c 2>&1
-+				ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
-+				rm -fr conftest.c
-+				case "$ac_cv_gcc_compiler_version_number" in
-+					*"gcc version 2.6"*|*"gcc version 2.7"*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-+						LDFLAGS="$LDFLAGS -lthread"
++fi
++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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++fi
++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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -			samba_cv_HAVE_CUPS=yes
-+						;;
-+					*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+						LDFLAGS="$LDFLAGS -lthread"
++  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
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
++{ $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
++  # 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_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; }
  
 -ac_check_lib_ext_save_LIBS=$LIBS
 -LIBS="-lcups $PRINT_LIBS  $LIBS"
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
-+						;;
-+				esac
-+			else
-+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+				LDFLAGS="$LDFLAGS -lthread"
++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
++fi
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
  
 -        { $as_echo "$as_me:$LINENO: checking for httpConnectEncrypt in -lcups" >&5
 -$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
 -if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+set}" = set; then
--  $as_echo_n "(cached) " >&6
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+
-+			fi
-+			;;
-+		esac
-+		;;
-+#
-+# IRIX uses SYSV printing.  Make sure to set that here
-+#
-+	*irix*)
-+
-+$as_echo "#define SYSV 1" >>confdefs.h
-+
-+		;;
-+	*freebsd*|*dragonfly*)
-+
-+$as_echo "#define FREEBSD 1" >>confdefs.h
-+
-+		;;
-+#
-+# VOS may need to have POSIX support and System V compatibility enabled.
-+#
-+    *vos*)
-+    case "$CPPFLAGS" in
-+	  *-D_POSIX_C_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
-+
-+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
-+
-+		;;
-+    esac
-+    case "$CPPFLAGS" in
-+	  *-D_SYSV*|*-D_SVID_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_SYSV"
-+
-+$as_echo "#define _SYSV 1" >>confdefs.h
-+
-+    esac
-+    ;;
-+#
-+# Tests needed for SINIX large file support.
-+#
-+    *sysv4*)
-+      if test $host = mips-sni-sysv4 ; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  SINIX_LFS_SUPPORT=cross
++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 >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -37717,32 +37344,36 @@
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
- #endif
+-#endif
 -char httpConnectEncrypt ();
--int
--main ()
--{
+ int
+ main ()
+ {
 -return httpConnectEncrypt ();
--  ;
--  return 0;
++
+   ;
+   return 0;
  }
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
++# 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_link") 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
@@ -37756,22 +37387,193 @@
 -       }; then
 -  ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
 -		  ac_cv_lib_ext_cups=yes
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  SINIX_LFS_SUPPORT=yes
++  $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
++  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:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++      ac_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
++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
--
++  eval ac_cv_prog_cc_${ac_cc}_c_o=no
++fi
++rm -f core conftest*
++
++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; }
++else
++  { $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
++
++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.  */
++
++  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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&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
++
++
++	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_cv_lib_ext_cups_httpConnectEncrypt=no;
 -		  ac_cv_lib_ext_cups=no
--fi
--
++  int main(void)
++  {
++  	return 0;
++  }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_w2=yes
++else
++  samba_cv_HAVE_w2=no
++fi
++rm -f core *.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
--
-+  SINIX_LFS_SUPPORT=no
++	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: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
 -$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
@@ -37779,18 +37581,52 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_HTTPCONNECTENCRYPT 1
 -_ACEOF
--
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
++{ $as_echo "$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
+ 
 -LIBS=$ac_check_lib_ext_save_LIBS
--
++	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.  */
+ 
 -if test $ac_cv_lib_ext_cups = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBCUPS 1
--_ACEOF
--
++   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
+ 
 -		case "$PRINT_LIBS" in
 -		    *-lcups*)
 -			;;
@@ -37798,22 +37634,26 @@
 -			PRINT_LIBS="-lcups $PRINT_LIBS"
 -			;;
 -		esac
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$SINIX_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+-
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 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"
++fi
++fi
++fi
  
--fi
-+          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
-+          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
-+          LIBS="`getconf LFS64_LIBS` $LIBS"
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
-+$as_echo "$SINIX_LFS_SUPPORT" >&6; }
-+      fi
-+    ;;
- 
 -		else
 -			{ $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
 -$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
@@ -37821,10 +37661,10 @@
 -			LDFLAGS=$ac_save_LDFLAGS
 -			PRINT_LIBS=$ac_save_PRINT_LIBS
 -		fi
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
  
 -	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
@@ -37832,30 +37672,70 @@
 -   { (exit 1); exit 1; }; }
 -        fi
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++{ $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
  
 -# Check whether --enable-iprint was given.
 -if test "${enable_iprint+set}" = set; then
 -  enableval=$enable_iprint;
 -fi
++    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.  */
  
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>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 test x$enable_iprint != xno; then
 -	if test x"$samba_cv_HAVE_CUPS" = xyes; then
++		if (v1 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v1);
++			return 1;
++		}
++		if (v2 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v2);
++			return 1;
++		}
++
++		return 0;
++	}
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_IPRINT 1
--_ACEOF
-+$as_echo "#define _GNU_SOURCE 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
  
 -	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
++{ $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
  
 -############################################
 -# check if the compiler will optimize out function calls
@@ -37863,72 +37743,40 @@
 -$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
 -if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+#
-+    *linux*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+       if test "$cross_compiling" = yes; then :
-+  LINUX_LFS_SUPPORT=cross
- else
--
+-else
+ 
 -    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 <stdio.h>
--int
--main ()
--{
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
-+#include <stdlib.h>
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+       struct utsname uts;
-+       char *release;
-+       int major, minor;
- 
++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 ()
+ {
+-
 -		if (0) {
 -		   this_function_does_not_exist();
 -		} else {
 -		  return 1;
 -		}
-+       /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
+-
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
  
-+       if (libc_major < 2)
-+              exit(1);
-+       if (libc_minor < 2)
-+              exit(1);
-+#endif
- 
--  ;
--  return 0;
-+       /* Ensure this is kernel 2.4 or higher */
-+
-+       uname(&uts);
-+       release = strdup(uts.release);
-+       major = atoi(strsep(&release, "."));
-+       minor = atoi(strsep(&release, "."));
-+
-+       if (major > 2 || (major == 2 && minor > 3))
-+               exit(0);
-+       exit(1);
-+#else
-+       exit(1);
-+#endif
+   ;
+   return 0;
  }
-+
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -37952,61 +37800,86 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  samba_cv_optimize_out_funcation_calls=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  LINUX_LFS_SUPPORT=yes
++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
 -
 -	samba_cv_optimize_out_funcation_calls=no
-+  LINUX_LFS_SUPPORT=no
++  { $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 *.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: $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
++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.  */
++#include <stdio.h>
++int
++main ()
++{
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
--_ACEOF
-+	CPPFLAGS="$old_CPPFLAGS"
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- 
++  ;
++  return 0;
++}
+ _ACEOF
+-
 -fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -#############################################
 -# check for fd passing struct via msg_control
 -{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_control" >&5
 -$as_echo_n "checking for fd passing via msg_control... " >&6; }
 -if test "${samba_cv_msghdr_msg_control+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--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
+-
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- 
++  { $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.  */
+-
 -#include <sys/types.h>
 -#include <stdlib.h>
 -#include <stddef.h>
 -#include <sys/socket.h>
 -#include <sys/un.h>
--int
--main ()
--{
- 
++#include <stdio.h>
+ int
+ main ()
+ {
+-
 -	struct msghdr msg;
 -	union {
 -	      struct cmsghdr cm;
@@ -38014,12 +37887,13 @@
 -	} control_un;
 -	msg.msg_control = control_un.control;
 -	msg.msg_controllen = sizeof(control_un.control);
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++ 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
@@ -38039,51 +37913,54 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_control=yes
--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
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+	;;
- 
+-
 -	samba_cv_msghdr_msg_control=no
--fi
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+    *darwin*)
- 
--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: $samba_cv_msghdr_msg_control" >&5
 -$as_echo "$samba_cv_msghdr_msg_control" >&6; }
 -if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
++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.  */
++#include <stdio.h>
++int
++main ()
++{
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_CONTROL 1
--_ACEOF
- 
++  ;
++  return 0;
++}
+ _ACEOF
+-
 -fi
-+# Add a system specific charset module.
-+	default_shared_modules="$default_shared_modules charset_macosxfs"
- 
+-
 -#############################################
 -# 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_n "(cached) " >&6
-+	;;
-+    *hurd*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  GLIBC_LFS_SUPPORT=cross
++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
 -
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -38091,32 +37968,37 @@
 -_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}: 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.  */
- 
+-
 -#include <sys/types.h>
 -#include <stdlib.h>
 -#include <stddef.h>
 -#include <sys/socket.h>
 -#include <sys/un.h>
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -
 -	struct msghdr msg;
 -	int fd;
 -	msg.msg_acctrights = (caddr_t) &fd;
 -	msg.msg_acctrightslen = sizeof(fd);
--
--  ;
--  return 0;
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
+ 
+   ;
+   return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
@@ -38138,19 +38020,19 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_acctrights=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  GLIBC_LFS_SUPPORT=yes
++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
 -
 -	samba_cv_msghdr_msg_acctrights=no
-+  GLIBC_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: $samba_cv_msghdr_msg_acctrights" >&5
 -$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
@@ -38160,12 +38042,17 @@
 -#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
 -_ACEOF
  
--fi
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++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 _LARGEFILE64_SOURCE 1" >>confdefs.h
++if test x"$c99_init" = x"yes"; then
++    saved_CFLAGS=""
  
 -for ac_func in dirfd
 -do
@@ -38174,7 +38061,7 @@
 -$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
@@ -38184,27 +38071,33 @@
 -/* 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
++    CFLAGS="$saved_CFLAGS"
++    saved_CFLAGS=""
++    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
++fi
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+    ;;
-+    *qnx*)
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++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; }
  
 -#undef $ac_func
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++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; }
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -38219,7 +38112,11 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+        ;;
++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; }
  
 -int
 -main ()
@@ -38234,6 +38131,26 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
++UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
++$as_echo_n "checking uname -p... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
++$as_echo "${UNAME_P}" >&6; }
++
++UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
++$as_echo_n "checking uname -i... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
++$as_echo "${UNAME_I}" >&6; }
++
++  case "$host_os" in
++	*irix6*)
++		#TODO add to libreplace
++		if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++																								CFLAGS="$CFLAGS -diag_error 1035"
++												CFLAGS="$CFLAGS -woff 1209,1174,3201"
++		fi
++	;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
@@ -38254,9 +38171,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
 -fi
++DYNEXP=
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -38272,21 +38190,43 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
--
++LDSHFLAGS_Z_DEFS=
+ 
 -fi
 -done
--
++LDSHFLAGS_Z_NODEFS=
+ 
 -if test x"$ac_cv_func_dirfd" = x"yes"; then
 -	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
--fi
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
++
++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"
+ fi
  
 -{ $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
 -else
++#
++# 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)
  
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -38294,7 +38234,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
  
 -#include <sys/types.h>
 -#if STDC_HEADERS
@@ -38332,30 +38272,38 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+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
++      ;;
  
 -	samba_cv_struct_sigevent=no
-+		break;
-+	fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
- fi
+-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="
++	  ;;
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_sigevent" >&5
 -$as_echo "$samba_cv_struct_sigevent" >&6; }
 -if test x"$samba_cv_struct_sigevent" = x"yes"; then
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
++#
++# 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"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_SIGEVENT 1
 -_ACEOF
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
  
 -   { $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; }
@@ -38369,7 +38317,55 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <signal.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 "#define SYSV 1" >>confdefs.h
++
++		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"
++
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++						;;
++					*)
++						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++						LDFLAGS="$LDFLAGS -lthread"
++
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++
++						;;
++				esac
++			else
++				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++				LDFLAGS="$LDFLAGS -lthread"
  
 -int
 -main ()
@@ -38400,35 +38396,29 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <signal.h>
+-/* end confdefs.h.  */
+-#include <signal.h>
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -static struct sigevent ac_aggr;
 -if (sizeof ac_aggr.sigev_value.sival_ptr)
 -return 0;
-+return *(signal (0, 0)) (0) == 1;
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38448,50 +38438,90 @@
 -	 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_compile "$LINENO"; then :
-+  ac_cv_type_signal=int
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
 -	ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
 -fi
--
++			fi
++			;;
++		esac
++		;;
++#
++# IRIX uses SYSV printing.  Make sure to set that here
++#
++	*irix*)
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_type_signal=void
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
++$as_echo "#define SYSV 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_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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
++		;;
++	*freebsd*|*dragonfly*)
  
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
+-_ACEOF
++$as_echo "#define FREEBSD 1" >>confdefs.h
++
++		;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++    *vos*)
++    case "$CPPFLAGS" in
++	  *-D_POSIX_C_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
  
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
  
 -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; }
 -if test "${ac_cv_member_struct_sigevent_sigev_value_sigval_ptr+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
+-  $as_echo_n "(cached) " >&6
++		;;
++    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
 -  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 <signal.h>
--
+ 
 -int
 -main ()
 -{
@@ -38500,8 +38530,15 @@
 -return 0;
 -  ;
 -  return 0;
--}
--_ACEOF
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38521,19 +38558,27 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=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
--
++  SINIX_LFS_SUPPORT=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
 -	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>
-+#include <sys/types.h>
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$SINIX_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
  
 -int
 -main ()
@@ -38544,7 +38589,7 @@
 -  ;
 -  return 0;
 -}
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38564,71 +38609,117 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=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
--
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
 -	ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
-+  ac_cv_type_uid_t=no
- fi
-+rm -f conftest*
+-fi
++          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
++          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
++          LIBS="`getconf LFS64_LIBS` $LIBS"
++        fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
++$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++      fi
++    ;;
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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
+-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
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
 -$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
 -if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then
-+$as_echo "#define uid_t int" >>confdefs.h
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
 -_ACEOF
  
-+$as_echo "#define gid_t int" >>confdefs.h
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
- fi
+-fi
  
 -fi
-+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-+if test "x$ac_cv_type_mode_t" = x""yes; then :
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
 -$as_echo_n "checking for struct timespec type... " >&6; }
 -if test "${samba_cv_struct_timespec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
- else
+-else
++	;;
  
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
++# 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
 -#include <sys/types.h>
 -#if STDC_HEADERS
--#include <stdlib.h>
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
+ #include <stdlib.h>
 -#include <stddef.h>
--#endif
++main() {
++#if _LFS64_LARGEFILE == 1
++       struct utsname uts;
++       char *release;
++       int major, minor;
++
++       /* 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
 -#if TIME_WITH_SYS_TIME
 -# include <sys/time.h>
 -# include <time.h>
--#else
++
++       /* Ensure this is kernel 2.4 or higher */
++
++       uname(&uts);
++       release = strdup(uts.release);
++       major = atoi(strsep(&release, "."));
++       minor = atoi(strsep(&release, "."));
++
++       if (major > 2 || (major == 2 && minor > 3))
++               exit(0);
++       exit(1);
+ #else
 -# if HAVE_SYS_TIME_H
 -#  include <sys/time.h>
 -# else
 -#  include <time.h>
 -# endif
--#endif
++       exit(1);
+ #endif
 -
 -int
 -main ()
@@ -38636,8 +38727,9 @@
 -struct timespec ts;
 -  ;
 -  return 0;
--}
--_ACEOF
+ }
++
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38657,33 +38749,33 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_struct_timespec=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  LINUX_LFS_SUPPORT=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
-+_ACEOF
- 
+-
 -	samba_cv_struct_timespec=no
++  LINUX_LFS_SUPPORT=no
  fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5
 -$as_echo "$samba_cv_struct_timespec" >&6; }
 -if test x"$samba_cv_struct_timespec" = x"yes"; then
-+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 :
-+
-+else
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_TIMESPEC 1
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
- _ACEOF
+-_ACEOF
++	CPPFLAGS="$old_CPPFLAGS"
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
- fi
+-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -# and glibc has setresuid under linux but the function does
 -# nothing until kernel 2.1.44! very dumb.
@@ -38692,12 +38784,10 @@
 -if test "${samba_cv_have_setresuid+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresuid=cross
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -38706,10 +38796,7 @@
 -/* end confdefs.h.  */
 -#include <errno.h>
 -main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
-+
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
- _ACEOF
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -38737,41 +38824,37 @@
 -  $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
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -( exit $ac_status )
 -samba_cv_have_setresuid=no
 -fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
  
-+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
-+
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
++$as_echo "#define _GNU_SOURCE 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
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++	;;
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESUID 1
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
- _ACEOF
+-_ACEOF
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++    *darwin*)
  
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
- fi
+-fi
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
  
 -# Do the same check for setresguid...
 -#
@@ -38783,22 +38866,36 @@
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresgid=cross
-+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ino_t" = x""yes; then :
++# Add a system specific charset module.
++	default_shared_modules="$default_shared_modules charset_macosxfs"
 +
++	;;
++    *hurd*)
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++        if test "$cross_compiling" = yes; then :
++  GLIBC_LFS_SUPPORT=cross
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <unistd.h>
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++
+ #include <unistd.h>
 -#include <errno.h>
 -main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
++}
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -38823,27 +38920,24 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  samba_cv_have_setresgid=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  GLIBC_LFS_SUPPORT=yes
+ else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -( exit $ac_status )
 -samba_cv_have_setresgid=no
 -fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++  GLIBC_LFS_SUPPORT=no
  fi
- 
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_loff_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
-+_ACEOF
- 
+-
+-
++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_have_setresgid" >&5
 -$as_echo "$samba_cv_have_setresgid" >&6; }
@@ -38851,42 +38945,62 @@
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESGID 1
-+ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-+if test "x$ac_cv_type_offset_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define offset_t loff_t
- _ACEOF
+-_ACEOF
+-
+-fi
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$GLIBC_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
  
- fi
- 
 -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
- $as_echo_n "checking for working memcmp... " >&6; }
+-$as_echo_n "checking for working memcmp... " >&6; }
 -if test "${ac_cv_func_memcmp_working+set}" = set; then
-+if test "${ac_cv_func_memcmp_working+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   ac_cv_func_memcmp_working=no
- else
+-  ac_cv_func_memcmp_working=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.  */
- $ac_includes_default
- int
-@@ -37950,44 +8436,17 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
+-  /* 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;
+-  }
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -38909,52 +39023,73 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   ac_cv_func_memcmp_working=yes
- else
+-  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
 -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"
+ 
 -( exit $ac_status )
 -ac_cv_func_memcmp_working=no
-+  ac_cv_func_memcmp_working=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
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
--
- fi
++        ;;
+ 
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+{ $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 "* ) ;;
-@@ -37997,166 +8456,26 @@
+-$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
  
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
  
  
 -###############################################
 -# Readline included by default unless explicitly asked not to
 -test "${with_readline+set}" != "set" && with_readline=yes
--
++echo "LIBREPLACE_BROKEN_CHECKS: START"
+ 
 -# 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; }
--
++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"
+ 
 -# 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; }
--
--
--
--
++		break;
++	fi
++done
++if test x"$libreplacedir" = "x"; then
++	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
++fi
+ 
++LIBREPLACEOBJ="$libreplacedir/replace.o"
+ 
+ 
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+ 
 -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`
@@ -38962,13 +39097,16 @@
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 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
 -fi
 -ac_res=`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; }
@@ -38977,10 +39115,21 @@
 -_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
++#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
@@ -39000,35 +39149,45 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++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_header_compiler=no
--fi
++  ac_cv_type_signal=void
+ fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&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 <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++{ $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 <$ac_header>
-+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#include <sys/types.h>
++
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -39048,18 +39207,27 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "uid_t" >/dev/null 2>&1; then :
++  ac_cv_type_uid_t=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_type_uid_t=no
++fi
++rm -f conftest*
  
 -  ac_header_preproc=no
  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
  
 -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 uid_t int" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39106,20 +39274,23 @@
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in stdbool.h stdint.h sys/select.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -38165,149 +8484,12 @@
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++$as_echo "#define gid_t int" >>confdefs.h
  
- done
+ fi
  
--
+-done
++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
+ 
 -for ac_header in readline/history.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39128,12 +39299,16 @@
 -$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
++
++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 :
++
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -39145,7 +39320,10 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39168,14 +39346,16 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
--
++ac_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 :
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39205,17 +39385,23 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  ac_header_preproc=no
--fi
--
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
++_ACEOF
++
+ 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_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 :
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39250,36 +39436,37 @@
 -$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
+ 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 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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
  _ACEOF
-@@ -38317,474 +8499,97 @@
- done
  
+ fi
  
-+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"
+-done
++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
+ 
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39288,11 +39475,16 @@
 -$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_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
++if test "x$ac_cv_type_ino_t" = x""yes; then :
++
  else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
@@ -39305,7 +39497,10 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define ino_t unsigned
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -39328,14 +39523,15 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_header_compiler=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+   ac_config_commands="$ac_config_commands mk-stdint.h"
++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 :
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -39366,17 +39562,23 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -  ac_header_preproc=no
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
++_ACEOF
++
  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_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 :
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -39411,7 +39613,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
--else
+ else
 -  eval "$as_ac_Header=\$ac_header_preproc"
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -39425,15 +39627,23 @@
 -   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 <<_ACEOF
++#define offset_t loff_t
+ _ACEOF
  
 -      for termlib in ncurses curses termcap terminfo termlib tinfo; do
 -       as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
 -$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
++fi
++
++
++{ $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="-l${termlib}  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -39441,11 +39651,12 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
-+   ac_config_commands="$ac_config_commands rm-stdbool.h"
- 
++  if test "$cross_compiling" = yes; then :
++  ac_cv_func_memcmp_working=no
++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.  */
@@ -39453,14 +39664,40 @@
 -extern "C"
 -#endif
 -char tgetent ();
--int
--main ()
--{
++$ac_includes_default
+ int
+ main ()
+ {
 -return tgetent ();
--  ;
--  return 0;
--}
--_ACEOF
++
++  /* 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;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39483,19 +39720,23 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_Lib=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_config_commands="$ac_config_commands mk-stdbool.h"
- 
+-
 -	eval "$as_ac_Lib=no"
--fi
- 
++  ac_cv_func_memcmp_working=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 *.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_Lib'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39504,7 +39745,15 @@
 -		 $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: $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
  
 -      done
 -      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
@@ -39535,7 +39784,16 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++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
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39563,7 +39821,8 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_lib_readline_rl_callback_handler_install=no
--fi
+ fi
++done
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39574,28 +39833,40 @@
 -$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
 -if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
 -  TERMLIBS="-lreadline $TERMLIBS"
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBREADLINE 1
--_ACEOF
-+"
-+if test "x$ac_cv_type_bool" = x""yes; then :
++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
  
 -       break
 -else
 -  TERMLIBS=
--fi
-+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+ 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
++
  fi
  
--done
--
+ done
+ 
 -    ;;
 -  no)
 -    { $as_echo "$as_me:$LINENO: result: no" >&5
@@ -39609,19 +39880,16 @@
 -    # alternate readline path
 -    _ldflags=${LDFLAGS}
 -    _cppflags=${CPPFLAGS}
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#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"
  
 -    # Add additional search path
 -    LDFLAGS="-L$with_readline/lib $LDFLAGS"
 -    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
++else
++   ac_config_commands="$ac_config_commands mk-stdint.h"
  
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
  
 +fi
  
@@ -39633,16 +39901,18 @@
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $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_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
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -39652,7 +39922,16 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
++   ac_config_commands="$ac_config_commands mk-stdbool.h"
++
++
++fi
++
++
++
++
++ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
+ $ac_includes_default
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -39674,13 +39953,21 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type_bool" = x""yes; then :
++
++$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+ 
 -	ac_header_compiler=no
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
@@ -39693,14 +39980,9 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_MMAP=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <$ac_header>
-+#include "$libreplacedir/test/shared_mmap.c"
- _ACEOF
+-_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39719,27 +40001,26 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=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
-+  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_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
  
 -  ac_header_preproc=no
  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
@@ -39774,20 +40055,46 @@
 -{ $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 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
 -  eval "$as_ac_Header=\$ac_header_preproc"
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_MMAP=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include "$libreplacedir/test/shared_mmap.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_MMAP=yes
++else
++  libreplace_cv_HAVE_MMAP=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
++
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
  
--fi
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
++
 +for ac_header in sys/syslog.h syslog.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39797,11 +40104,20 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -38793,149 +8598,40 @@
+@@ -38938,151 +8597,66 @@
  
  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
+ 
 -for ac_header in readline/history.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39810,7 +40126,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
@@ -39827,7 +40143,10 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+for ac_header in sys/time.h time.h
++
++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"
@@ -39877,7 +40196,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+for ac_header in stdarg.h vararg.h
++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"
@@ -39914,7 +40233,8 @@
 -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: )
@@ -39956,37 +40276,58 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+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
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+for ac_header in sys/mount.h mntent.h
++
++done
++
++for ac_header in unix.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_UNIX_H 1
  _ACEOF
-@@ -38944,1149 +8640,569 @@
  
+ fi
+@@ -39090,835 +8664,602 @@
  done
  
-+for ac_header in stropts.h
+ 
++for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
 +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 :
++  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_STROPTS_H 1
++#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
+ 
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39995,7 +40336,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
@@ -40006,18 +40347,47 @@
 -$as_echo_n "checking $ac_header usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++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
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+for ac_header in unix.h
++
++fi
++done
++
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
 +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 :
++  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_UNIX_H 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++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
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -40044,43 +40414,37 @@
  
 -	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; }
-+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.  */
-+
-+for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++ { $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
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#include <$ac_header>
-+
-+fi
-+done
-+
-+for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)setresuid
++  ;
++  return 0;
++}
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -40100,26 +40464,25 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++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
- 
+-
 -  ac_header_preproc=no
++  ac_cv_have_setresuid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
++$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40157,52 +40520,29 @@
 -  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+done
-+
-+for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++ fi
  
- fi
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
  
 -      for termlib in ncurses curses termcap terminfo termlib; do
 -       as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
 -$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
 -  ac_check_lib_save_LIBS=$LIBS
@@ -40228,7 +40568,7 @@
  main ()
  {
 -return tgetent ();
-+int i = (int)setresuid
++int i = (int)setresgid
    ;
    return 0;
  }
@@ -40256,7 +40596,7 @@
 -       }; then
 -  eval "$as_ac_Lib=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresuid_decl=yes
++  ac_cv_have_setresgid_decl=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -40268,7 +40608,7 @@
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
-+  ac_cv_have_setresuid_decl=no
++  ac_cv_have_setresgid_decl=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
 -		 $as_echo "$as_val"'`
@@ -40280,135 +40620,19 @@
 -  TERMLIBS="-l${termlib}"; break
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
-+$as_echo "$ac_cv_have_setresuid_decl" >&6; }
-+ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
++$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
  
 -      done
 -      { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
 -$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
 -if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_SETRESGID_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
--  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
--/* 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_callback_handler_install ();
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
- int
- main ()
- {
--return rl_callback_handler_install ();
-+int i = (int)setresgid
-   ;
-   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_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresgid_decl=yes
- else
--  TERMLIBS= CPPFLAGS=$_cppflags
--fi
--
-+  ac_cv_have_setresgid_decl=no
- fi
--
--done
--
--
--    LDFLAGS=$_ldflags
--    ;;
--  esac
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--
-+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
- 
- 
--# The readline API changed slightly from readline3 to readline4, so
--# code will generate warnings on one of them unless we have a few
--# special cases.
--{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
--$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
 +$as_echo_n "checking for errno declaration... " >&6; }
 +if test "${ac_cv_have_errno_decl+set}" = set; then :
@@ -40429,14 +40653,14 @@
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char rl_completion_matches ();
+-char rl_callback_handler_install ();
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <errno.h>
  int
  main ()
  {
--return rl_completion_matches ();
+-return rl_callback_handler_install ();
 +int i = (int)errno
    ;
    return 0;
@@ -40463,65 +40687,32 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_readline_rl_completion_matches=yes
+-  ac_cv_lib_readline_rl_callback_handler_install=yes
 +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
--
--	ac_cv_lib_readline_rl_completion_matches=no
++else
 +  ac_cv_have_errno_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
--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
++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
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
++
 +$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
- 
--fi
++
 + 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 "$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
++  $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 <readline/readline.h>
--
--int
--main ()
--{
--#ifndef rl_event_hook
--  (void) rl_event_hook;
--#endif
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
--  ;
--  return 0;
+-	ac_cv_lib_readline_rl_callback_handler_install=no
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_SECURE_MKSTEMP=cross
 +else
@@ -40540,141 +40731,79 @@
 +  if (fstat(fd, &st) != 0) exit(1);
 +  if ((st.st_mode & 0777) != 0600) exit(1);
 +  exit(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
++}
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_rl_event_hook=no
++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
  
--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
+-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:$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"
 +{ $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
  
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 1
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBREADLINE 1
 -_ACEOF
 +$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
  
-+fi
+-       break
+-else
+-  TERMLIBS= CPPFLAGS=$_cppflags
+ fi
  
--else
 +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 HAVE_DECL_RL_EVENT_HOOK 0
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--
++_ACEOF
++
  fi
  
-+done
+ 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
--  $as_echo_n "(cached) " >&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
- 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
--/* end confdefs.h.  */
++else
 +  ac_have_decl=0
 +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 history_list ();
--int
--main ()
--{
--return history_list ();
--  ;
--  return 0;
--}
+-    LDFLAGS=$_ldflags
+-    ;;
+-  esac
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_SNPRINTF $ac_have_decl
- _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_history_list=yes
++_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
--  $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; }
 +  ac_have_decl=0
 +fi
  
--	ac_cv_lib_readline_history_list=no
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_VSNPRINTF $ac_have_decl
 +_ACEOF
@@ -40685,10 +40814,6 @@
 +  ac_have_decl=0
  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
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_ASPRINTF $ac_have_decl
 +_ACEOF
@@ -40697,17 +40822,12 @@
 +  ac_have_decl=1
 +else
 +  ac_have_decl=0
- 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
++fi
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_HISTORY_LIST 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_VASPRINTF $ac_have_decl
 +_ACEOF
-+
+ 
 +for ac_func in snprintf vsnprintf asprintf vasprintf
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -40716,29 +40836,36 @@
 +   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
+-# 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
- 
- 
--###############################################
--# 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 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
--  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
--/* end confdefs.h.  */
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_C99_VSNPRINTF=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -40746,52 +40873,13 @@
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char yp_get_default_domain ();
+-char rl_completion_matches ();
 -int
 -main ()
 -{
--return yp_get_default_domain ();
+-return rl_completion_matches ();
 -  ;
 -  return 0;
--}
--_ACEOF
--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;;
--  *) 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_yp_get_default_domain=$ac_res
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_C99_VSNPRINTF=cross
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
 +#include <sys/types.h>
 +#include <stdio.h>
 +#include <stdarg.h>
@@ -40802,22 +40890,12 @@
 +       char buf[20];
 +       long long l = 1234567890;
 +       l *= 100;
- 
--fi
++
 +       va_start(ap, format);
 +       len = vsnprintf(buf, 0, format, ap);
 +       va_end(ap);
 +       if (len != 5) exit(1);
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext
--  if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
--  break
--fi
--done
--if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
--  :
++
 +       va_start(ap, format);
 +       len = vsnprintf(0, 0, format, ap);
 +       va_end(ap);
@@ -40831,85 +40909,82 @@
 +       if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
 +
 +       exit(0);
-+}
+ }
 +main() { foo("hello"); }
 +
-+_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
+-  ac_cv_lib_readline_rl_completion_matches=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_C99_VSNPRINTF=yes
  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_lib_readline_rl_completion_matches=no
 +  libreplace_cv_HAVE_C99_VSNPRINTF=no
- fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
++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_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"
  
+-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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
 +$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
 +if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NEW_LIBREADLINE 1
+-_ACEOF
 +$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
  
--for ac_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
+ 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 "$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
 -  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
-+fi
+-#include <readline/readline.h>
  
--#undef $ac_func
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
- 
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdarg.h>
@@ -40917,21 +40992,24 @@
  int
  main ()
  {
--return $ac_func ();
+-#ifndef rl_event_hook
+-  (void) rl_event_hook;
+-#endif
+-
 +va_copy(ap1,ap2);
    ;
    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
@@ -40940,233 +41018,106 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_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_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_have_decl_rl_event_hook=no
 +  libreplace_cv_HAVE_VA_COPY=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 core conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  fi
--done
+-{ $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: $libreplace_cv_HAVE_VA_COPY" >&5
 +$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
 +if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
  
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_RL_EVENT_HOOK 1
+-_ACEOF
 +$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
  
--# Check if we have execl, if not we need to compile smbrun.
 +fi
  
--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
 +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
++  $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
- 
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_RL_EVENT_HOOK 0
++
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdarg.h>
 +va_list ap1,ap2;
- int
- main ()
- {
--return $ac_func ();
++int
++main ()
++{
 +__va_copy(ap1,ap2);
-   ;
-   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
--  eval "$as_ac_var=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_var=no"
++else
 +  libreplace_cv_HAVE___VA_COPY=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++fi
 +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
++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
  
--fi
--done
 +$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
  
--if test x"$ac_cv_func_execl" = x"no"; then
--    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+ fi
 +fi
- 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:$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 "$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
--  cat >conftest.$ac_ext <<_ACEOF
+-  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
 -/* 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 history_list ();
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdio.h>
  int
  main ()
  {
--return $ac_func ();
+-return history_list ();
 +printf("%s\n", __FUNCTION__);
    ;
    return 0;
@@ -41193,103 +41144,84 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_readline_history_list=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_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"
+-	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
 +  libreplace_cv_HAVE_FUNCTION_MACRO=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
+-{ $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
 -
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--done
 +{ $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
  
 +$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
  
--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
+-###############################################
+-# test for where we get yp_get_default_domain() from
+-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
+-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
+-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
 +else
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
 +$as_echo_n "checking for __func__ macro... " >&6; }
 +if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
    $as_echo_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
 -/* 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 yp_get_default_domain ();
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdio.h>
  int
  main ()
  {
--return $ac_func ();
+-return yp_get_default_domain ();
 +printf("%s\n", __func__);
    ;
    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;;
@@ -41310,57 +41242,63 @@
 -	 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_HAVE_func_MACRO=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  libreplace_cv_HAVE_func_MACRO=no
- fi
++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
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
 +$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
-+
+ 
 +    fi
  fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$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 -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-  break
 +for ac_header in sys/param.h limits.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
++_ACEOF
++
  fi
 +
  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"
  
+-fi
  
 +ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
 +if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
  
--for ac_func in strchr chflags
+-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
@@ -41459,8 +41397,7 @@
 -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
@@ -41468,44 +41405,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
+-#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_setenv_decl" >&5
 +$as_echo "$ac_cv_have_setenv_decl" >&6; }
 + if test x"$ac_cv_have_setenv_decl" = x"yes"; then
-+
+ 
 +$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
-+
+ 
+-# Check if we have execl, if not we need to compile smbrun.
 + 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
-@@ -40095,102 +9211,56 @@
- done
  
- 
--
--
--
--for ac_func in getrlimit fsync fdatasync setpgid
+-for ac_func in execl
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
-+$as_echo_n "checking for environ declaration... " >&6; }
-+if test "${ac_cv_have_environ_decl+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++for ac_func in setenv unsetenv
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -41517,15 +41451,17 @@
 -    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
--
+ 
 -/* 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.  */
@@ -41539,6 +41475,11 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
  
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -41582,9 +41523,9 @@
 -
 -	eval "$as_ac_var=no"
 +  ac_cv_have_environ_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:${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
@@ -41624,9 +41565,13 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40199,255 +9269,183 @@
+@@ -39926,353 +9267,184 @@
+ fi
  done
  
+-if test x"$ac_cv_func_execl" = x"no"; then
+-    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+-fi
  
 +# this test disabled as we don't actually need __VA_ARGS__ yet
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -41640,14 +41585,21 @@
  
 +$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
  
--for ac_func in setsid glob strpbrk crypt16 getauthuid
++fi
++rm -f conftest.err conftest.$ac_ext
+ 
+ 
+-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
++{ $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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -41657,9 +41609,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
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
+-
 -/* 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
@@ -41670,12 +41620,7 @@
 -#else
 -# include <assert.h>
 -#endif
-+{ $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
- 
+-
 -#undef $ac_func
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -41758,52 +41703,134 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
 +$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
 +if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
++
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
  
--fi
+ fi
 -done
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
  
-+fi
  
- 
+-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 O_DIRECT flag to open(2)" >&5
 +$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
 +if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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
 +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
 +#include <unistd.h>
 +#ifdef HAVE_FCNTL_H
 +#include <fcntl.h>
-+#endif
-+int
-+main ()
-+{
+ #endif
+-
+ int
+ main ()
+ {
+-return $ac_func ();
 +int fd = open("/dev/null", O_DIRECT);
-+  ;
-+  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"
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
 +  libreplace_cv_HAVE_OPEN_O_DIRECT=no
-+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: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
 +$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
 +if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
  
+-fi
+-done
 +$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
  
 +fi
  
  
--for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+-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
@@ -41823,20 +41850,43 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++int
++main ()
++{
++volatile int i = 0
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_volatile=yes
++else
++  libreplace_cv_volatile=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
++$as_echo "$libreplace_cv_volatile" >&6; }
++if test x"$libreplace_cv_volatile" = x"yes"; then
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
+ 
 -#undef $ac_func
--
++fi
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -41850,15 +41900,26 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
- 
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++# filesys
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
++#include <$ac_hdr>
+ 
  int
  main ()
  {
 -return $ac_func ();
-+volatile int i = 0
++if ((DIR *) 0)
++return 0;
    ;
    return 0;
  }
@@ -41886,49 +41947,12 @@
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_volatile=yes
++  eval "$as_ac_Header=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_volatile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
-+
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
-+
-+fi
-+
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <$ac_hdr>
- 
+-
 -	eval "$as_ac_var=no"
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$as_ac_Header=yes"
-+else
 +  eval "$as_ac_Header=no"
  fi
 -
@@ -41960,11 +41984,8 @@
 -
 -
 -
--
  
--
--
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-for ac_func in getrlimit fsync fdatasync setpgid
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -42005,7 +42026,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -40455,106 +9453,56 @@
+@@ -40280,104 +9452,56 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -42105,9 +42126,7 @@
 -
 -
 -
--
--
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+-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
@@ -42146,7 +42165,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -40562,170 +9510,148 @@
+@@ -40385,170 +9509,148 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -42281,7 +42300,7 @@
 +done
  
  
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
+-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
@@ -42417,7 +42436,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40734,210 +9660,170 @@
+@@ -40557,426 +9659,311 @@
  done
  
  
@@ -42426,7 +42445,8 @@
 -
 -
 -
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-
+-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
@@ -42467,17 +42487,18 @@
 -   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#ifndef WEXITSTATUS
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
+-#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>
++#include <sys/wait.h>
++#ifndef WEXITSTATUS
++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
++#endif
 +#ifndef WIFEXITED
 +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
  #endif
@@ -42556,10 +42577,11 @@
  _ACEOF
  
  fi
-+
- done
+-done
  
++done
  
+ 
 +case "$host_os" in
 +*linux*)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
@@ -42584,7 +42606,7 @@
  
 +	int i;
  
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+-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
@@ -42728,146 +42750,65 @@
 +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
+ 
 +for ac_func in getpwnam_r getpwuid_r 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 :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -40946,304 +9832,139 @@
- done
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
  
  
--for ac_func in getpwent_r
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
 +$as_echo_n "checking for getpwent_r declaration... " >&6; }
 +if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++  $as_echo_n "(cached) " >&6
++else
  
--#undef $ac_func
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#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 <unistd.h>
 +	#include <pwd.h>
  
- int
- main ()
- {
--return $ac_func ();
++int
++main ()
++{
 +int i = (int)getpwent_r
-   ;
-   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 :
 +  ac_cv_have_getpwent_r_decl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
++else
 +  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
--_ACEOF
++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
  
--fi
--done
 +$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
  
 + 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
@@ -42987,6 +42928,8 @@
  
  fi
 -done
+-
+-
 +{ $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 :
@@ -42997,7 +42940,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
@@ -43032,16 +42975,11 @@
 -#endif
 +	#include <unistd.h>
 +	#include <pwd.h>
-+
+ 
+-#undef $ac_func
 +		struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)
 +		{
  
--#undef $ac_func
-+	#ifndef HAVE_GETPWENT_R_DECL
-+	#error missing getpwent_r prototype
-+	#endif
-+	return NULL;
- 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -43055,6 +42993,11 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++	#ifndef HAVE_GETPWENT_R_DECL
++	#error missing getpwent_r prototype
++	#endif
++	return NULL;
++
 +		}
  
 -int
@@ -43131,21 +43074,54 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -41252,328 +9973,220 @@
+@@ -40985,347 +9972,221 @@
  done
  
  
--
--
--for ac_func in syslog vsyslog timegm
++ { $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 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 "$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
@@ -43153,25 +43129,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
@@ -43186,17 +43166,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"
@@ -43221,19 +43204,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"'`
@@ -43244,68 +43230,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 :
  
- 
--for ac_func in setlocale nl_langinfo
+-for ac_func in getpwent_r
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-+
-+
-+fi
-+
-+
 +{ $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 :
@@ -43438,7 +43381,7 @@
  done
  
  
--for ac_func in nanosleep
+-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
@@ -43464,12 +43407,12 @@
 -/* 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
@@ -43536,12 +43479,27 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
- fi
+-fi
++fi
++
++done
++
++
++# shmem
++for ac_header in sys/ipc.h sys/mman.h sys/shm.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++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 -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
@@ -43549,11 +43507,12 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
 +done
 +
 +
-+# shmem
-+for ac_header in sys/ipc.h sys/mman.h sys/shm.h
++# terminal
++for ac_header in termios.h termio.h sys/termio.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -43564,37 +43523,22 @@
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
--else
-+fi
-+
-+done
+ fi
+-done
  
- 
-+# terminal
-+for ac_header in termios.h termio.h sys/termio.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS  $LIBS"
-+fi
- 
 +done
  
  
  
--        { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
--$as_echo_n "checking for nanosleep in -lrt... " >&6; }
--if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
 +save_LIBS="$LIBS"
 +LIBS=""
-+
+ 
+-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
+-$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; }
@@ -43609,18 +43553,42 @@
 +  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.
-@@ -41582,112 +10195,85 @@
+    Use char because int might match the return type of a GCC
+@@ -41333,102 +10194,85 @@
  #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
+-
 +char dlopen ();
  int
  main ()
  {
--return nanosleep ();
+-return $ac_func ();
 +return dlopen ();
    ;
    return 0;
@@ -43647,8 +43615,10 @@
 -	 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
 +for ac_lib in '' dl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -43666,12 +43636,11 @@
 +fi
 +done
 +if test "${ac_cv_search_dlopen+set}" = set; then :
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
++else
 +  ac_cv_search_dlopen=no
-+fi
+ fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
 +fi
@@ -43681,62 +43650,49 @@
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
--	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
- 
--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
+ 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 dlfcn.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
 +if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define HAVE_NANOSLEEP 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_DLFCN_H 1
  _ACEOF
  
  fi
++
+ done
  
--LIBS=$ac_check_lib_ext_save_LIBS
-+done
- 
--if test $ac_cv_lib_ext_rt = yes; then
 +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 HAVE_LIBRT 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
  
--		case "$LIBS" in
--		    *-lrt*)
--			;;
--		    *)
--			LIBS="-lrt $LIBS"
--			;;
--		esac
--
--
--fi
--
 +else
 +  libreplace_cv_dlfcn=yes
- fi
- done
++fi
++done
  
  
--for ac_func in utimensat
+-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
@@ -43775,7 +43731,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41695,419 +10281,231 @@
+@@ -41436,864 +10280,638 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43819,9 +43775,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 '' sl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -43839,23 +43792,35 @@
 +fi
 +done
 +if test "${ac_cv_search_shl_load+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_shl_load=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_shl_load" >&5
 +$as_echo "$ac_cv_search_shl_load" >&6; }
 +ac_res=$ac_cv_search_shl_load
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
+-	eval "$as_ac_var=no"
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++for ac_header in dl.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
++if test "x$ac_cv_header_dl_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DL_H 1
++_ACEOF
++
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -43865,37 +43830,26 @@
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
-+for ac_header in dl.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dl_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DL_H 1
- _ACEOF
- 
- fi
--done
- 
 +done
- 
++
 +for ac_func in shl_load shl_unload shl_findsym
 +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_shl=yes
-+fi
-+done
+ fi
+ done
  
  
--for ac_func in mlock munlock mlockall munlockall
+-
+-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
@@ -44021,13 +43975,7 @@
 -done
  
  
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
-+fi
- 
-+LIBDL="$LIBS"
- 
--for ac_func in memalign posix_memalign hstrerror
+-for ac_func in nanosleep
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44044,29 +43992,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
-+LIBS="$save_LIBS"
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
++fi
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+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
++LIBDL="$LIBS"
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+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
++LIBS="$save_LIBS"
  
 -#undef $ac_func
-+if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
++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
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -44081,6 +44028,13 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++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
++
++if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
++
 +$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
 +
 +
@@ -44140,13 +44094,22 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  libreplace_cv_REPLACE_GETPASS=no
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +CPPFLAGS="$SAVE_CPPFLAGS"
  
+-	eval "$as_ac_var=no"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
++$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
++if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
++
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
++
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -44161,182 +44124,47 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
-+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
-+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
-+
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
  
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
- fi
--done
- 
-+fi
- 
--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
--  { $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 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
--fi
--ac_res=`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
++  $as_echo_n "(cached) " >&6
  else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--	ac_header_compiler=no
--fi
 +	if test "$cross_compiling" = yes; then :
 +  libreplace_cv_STRPTIME_OK="assuming not"
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end 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; }
 +		#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
 +		#include "$libreplacedir/test/strptime.c"
  
--# 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
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS  $LIBS"
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_STRPTIME_OK=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
++else
 +  libreplace_cv_STRPTIME_OK=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
++fi
  
--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_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
-+
+ 
 +$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
  
+-        { $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
 +        LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
++fi
 +
 +for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
 +do :
@@ -44344,22 +44172,15 @@
 +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
-@@ -42116,581 +10514,378 @@
- 
- 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
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
 +#######################################
 +# Check for mkdir mode
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
@@ -44374,37 +44195,14 @@
 -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 ();
 +		#include <stdio.h>
 +		#ifdef HAVE_DIRECT_H
 +		#include <direct.h>
@@ -44412,7 +44210,7 @@
  int
  main ()
  {
--return $ac_func ();
+-return nanosleep ();
 +
 +			mkdir("foo",0777);
 +			return 0;
@@ -44442,63 +44240,113 @@
 -	 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 :
 +  libreplace_cv_mkdir_has_mode="yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_ext_rt_nanosleep=no;
+-		  ac_cv_lib_ext_rt=no
 +  libreplace_cv_mkdir_has_mode="no"
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_mkdir_has_mode" >&5
 +$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
-+
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +if test "$libreplace_cv_mkdir_has_mode" = "yes"
 +then
 +
 +$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
  fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+-    if test $ac_cv_lib_ext_rt_nanosleep = yes; then
 +
 +for ac_func in timegm
 +do :
 +  ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
 +if test "x$ac_cv_func_timegm" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_NANOSLEEP 1
 +#define HAVE_TIMEGM 1
  _ACEOF
  
 +else
 +  LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
  fi
++done
+ 
+-LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_rt = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
++$as_echo_n "checking for broken readdir... " >&6; }
++if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
+ 
+-		case "$LIBS" in
+-		    *-lrt*)
+-			;;
+-		    *)
+-			LIBS="-lrt $LIBS"
+-			;;
+-		esac
++	if test "$cross_compiling" = yes; then :
++  libreplace_cv_READDIR_NEEDED="assuming not"
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_READDIR_NEEDED=no
++else
++  libreplace_cv_READDIR_NEEDED=yes
++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 "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
++$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
++
++for ac_func in dirfd
++do :
++  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
++if test "x$ac_cv_func_dirfd" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DIRFD 1
++_ACEOF
+ 
+ fi
  done
  
  
--
--for ac_func in gettext dgettext
+-for ac_func in utimensat
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
-+$as_echo_n "checking for broken readdir... " >&6; }
-+if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
++$as_echo_n "checking for dirfd declaration... " >&6; }
++if test "${ac_cv_have_dirfd_decl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -44506,43 +44354,24 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+	if test "$cross_compiling" = yes; then :
-+  libreplace_cv_READDIR_NEEDED="assuming not"
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_READDIR_NEEDED=no
-+else
-+  libreplace_cv_READDIR_NEEDED=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
- 
+-
 -#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
-+$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
- 
+-
 -/* 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.  */
@@ -44556,24 +44385,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+for ac_func in dirfd
-+do :
-+  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-+if test "x$ac_cv_func_dirfd" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DIRFD 1
-+_ACEOF
  
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
-+$as_echo_n "checking for dirfd declaration... " >&6; }
-+if test "${ac_cv_have_dirfd_decl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <dirent.h>
@@ -44650,22 +44462,64 @@
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETDIRENTRIES 1
++_ACEOF
++
++fi
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5
++$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
++if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++		$ac_includes_default
++
++	#include <dirent.h>
++
++		long telldir(const DIR *dir)
++		{
++
++	return 0;
++
++		}
++
  _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
++
++else
++
++		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
- done
+-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 :
  
--
--
--for ac_func in bindtextdomain textdomain
+ 
++$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
+ 
+ 
++fi
+ 
+-for ac_func in mlock munlock mlockall munlockall
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5
-+$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
-+if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then :
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
++$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
++if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -44693,7 +44547,7 @@
 +	#include <dirent.h>
  
 -#undef $ac_func
-+		long telldir(const DIR *dir)
++		int seekdir(DIR *dir, long ofs)
 +		{
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -44745,17 +44599,15 @@
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
-+		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
++		ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
-+		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
-+
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
++		ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -44771,27 +44623,29 @@
 -  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_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
-+
++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_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 :
  
  
--for ac_func in strupr
++$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
+ 
+ 
+-for ac_func in memalign posix_memalign hstrerror
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 -$as_echo_n "checking for $ac_func... " >&6; }
 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
-+$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
-+if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
++$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -44799,6 +44653,13 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++
++	if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
@@ -44809,18 +44670,32 @@
 -    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
++#define _LIBREPLACE_REPLACE_H
++#include "$libreplacedir/repdir_getdirentries.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_READDIR_GETDIRENTRIES=yes
++else
++  libreplace_cv_READDIR_GETDIRENTRIES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+	#include <dirent.h>
  
 -#undef $ac_func
-+		int seekdir(DIR *dir, long ofs)
-+		{
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
++$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++fi
++if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -44835,9 +44710,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	return 0;
-+
-+		}
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
  
 -int
 -main ()
@@ -44846,7 +44719,7 @@
 -  ;
 -  return 0;
 -}
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -44869,21 +44742,19 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
-+
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
 -fi
-+		ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
++	libreplace_cv_READDIR_NEEDED=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -44892,34 +44763,34 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++#define HAVE_GETDENTS 1
+ _ACEOF
  
  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 :
+ done
  
- 
--# Find a method of generating a stack trace
-+$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
- 
- 
-+fi
- 
--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
 -  { $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 replacing readdir using getdirentries()" >&5
-+$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
++$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
    $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -44948,7 +44819,8 @@
 -#include <$ac_header>
 +
 +#define _LIBREPLACE_REPLACE_H
-+#include "$libreplacedir/repdir_getdirentries.c"
++#error _donot_use_getdents_replacement_anymore
++#include "$libreplacedir/repdir_getdents.c"
 +#define test_readdir_os2_delete main
 +#include "$libreplacedir/test/os2_delete.c"
  _ACEOF
@@ -44972,11 +44844,11 @@
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_READDIR_GETDIRENTRIES=yes
++  libreplace_cv_READDIR_GETDENTS=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_READDIR_GETDIRENTRIES=no
++  libreplace_cv_READDIR_GETDENTS=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -44985,10 +44857,10 @@
  
 -	ac_header_compiler=no
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++{ $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_GETDIRENTRIES" = x"yes"; then
++if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -45000,44 +44872,10 @@
 -$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+
-+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
-+	libreplace_cv_READDIR_NEEDED=no
-+fi
-+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdents
-+do :
-+  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-+if test "x$ac_cv_func_getdents" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETDENTS 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+done
-+
-+{ $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
-+
-+	if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <$ac_header>
 -_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -45058,36 +44896,20 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+
-+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_READDIR_GETDENTS=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  libreplace_cv_READDIR_GETDENTS=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
  
 -  ac_header_preproc=no
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
- fi
-+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
+-fi
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
++	libreplace_cv_READDIR_NEEDED=no
++fi
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -45123,19 +44945,6 @@
 -$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"
-+
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
-+	libreplace_cv_READDIR_NEEDED=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}: checking a usable readdir()" >&5
 +$as_echo_n "checking a usable readdir()... " >&6; }
 +if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
@@ -45143,14 +44952,20 @@
 +$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
+-  eval "$as_ac_Header=\$ac_header_preproc"
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
  fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+ 
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
 +###############################################
 +# test for where we get crypt() from
 +for ac_header in crypt.h
@@ -45166,145 +44981,74 @@
  
  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 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
--  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_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_crypt=no
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -42699,105 +10894,25 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char backtrace_symbols ();
-+char crypt ();
- int
- main ()
- {
--return backtrace_symbols ();
-+return crypt ();
-   ;
-   return 0;
- }
- _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
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-# setbuffer, shmget, shm_open are needed for smbtorture
 -
 -
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext
--  if test "${ac_cv_search_backtrace_symbols+set}" = set; then
--  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"
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_ext_crypt="none required"
- 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
--  $as_echo_n "(cached) " >&6
--else
++{ $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
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_ext_crypt" = no; then
-+  for ac_lib in crypt; do
-+    LIBS="-l$ac_lib $CRYPT_LIBS  $ac_func_search_save_ext_LIBS"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
+ 
 -/* 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_func_search_ext_save_LIBS=$LIBS
++ac_cv_search_ext_crypt=no
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
--#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
 -
 -#undef $ac_func
++char crypt ();
++int
++main ()
++{
++return crypt ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_ext_crypt="none required"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_ext_crypt" = no; then
++  for ac_lib in crypt; do
++    LIBS="-l$ac_lib $CRYPT_LIBS  $ac_func_search_save_ext_LIBS"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -42805,1082 +10920,666 @@
+@@ -42301,1380 +10919,797 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -45356,13 +45100,13 @@
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_search_ext_crypt="-l$ac_lib"
 +break
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  done
 +fi
 +LIBS=$ac_func_search_ext_save_LIBS
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
 +$as_echo "$ac_cv_search_ext_crypt" >&6; }
 +if test "$ac_cv_search_ext_crypt" != no; then :
@@ -45401,10 +45145,6 @@
  done
  
  
--{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
--$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
--if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
--  $as_echo_n "(cached) " >&6
 +echo "LIBREPLACE_BROKEN_CHECKS: END"
 +
 +for ac_func in syslog
@@ -45414,11 +45154,16 @@
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYSLOG 1
 +_ACEOF
-+
+ 
+-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_n "(cached) " >&6
  else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lexc  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +  as_fn_error "Required function not found" "$LINENO" 5
 +fi
@@ -45445,31 +45190,71 @@
 -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
++for ac_header in netinet/in_systm.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
++if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_NETINET_IN_SYSTM_H 1
++_ACEOF
+ 
 -/* 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 ();
+-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 trace_back_stack ();
+-return $ac_func ();
 -  ;
 -  return 0;
 -}
-+fi
-+
 +done
 +
-+for ac_header in netinet/in_systm.h
++for ac_header in netinet/ip.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 :
++  ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
++	#include <sys/types.h>
++	#ifdef HAVE_NETINET_IN_H
++	#include <netinet/in.h>
++	#endif
++	#ifdef HAVE_NETINET_IN_SYSTM_H
++	#include <netinet/in_systm.h>
++	#endif
++
++"
++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IN_SYSTM_H 1
++#define HAVE_NETINET_IP_H 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -45492,58 +45277,38 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_exc_trace_back_stack=yes
+-  eval "$as_ac_var=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--	ac_cv_lib_exc_trace_back_stack=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
 +done
 +
-+for ac_header in netinet/ip.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
-+	#include <sys/types.h>
-+	#ifdef HAVE_NETINET_IN_H
-+	#include <netinet/in.h>
-+	#endif
-+	#ifdef HAVE_NETINET_IN_SYSTM_H
-+	#include <netinet/in_systm.h>
-+	#endif
-+
-+"
-+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IP_H 1
-+_ACEOF
-+
- 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
-+
-+done
-+
 +for ac_header in netinet/tcp.h netinet/in_ip.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 HAVE_LIBEXC 1
++  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--  LIBS="-lexc $LIBS"
-+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
 +
 +for ac_header in sys/sockio.h sys/un.h
@@ -45552,15 +45317,15 @@
 +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
++
+ done
  
-+done
- 
--# check for sysctlbyname for BSD systems
 +for ac_header in sys/uio.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
@@ -45569,14 +45334,14 @@
 +#define HAVE_SYS_UIO_H 1
 +_ACEOF
  
--for ac_func in sysctlbyname
++fi
+ 
+-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
-+fi
-+
 +done
 +
 +
@@ -45693,10 +45458,30 @@
  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
 +  eval "ac_cv_type_$cv=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
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-done
+-
 +ac_foo=`eval echo \\$ac_cv_type_$cv`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
 +$as_echo "$ac_foo" >&6; }
@@ -45705,18 +45490,120 @@
 +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 :
-+
+ 
+-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.  */
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_SOCKLEN_T 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#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
++fi
+ 
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
 +_ACEOF
 +
- 
++fi
++
++
++
++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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++$ac_includes_default
++#include <sys/socket.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++sa_family_t foo;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "ac_cv_type_$cv=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -	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"'`
@@ -45727,28 +45614,44 @@
 -   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
  
--#############################
--# check if building with gpfs
+-# Find a method of generating a stack trace
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
++_ACEOF
++
++fi
  
--for ac_header in gpfs_gpl.h
+ 
+ 
+-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
 -  { $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; }
++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
 -fi
@@ -45770,11 +45673,11 @@
 +
  $ac_includes_default
 -#include <$ac_header>
-+#include <sys/socket.h>
++#include <netdb.h>
 +int
 +main ()
 +{
-+sa_family_t foo;
++struct addrinfo foo;
 +  ;
 +  return 0;
 +}
@@ -45816,10 +45719,10 @@
 +{ $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 :
++	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 :
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45832,7 +45735,7 @@
 -/* end confdefs.h.  */
 -#include <$ac_header>
 +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
@@ -45919,186 +45822,53 @@
  fi
  
 -done
--
--if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
--
--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"
+-# 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
++
++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
+-  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
-+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.  */
--#include <isi_version/isi_version.h>
-+
-+$ac_includes_default
-+#include <netdb.h>
- int
- main ()
- {
--get_isilon_copyright()
-+struct addrinfo foo;
-   ;
-   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
-+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
--
--	samba_cv_HAVE_ONEFS=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
--echo $samba_cv_HAVE_ONEFS
--if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ONEFS 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"
-+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 addrinfo | 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 :
  
--LIBS="$save_LIBS"
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_ADDRINFO 1
-+_ACEOF
- 
--# 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
- 
--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
-+fi
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* 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"
 -#endif
-+fi
-+
-+
- 
-+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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
+-char backtrace_symbols ();
 +$ac_includes_default
 +#include <sys/socket.h>
  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 backtrace_symbols ();
 +struct sockaddr foo;
    ;
    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;;
@@ -46119,9 +45889,12 @@
 -	 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 :
 +  eval "ac_cv_type_$cv=yes"
-+else
+ 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
@@ -46134,84 +45907,115 @@
 +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
  
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
+-fi
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+-  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
+ 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"
 +
 +cat >>confdefs.h <<_ACEOF
 +#define $ac_tr_hdr 1
- _ACEOF
++_ACEOF
  
-+fi
+ fi
  
--	# 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
+-for ac_func in backtrace_symbols
 -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_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; }
 +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
+-  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>
-+
+-/* 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
++$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 $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/socket.h>
 +#include <sys/types.h>
 +#include <netinet/in.h>
-+
-+int
-+main ()
-+{
+ 
+ int
+ main ()
+ {
+-return $ac_func ();
 +struct sockaddr_storage foo;
-+  ;
-+  return 0;
-+}
+   ;
+   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
@@ -46220,22 +46024,20 @@
 -  (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 "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 -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; }
@@ -46244,109 +46046,40 @@
 +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 :
- 
--# 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_STRUCT_SOCKADDR_STORAGE 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
++
  
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
+-	eval "$as_ac_var=no"
+ 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"
+-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_Header'}
+-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; }
- 
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
+-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_header" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +
 +cat >>confdefs.h <<_ACEOF
 +#define $ac_tr_hdr 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
+ 
+-{ $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
 +
 +cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
@@ -46355,7 +46088,7 @@
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lunwind-ptrace  $LIBS"
+-LIBS="-lexc  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -46370,7 +46103,7 @@
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char _UPT_create ();
+-char trace_back_stack ();
 +$ac_includes_default
 +
 +#include <sys/socket.h>
@@ -46380,7 +46113,7 @@
  int
  main ()
  {
--return _UPT_create ();
+-return trace_back_stack ();
 +struct sockaddr_in6 foo;
    ;
    return 0;
@@ -46407,28 +46140,16 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_unwind_ptrace__UPT_create=yes
+-  ac_cv_lib_exc_trace_back_stack=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_unwind_ptrace__UPT_create=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
--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_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
--
--		LIBUNWIND_PTRACE="-lunwind-ptrace";
++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; }
@@ -46437,34 +46158,34 @@
 +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_LIBUNWIND_PTRACE 1
++
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SOCKADDR_IN6 1
- _ACEOF
++_ACEOF
++
  
+-	ac_cv_lib_exc_trace_back_stack=no
+ fi
  
--else
--   LIBUNWIND_PTRACE=""
+-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
- 
-+fi
- 
--	LIBS=$save_LIBS
+-{ $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
++
 +cat >>confdefs.h <<_ACEOF
 +#define $ac_tr_hdr 1
-+_ACEOF
+ _ACEOF
  
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-  LIBS="-lexc $LIBS"
 +fi
- 
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--	LIBS=$save_LIBS
++
++
 +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>
@@ -46478,37 +46199,169 @@
  
  fi
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
  
--# To use libunwind-ptrace, we also need to make some ptrace system calls.
--if test x"$LIBUNWIND_PTRACE" != x"" ; then
+-# check for sysctlbyname for BSD systems
 +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>
-+
+ 
+-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_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
 +"
 +if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = 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.  */
 +$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
  
--for ac_header in sys/ptrace.h
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+ 
+-#undef $ac_func
++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
++{ $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_in sock; sock.sin_len = sizeof(sock);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=no"
+-fi
++		libreplace_cv_HAVE_SOCK_SIN_LEN=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
++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
+ 
++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
+ 
+-#############################
+-# check if building with gpfs
++fi
+ 
+-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
++############################################
++# 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
+-fi
 -ac_res=`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; }
@@ -46517,7 +46370,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
@@ -46545,17 +46400,19 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_header_compiler=no
-+fi
- 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; }
-+{ $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
++int
++main ()
++{
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -46565,10 +46422,15 @@
 -_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 <$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;;
@@ -46587,32 +46449,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
  
 -  ac_header_preproc=no
 -fi
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
++		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; }
-+int
-+main ()
-+{
-+
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
++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
@@ -46648,208 +46501,81 @@
 -$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
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=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_ext
++{ $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
-+{ $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
 +
-+$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
- 
- fi
- 
--done
-+############################################
-+# 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 "$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
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--#if HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
--#if HAVE_SYS_PTRACE_H
--#include <sys/ptrace.h>
--#endif
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
- 
- int
- main ()
- {
- 
--		pid_t me = (pid_t)-1;
--		ptrace(PTRACE_ATTACH, me, 0, 0);
--		ptrace(PTRACE_DETACH, me, 0, 0);
--		return 0;
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
- 
-   ;
-   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
--$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_UNIXSOCKET=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=""
-+		libreplace_cv_HAVE_UNIXSOCKET=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
-+{ $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
- 
 +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
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_CONNECT 1
-+_ACEOF
+ _ACEOF
  
-+fi
-+done
+ fi
+-
+ done
  
+-if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
 +if test x"$ac_cv_func_connect" = x"no"; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GPFS 1
+-_ACEOF
  
+-    default_shared_modules="$default_shared_modules vfs_gpfs"
+-fi
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
- 
- 
--for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+        { $as_echo "$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 >conftest.$ac_ext <<_ACEOF
+-#############################################
+-# 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
++
++
++        { $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.  */
--/* 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
-@@ -43888,106 +11587,131 @@
- #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 <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
 +char connect ();
  int
  main ()
  {
--return $ac_func ();
+-get_isilon_copyright()
 +return connect ();
    ;
    return 0;
@@ -46876,49 +46602,48 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  samba_cv_HAVE_ONEFS=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
--
--	eval "$as_ac_var=no"
 +  ac_cv_lib_ext_nsl_s_connect=no;
 +		  ac_cv_lib_ext_nsl_s=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
+-	samba_cv_HAVE_ONEFS=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
 +{ $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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_CONNECT 1
- _ACEOF
++_ACEOF
  
- 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
++fi
 +LIBS=$ac_check_lib_ext_save_LIBS
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ONEFS 1
 +if test $ac_cv_lib_ext_nsl_s = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBNSL_S 1
-+_ACEOF
+ _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_s*)
 +			;;
@@ -46926,62 +46651,117 @@
 +			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
++
++
+ fi
  
+-LIBS="$save_LIBS"
  
-+fi
- 
- 
+-# 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="-lnsl $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
  
--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 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
+-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.  */
--/* 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>
+-#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"
  #endif
+-
 +char connect ();
-+int
-+main ()
-+{
+ 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 connect ();
-+  ;
-+  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
+-
+-	{ $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
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_nsl_connect=yes;
 +		  ac_cv_lib_ext_nsl=yes
@@ -46991,23 +46771,107 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+ 
+-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
+ fi
+-ac_res=`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>
 +{ $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
-+
-+fi
+ _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
 +LIBS=$ac_check_lib_ext_save_LIBS
-+
+ 
+-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>
 +if test $ac_cv_lib_ext_nsl = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBNSL 1
-+_ACEOF
-+
+ _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
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl*)
 +			;;
@@ -47015,44 +46879,97 @@
 +			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
-+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
+ 
+-fi
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lsocket $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
 +
-+
- 
--#undef $ac_func
 +        { $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
+   $as_echo_n "(cached) " >&6
+ else
+-  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
 +  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
-@@ -43995,101 +11719,65 @@
+@@ -43683,349 +11718,220 @@
  #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 _UPT_create ();
 +char connect ();
  int
  main ()
  {
--return $ac_func ();
+-return _UPT_create ();
 +return connect ();
    ;
    return 0;
@@ -47079,48 +46996,53 @@
 -	 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 :
 +  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_unwind_ptrace__UPT_create=no
 +  ac_cv_lib_ext_socket_connect=no;
 +		  ac_cv_lib_ext_socket=no
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext 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_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
+-
+-		LIBUNWIND_PTRACE="-lunwind-ptrace";
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND_PTRACE 1
 +{ $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
  
--	eval "$as_ac_var=no"
+-
+-else
+-   LIBUNWIND_PTRACE=""
  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
 +if test $ac_cv_lib_ext_socket = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSOCKET 1
- _ACEOF
++_ACEOF
  
+-	LIBS=$save_LIBS
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lsocket*)
 +			;;
@@ -47128,85 +47050,82 @@
 +			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
- fi
--done
  
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
++fi
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-	LIBS=$save_LIBS
+ 
+-fi
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-linet $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
--for ac_func in __getcwd _getcwd
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ 
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
+ 
+-for ac_header in sys/ptrace.h
 -do
--as_ac_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_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 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
+-fi
+-ac_res=`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
 -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
-@@ -44097,102 +11785,88 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
+-$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 connect ();
- int
- main ()
- {
--return $ac_func ();
++int
++main ()
++{
 +return connect ();
-   ;
-   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
@@ -47215,11 +47134,8 @@
 -  (exit $ac_status); } && {
 -	 test -z "$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_link "$LINENO"; then :
 +  ac_cv_lib_ext_inet_connect=yes;
 +		  ac_cv_lib_ext_inet=yes
@@ -47231,23 +47147,60 @@
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+ 
+-	ac_header_compiler=no
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
 +$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
 +    if test $ac_cv_lib_ext_inet_connect = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_CONNECT 1
 +_ACEOF
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
 +fi
 +LIBS=$ac_check_lib_ext_save_LIBS
-+
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$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_inet = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBINET 1
-+_ACEOF
-+
+ _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
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-linet*)
 +			;;
@@ -47255,29 +47208,64 @@
 +			LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
  
--	eval "$as_ac_var=no"
+-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; }
 +			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
  
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
 +$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
 +
 +	fi
  fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
+-as_val=`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'}
--		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 +
 +for ac_func in gethostbyname
@@ -47285,75 +47273,59 @@
 +  ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_GETHOSTBYNAME 1
  _ACEOF
  
  fi
+-
  done
  
+-    { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
+-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
+-    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_gethostbyname" = x"no"; then
 +
- 
++
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
- 
- 
--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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
 +$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
 +if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++  $as_echo_n "(cached) " >&6
++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.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
+ 
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.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
-@@ -44200,105 +11874,65 @@
- #ifdef __cplusplus
- extern "C"
+-#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"
  #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 ()
  {
--return $ac_func ();
+-
+-		pid_t me = (pid_t)-1;
+-		ptrace(PTRACE_ATTACH, me, 0, 0);
+-		ptrace(PTRACE_DETACH, me, 0, 0);
+-		return 0;
+-
 +return gethostbyname ();
    ;
    return 0;
@@ -47380,7 +47352,15 @@
 -	 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_link "$LINENO"; then :
 +  ac_cv_lib_ext_nsl_s_gethostbyname=yes;
 +		  ac_cv_lib_ext_nsl_s=yes
@@ -47388,7 +47368,11 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-		LIBUNWIND_PTRACE=""
+-
 +  ac_cv_lib_ext_nsl_s_gethostbyname=no;
 +		  ac_cv_lib_ext_nsl_s=no
  fi
@@ -47399,23 +47383,14 @@
 -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_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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETHOSTBYNAME 1
- _ACEOF
++_ACEOF
  
- fi
--done
++fi
 +LIBS=$ac_check_lib_ext_save_LIBS
  
 +if test $ac_cv_lib_ext_nsl_s = yes; then :
@@ -47438,14 +47413,14 @@
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+ 
+ 
+-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 -lnsl" >&5
 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 +if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
@@ -47477,7 +47452,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44306,107 +11940,65 @@
+@@ -44033,106 +11939,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47579,13 +47554,13 @@
 +LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
  
- 
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $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 :
@@ -47617,7 +47592,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44414,105 +12006,87 @@
+@@ -44140,101 +12005,87 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47667,14 +47642,21 @@
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
 +  ac_cv_lib_ext_socket_gethostbyname=no;
 +		  ac_cv_lib_ext_socket=no
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
+-	eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
++    if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
++_ACEOF
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -47686,23 +47668,14 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
-+    if test $ac_cv_lib_ext_socket_gethostbyname = 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_GETHOSTBYNAME 1
++#define HAVE_LIBSOCKET 1
  _ACEOF
  
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
-+if test $ac_cv_lib_ext_socket = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
- 
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lsocket*)
 +			;;
@@ -47710,9 +47683,10 @@
 +			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
- 
- 
-+fi
++
++
+ 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"
@@ -47723,7 +47697,7 @@
 +	fi
 +fi
  
--for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
+-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
@@ -47755,6 +47729,10 @@
 +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>
@@ -47763,11 +47741,7 @@
 -#endif
  
 -#undef $ac_func
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS  $LIBS"
 +
-+
-+
 +        { $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 :
@@ -47778,7 +47752,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -44520,2540 +12094,2283 @@
+@@ -44242,2963 +12093,2377 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47880,7 +47854,7 @@
  
 +	fi
 +fi
- 
++
 +# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
 +old_LIBS=$LIBS
 +LIBS="${LIBREPLACE_NETWORK_LIBS}"
@@ -47895,22 +47869,13 @@
 +#define HAVE_SOCKETPAIR 1
 +_ACEOF
  
-+else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
-+fi
-+done
- 
- 
--for ac_func in getdents __getdents _lseek __lseek _read __read
+-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 "$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
+-  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -47921,44 +47886,33 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
++fi
++done
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_REPLACE_INET_NTOA=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
- #endif
-+main() { struct in_addr ip; ip.s_addr = 0x12345678;
-+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
-+    strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
-+exit(1);}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_REPLACE_INET_NTOA=yes
+-#endif
++{ $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
-+  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
  
 -#undef $ac_func
--
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_REPLACE_INET_NTOA=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -47971,11 +47925,14 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
-+$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
- 
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
+ #endif
+-
 -int
 -main ()
 -{
@@ -47983,12 +47940,10 @@
 -  ;
 -  return 0;
 -}
-+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 HAVE_INET_NTOA 1
++main() { struct in_addr ip; ip.s_addr = 0x12345678;
++if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
++    strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
++exit(1);}
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -48012,24 +47967,22 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++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"
-+else
-+  libreplace_cv_REPLACE_INET_NTOA=yes
++  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
-+done
-+
-+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+
-+$as_echo "#define REPLACE_INET_NTOA 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
-+    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -48038,45 +47991,53 @@
 -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: $libreplace_cv_REPLACE_INET_NTOA" >&5
++$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
 +
-+for ac_func in inet_aton
++for ac_func in inet_ntoa
 +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 :
++  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
-+#define HAVE_INET_ATON 1
++#define HAVE_INET_NTOA 1
  _ACEOF
  
 +else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
++  libreplace_cv_REPLACE_INET_NTOA=yes
  fi
  done
  
++if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
++
++$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
  
-+for ac_func in inet_ntop
++    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
++fi
+ 
++for ac_func in inet_aton
 +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 :
++  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
-+#define HAVE_INET_NTOP 1
++#define HAVE_INET_ATON 1
 +_ACEOF
  
 +else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
 +fi
 +done
  
  
-+for ac_func in inet_pton
++for ac_func in inet_ntop
 +do :
-+  ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-+if test "x$ac_cv_func_inet_pton" = x""yes; then :
++  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_PTON 1
++#define HAVE_INET_NTOP 1
 +_ACEOF
  
--for ac_func in getdirentries _write __write _fork __fork
+-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
@@ -48086,37 +48047,47 @@
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
++fi
++done
++
++
++for ac_func in inet_pton
++do :
++  ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
++if test "x$ac_cv_func_inet_pton" = x""yes; then :
++  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
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
-+fi
-+done
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++else
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
++fi
++done
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
+ 
+-#undef $ac_func
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
 +$as_echo_n "checking for getaddrinfo... " >&6; }
 +if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
  
--#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -48129,12 +48100,15 @@
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
+-#endif
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 +#include <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
- #endif
--
++#endif
 +#include <sys/socket.h>
 +#include <netdb.h>
  int
@@ -48231,14 +48205,15 @@
  _ACEOF
  
  fi
-+
- done
+-done
  
++done
  
+ 
 +ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
 +"
 +if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
-+
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
 +_ACEOF
@@ -48249,7 +48224,7 @@
 +fi
  
  
--for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+-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
@@ -48350,26 +48325,12 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  libreplace_cv_HAVE_GETIFADDRS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
-+$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
-+if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
- 
+-fi
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
++  libreplace_cv_HAVE_GETIFADDRS=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -48380,22 +48341,59 @@
 -   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_exeext conftest.$ac_ext
+ fi
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
+ 
++$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
+ 
+ 
++$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
+ 
+ 
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
+ 
++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
 +##################
 +# look for a method of finding the list of network interfaces
 +iface=no;
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
 +$as_echo_n "checking for iface getifaddrs... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
 +#define HAVE_IFACE_GETIFADDRS 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48406,7 +48404,7 @@
 +#include "$libreplacedir/getifaddrs.c"
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
 +else
@@ -48416,32 +48414,57 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
- fi
--done
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
 +if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
-+
+ 
+-#undef $ac_func
 +else
 +	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
 +fi
  
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
  
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
 +if test $iface = no; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
 +$as_echo_n "checking for iface AIX... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
- 
++
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_AIX=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +#define HAVE_IFACE_AIX 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48453,41 +48476,70 @@
 +#include "$libreplacedir/getifaddrs.c"
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
-+_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"
 +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
  
-+fi
+-	eval "$as_ac_var=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
  
+-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
 +fi
-+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
++
++
 +if test $iface = no; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
 +$as_echo_n "checking for iface ifconf... " >&6; }
 +if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++  $as_echo_n "(cached) " >&6
++else
 +
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_IFCONF=cross
@@ -48506,8 +48558,6 @@
 +#define getifaddrs_test main
 +#include "$libreplacedir/test/getifaddrs.c"
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_IFACE_IFCONF=yes
 +else
@@ -48523,30 +48573,25 @@
 +if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-+
+ 
+ fi
+-done
+-
 +fi
-+fi
-+
+ 
 +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
-+
+ 
 +if test "$cross_compiling" = yes; then :
 +  libreplace_cv_HAVE_IFACE_IFREQ=cross
 +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
++/* end 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.  */
 +#define HAVE_IFACE_IFREQ 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -48567,11 +48612,6 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
@@ -48579,10 +48619,45 @@
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
  
--#undef $ac_func
 +fi
 +fi
  
+-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}: 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
+-/* 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.  */
+ 
 -/* 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.  */
@@ -48596,15 +48671,264 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++#include <stdlib.h> /* for NULL */
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netdb.h>
++#include <netinet/in.h>
+ 
+ int
+ main ()
+ {
+-return $ac_func ();
++
++#ifndef IPV6_V6ONLY
++#error no 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"
++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
++		libreplace_cv_HAVE_IPV6_V6ONLY=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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-done
+-
+-
+-
+-
+-
+-
+-for ac_func in getdirentries _write __write _fork __fork
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++{ $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
++	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 ();
++
++	#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"
++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
++		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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-done
+-
+-
+-
+-
++{ $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
+ 
++$as_echo "#define HAVE_LINUX_IPV6_V6ONLY_26 1" >>confdefs.h
+ 
++	fi
++fi
+ 
+-for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5
 +$as_echo_n "checking for ipv6 support... " >&6; }
 +if test "${libreplace_cv_HAVE_IPV6+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
 +	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 <stdlib.h> /* for NULL */
 +#include <sys/socket.h>
 +#include <sys/types.h>
@@ -48626,6 +48950,14 @@
 +	const char *es = gai_strerror(ret);
 +}
 +freeaddrinfo(ai);
++{
++	int val = 1;
++	#ifdef HAVE_LINUX_IPV6_V6ONLY_26
++	#define IPV6_V6ONLY 26
++	#endif
++	ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
++			 (const void *)&val, sizeof(val));
++}
 +
    ;
    return 0;
@@ -48662,11 +48994,8 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
+-fi
 +		libreplace_cv_HAVE_IPV6=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 \
@@ -48682,14 +49011,18 @@
 -  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
+ 
+ fi
+-done
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6" >&5
 +$as_echo "$libreplace_cv_HAVE_IPV6" >&6; }
 +if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-+
+ 
 +$as_echo "#define HAVE_IPV6 1" >>confdefs.h
  
- fi
--done
++fi
  
 +LIBS=$old_LIBS
 +CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
@@ -48701,9 +49034,7 @@
  
 +CPPFLAGS="${SAVE_CPPFLAGS}"
  
-+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
- 
--for ac_func in pread _pread __pread pread64 _pread64 __pread64
+-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
@@ -48720,21 +49051,22 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
++LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
  
 -/* 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_OBJS="${LIBREPLACEOBJ}"
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
  
 -#undef $ac_func
++LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -48757,20 +49089,154 @@
 -  ;
 -  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
 +# add -ldl to the global LIBS
 +LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
 +AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-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 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_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ 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_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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.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"
++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.  */
+-/* 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
++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
++done
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
++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"
++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
@@ -48813,7 +49279,7 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in unistd.h grp.h sys/id.h memory.h alloca.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"
@@ -48828,7 +49294,7 @@
 +
  done
  
-+for ac_header in limits.h float.h libintl.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"
@@ -48842,7 +49308,7 @@
  
 +done
  
-+for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.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"
@@ -48866,7 +49332,7 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.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
++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"
@@ -48881,30 +49347,20 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
  
 -#undef $ac_func
-+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"
-+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
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -48919,7 +49375,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
++done
  
 -int
 -main ()
@@ -48928,16 +49384,12 @@
 -  ;
 -  return 0;
 -}
-+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/sysmacros.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_SYSMACROS_H 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -48981,7 +49433,7 @@
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++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"
@@ -48997,12 +49449,14 @@
  
 +done
  
-+for ac_header in sys/sysmacros.h
++for ac_header in langinfo.h locale.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 :
++  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_SYS_SYSMACROS_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
 +fi
@@ -49019,14 +49473,12 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in sys/syslog.h syslog.h
++for ac_header in xfs/libxfs.h
 +do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_XFS_LIBXFS_H 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -49034,30 +49486,20 @@
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
  
 -#undef $ac_func
-+for ac_header in langinfo.h locale.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
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -49072,7 +49514,7 @@
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
++done
  
 -int
 -main ()
@@ -49081,27 +49523,7 @@
 -  ;
 -  return 0;
 -}
-+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
-+
-+fi
-+
-+done
-+
-+for ac_header in netgroup.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 :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETGROUP_H 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -49127,6 +49549,13 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++for ac_header in netgroup.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 :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_NETGROUP_H 1
++_ACEOF
  
 -	eval "$as_ac_var=no"
  fi
@@ -52014,7 +52443,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47061,100 +14378,41 @@
+@@ -47206,100 +14471,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52135,7 +52564,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47163,111 +14421,106 @@
+@@ -47308,111 +14514,106 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52316,7 +52745,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47275,100 +14528,41 @@
+@@ -47420,100 +14621,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52437,7 +52866,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47377,112 +14571,68 @@
+@@ -47522,112 +14664,68 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52585,7 +53014,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47490,100 +14640,54 @@
+@@ -47635,100 +14733,54 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52714,7 +53143,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47592,111 +14696,43 @@
+@@ -47737,111 +14789,43 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52844,7 +53273,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47704,316 +14740,299 @@
+@@ -47849,316 +14833,299 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53381,7 +53810,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48022,213 +15041,178 @@
+@@ -48167,213 +15134,178 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53716,7 +54145,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48237,111 +15221,67 @@
+@@ -48382,111 +15314,67 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53868,7 +54297,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48349,214 +15289,192 @@
+@@ -48494,214 +15382,192 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54219,7 +54648,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48564,856 +15482,646 @@
+@@ -48709,856 +15575,646 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55521,7 +55950,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49421,85 +16129,43 @@
+@@ -49566,85 +16222,43 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55627,7 +56056,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49508,108 +16174,44 @@
+@@ -49653,108 +16267,44 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55758,7 +56187,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49617,103 +16219,80 @@
+@@ -49762,103 +16312,80 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -55913,7 +56342,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49721,183 +16300,89 @@
+@@ -49866,183 +16393,89 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56152,7 +56581,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49906,109 +16391,91 @@
+@@ -50051,109 +16484,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56322,7 +56751,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50016,105 +16483,90 @@
+@@ -50161,105 +16576,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56487,7 +56916,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50122,105 +16574,92 @@
+@@ -50267,105 +16667,92 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56654,7 +57083,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50228,103 +16667,91 @@
+@@ -50373,103 +16760,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56819,7 +57248,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50332,102 +16759,90 @@
+@@ -50477,102 +16852,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56983,7 +57412,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50435,103 +16850,91 @@
+@@ -50580,103 +16943,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57149,7 +57578,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50539,103 +16942,90 @@
+@@ -50684,103 +17035,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57313,7 +57742,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50643,107 +17033,91 @@
+@@ -50788,107 +17126,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57484,7 +57913,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50751,190 +17125,90 @@
+@@ -50896,190 +17218,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57724,7 +58153,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50942,102 +17216,77 @@
+@@ -51087,102 +17309,77 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57876,7 +58305,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -51045,62 +17294,53 @@
+@@ -51190,62 +17387,53 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57975,7 +58404,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51108,39 +17348,40 @@
+@@ -51253,39 +17441,40 @@
  fi
  done
  
@@ -58043,7 +58472,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -51148,62 +17389,118 @@
+@@ -51293,62 +17482,118 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58206,7 +58635,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51211,102 +17508,141 @@
+@@ -51356,102 +17601,141 @@
  fi
  done
  
@@ -58423,7 +58852,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51318,7 +17654,7 @@
+@@ -51463,7 +17747,7 @@
  esac
  
  # Check whether --enable-static was given.
@@ -58432,7 +58861,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
  case $enableval in
  yes) enable_static=yes ;;
-@@ -51340,7 +17676,7 @@
+@@ -51485,7 +17769,7 @@
  fi
  
  # Check whether --enable-shared was given.
@@ -58441,7 +58870,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
  case $enableval in
  yes) enable_shared=yes ;;
-@@ -51367,16 +17703,16 @@
+@@ -51512,16 +17796,16 @@
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
  # Check whether --enable-pie was given.
@@ -58461,7 +58890,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51385,11 +17721,11 @@
+@@ -51530,11 +17814,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -58476,7 +58905,7 @@
  		then
  			samba_cv_fpie=yes
  		else
-@@ -51398,7 +17734,7 @@
+@@ -51543,7 +17827,7 @@
  		rm -f conftest*
  
  fi
@@ -58485,7 +58914,7 @@
  $as_echo "$samba_cv_fpie" >&6; }
  	if test x"${samba_cv_fpie}" = x"yes"
  	then
-@@ -51410,16 +17746,16 @@
+@@ -51555,16 +17839,16 @@
  # Set defaults
  RELRO_LDFLAGS=""
  # Check whether --enable-relro was given.
@@ -58505,7 +58934,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51428,11 +17764,11 @@
+@@ -51573,11 +17857,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58520,7 +58949,7 @@
  		then
  			samba_cv_relro=yes
  		else
-@@ -51441,7 +17777,7 @@
+@@ -51586,7 +17870,7 @@
  		rm -f conftest*
  
  fi
@@ -58529,7 +58958,7 @@
  $as_echo "$samba_cv_relro" >&6; }
  	if test x"${samba_cv_relro}" = x"yes"
  	then
-@@ -51470,7 +17806,7 @@
+@@ -51615,7 +17899,7 @@
  # You need to specify how to create a shared library and
    # how to compile C code to produce PIC object files
  
@@ -58538,7 +58967,7 @@
  $as_echo_n "checking ability to build shared libraries... " >&6; }
  
    # and these are for particular systems
-@@ -51478,14 +17814,10 @@
+@@ -51623,14 +17907,10 @@
  		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
  			case "$host_os" in
  				*linux*)
@@ -58555,7 +58984,7 @@
   ;;
  			esac
  			BLDSHARED="true"
-@@ -51496,15 +17828,11 @@
+@@ -51641,15 +17921,11 @@
  			DYNEXP="-Wl,--export-dynamic"
  			PICFLAG="-fPIC"
  			SONAMEFLAG="-Wl,-soname="
@@ -58572,9 +59001,9 @@
 +$as_echo "#define SUNOS5 1" >>confdefs.h
  
  			BLDSHARED="true"
- 			LDSHFLAGS="-G"
-@@ -51522,33 +17850,23 @@
- 				LDSHFLAGS="-G \${CFLAGS}"
+ 			if test "${GCC}" = "yes"; then
+@@ -51672,33 +17948,23 @@
+ 				SONAMEFLAG="-Wl,-h,"
  			fi
  
 -cat >>confdefs.h <<\_ACEOF
@@ -58612,7 +59041,7 @@
  
  			;;
  		*netbsd* | *freebsd* | *dragonfly* )
-@@ -51558,14 +17876,10 @@
+@@ -51708,14 +17974,10 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC -DPIC"
  
@@ -58629,7 +59058,7 @@
  
  			;;
  		*openbsd*)  BLDSHARED="true"
-@@ -51574,26 +17888,18 @@
+@@ -51724,26 +17986,18 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
  
@@ -58660,7 +59089,7 @@
  
  			;;
  			esac
-@@ -51607,15 +17913,11 @@
+@@ -51757,15 +18011,11 @@
  				PICFLAG="-KPIC"
  			fi
  
@@ -58678,7 +59107,7 @@
  
  			BLDSHARED="true"
  			# use expfull to export underscored symbols
-@@ -51631,25 +17933,17 @@
+@@ -51781,25 +18031,17 @@
  			fi
  
  
@@ -58708,7 +59137,7 @@
  
  			# Use special PIC flags for the native HP-UX compiler.
  				BLDSHARED="true"
-@@ -51671,74 +17965,52 @@
+@@ -51821,74 +18063,52 @@
  				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
  			fi
  
@@ -58796,7 +59225,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ROFF"; then
-@@ -51749,91 +18021,71 @@
+@@ -51899,91 +18119,71 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -58903,7 +59332,7 @@
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -51847,16 +18099,12 @@
+@@ -51997,16 +18197,12 @@
                          # actually support the PIE stuff.
                          PIE_LDFLAGS=
                          PIE_CFLAGS=
@@ -58922,7 +59351,7 @@
  
  			;;
    esac
-@@ -51873,19 +18121,15 @@
+@@ -52023,19 +18219,15 @@
  	LDFLAGS="$LDFLAGS -L./bin"
  fi
  
@@ -58945,7 +59374,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -51896,42 +18140,17 @@
+@@ -52046,42 +18238,17 @@
    return 0;
  }
  _ACEOF
@@ -58993,7 +59422,7 @@
  	LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
  	test x"$ld_as_needed_flag_found" = xyes && break
  done
-@@ -51944,14 +18163,10 @@
+@@ -52094,14 +18261,10 @@
  
  for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
  	saved_ldflags="$LDFLAGS"
@@ -59010,7 +59439,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -51962,94 +18177,69 @@
+@@ -52112,94 +18275,69 @@
    return 0;
  }
  _ACEOF
@@ -59130,7 +59559,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -52065,7 +18255,7 @@
+@@ -52215,7 +18353,7 @@
  
  
  fi
@@ -59139,7 +59568,7 @@
  $as_echo "$ac_cv_shlib_works" >&6; }
  if test $ac_cv_shlib_works = no; then
     BLDSHARED=false
-@@ -52082,9 +18272,9 @@
+@@ -52232,9 +18370,9 @@
  	merged_build_possible=no
  fi
  
@@ -59151,7 +59580,7 @@
  $as_echo "$PICFLAG" >&6; }
  
  
-@@ -52156,10 +18346,10 @@
+@@ -52306,10 +18444,10 @@
  USESHARED=false
  
  
@@ -59164,7 +59593,7 @@
    enableval=$enable_shared_libs; enable_shared_libs=$enableval
  else
    enable_shared_libs=yes
-@@ -52170,11 +18360,11 @@
+@@ -52320,11 +18458,11 @@
  	USESHARED=$BLDSHARED
  fi
  
@@ -59178,7 +59607,7 @@
  $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
  fi
  
-@@ -52202,14 +18392,13 @@
+@@ -52352,14 +18490,13 @@
  
  
  # Check whether --with-static-libs was given.
@@ -59195,7 +59624,7 @@
  fi
  
  
-@@ -52231,7 +18420,7 @@
+@@ -52381,7 +18518,7 @@
  #  be extracted from their respective source directories
  #
  # Check whether --enable-external_libtalloc was given.
@@ -59204,7 +59633,7 @@
    enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -52246,9 +18435,9 @@
+@@ -52396,9 +18533,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
@@ -59216,7 +59645,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -52261,14 +18450,14 @@
+@@ -52411,14 +18548,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59234,7 +59663,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52276,10 +18465,10 @@
+@@ -52426,10 +18563,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -59247,7 +59676,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52289,9 +18478,9 @@
+@@ -52439,9 +18576,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
@@ -59259,7 +59688,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -52304,14 +18493,14 @@
+@@ -52454,14 +18591,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59277,7 +59706,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -52319,10 +18508,10 @@
+@@ -52469,10 +18606,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -59290,7 +59719,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -52331,7 +18520,7 @@
+@@ -52481,7 +18618,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -59299,7 +59728,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -52344,13 +18533,13 @@
+@@ -52494,13 +18631,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -59316,7 +59745,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -52358,7 +18547,7 @@
+@@ -52508,7 +18645,7 @@
  fi
  
  pkg_failed=no
@@ -59325,7 +59754,7 @@
  $as_echo_n "checking for LIBTALLOC... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -52366,11 +18555,11 @@
+@@ -52516,11 +18653,11 @@
          pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -59340,7 +59769,7 @@
    pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -52384,11 +18573,11 @@
+@@ -52534,11 +18671,11 @@
          pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -59355,7 +59784,7 @@
    pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -52415,768 +18604,112 @@
+@@ -52565,768 +18702,112 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBTALLOC_PKG_ERRORS" >&5
  
@@ -60194,7 +60623,7 @@
  $as_echo "$ac_cv_sizeof_void_p" >&6; }
  
  
-@@ -53188,17 +18721,15 @@
+@@ -53338,17 +18819,15 @@
  
  
  if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
@@ -60217,7 +60646,7 @@
  fi
  
  if test x"$VERSIONSCRIPT" != "x"; then
-@@ -53233,16 +18764,16 @@
+@@ -53383,16 +18862,16 @@
  
  
  
@@ -60237,7 +60666,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53268,7 +18799,7 @@
+@@ -53418,7 +18897,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
  		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -60246,7 +60675,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
  			enable_static=yes
-@@ -53281,12 +18812,12 @@
+@@ -53431,12 +18910,12 @@
  		enable_static=yes
  		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
  		LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -60261,7 +60690,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -53312,7 +18843,7 @@
+@@ -53462,7 +18941,7 @@
  
  
  # Check whether --enable-external_libtdb was given.
@@ -60270,7 +60699,7 @@
    enableval=$enable_external_libtdb;  enable_external_libtalloc=$enableval
  else
     enable_external_libtalloc=auto
-@@ -53323,7 +18854,7 @@
+@@ -53473,7 +18952,7 @@
  then
  
  pkg_failed=no
@@ -60279,7 +60708,7 @@
  $as_echo_n "checking for LIBTDB... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-@@ -53331,11 +18862,11 @@
+@@ -53481,11 +18960,11 @@
          pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -60294,7 +60723,7 @@
    pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.2.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53349,11 +18880,11 @@
+@@ -53499,11 +18978,11 @@
          pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -60309,7 +60738,7 @@
    pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.2.1" 2>/dev/null`
  else
    pkg_failed=yes
-@@ -53380,13 +18911,11 @@
+@@ -53530,13 +19009,11 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBTDB_PKG_ERRORS" >&5
  
@@ -60325,7 +60754,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53394,9 +18923,7 @@
+@@ -53544,9 +19021,7 @@
  elif test $pkg_failed = untried; then
  
  		if test x$enable_external_libtdb = xyes; then
@@ -60336,7 +60765,7 @@
  		else
  			enable_external_libtdb=no
  		fi
-@@ -53404,7 +18931,7 @@
+@@ -53554,7 +19029,7 @@
  else
  	LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
  	LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
@@ -60345,7 +60774,7 @@
  $as_echo "yes" >&6; }
  	 enable_external_libtdb=yes
  fi
-@@ -53423,9 +18950,7 @@
+@@ -53573,9 +19048,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -60356,7 +60785,7 @@
  fi
  TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
  TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -53438,104 +18963,12 @@
+@@ -53588,104 +19061,12 @@
  TDB_CFLAGS="-I$tdbdir/include"
  
  
@@ -60466,7 +60895,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -53543,151 +18976,12 @@
+@@ -53693,151 +19074,12 @@
  fi
  done
  
@@ -60623,7 +61052,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -53698,17 +18992,13 @@
+@@ -53848,17 +19090,13 @@
  
  
  
@@ -60644,7 +61073,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -53719,56 +19009,29 @@
+@@ -53869,56 +19107,29 @@
    return 0;
  }
  _ACEOF
@@ -60708,7 +61137,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -53779,41 +19042,18 @@
+@@ -53929,41 +19140,18 @@
    return 0;
  }
  _ACEOF
@@ -60754,7 +61183,7 @@
  
   fi
  
-@@ -53850,16 +19090,16 @@
+@@ -54000,16 +19188,16 @@
  
  
  
@@ -60774,7 +61203,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53885,7 +19125,7 @@
+@@ -54035,7 +19223,7 @@
  	if eval $BLDSHARED = true; then
  		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
  		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -60783,7 +61212,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
  			enable_static=yes
-@@ -53898,12 +19138,12 @@
+@@ -54048,12 +19236,12 @@
  		enable_static=yes
  		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
  		LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -60798,7 +61227,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -53959,16 +19199,16 @@
+@@ -54109,16 +19297,16 @@
  
  
  
@@ -60818,7 +61247,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -53994,7 +19234,7 @@
+@@ -54144,7 +19332,7 @@
  	if eval $BLDSHARED = true; then
  		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
  		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -60827,7 +61256,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54007,12 +19247,12 @@
+@@ -54157,12 +19345,12 @@
  		enable_static=yes
  		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
  		LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -60842,7 +61271,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54050,16 +19290,16 @@
+@@ -54200,16 +19388,16 @@
  
  
  
@@ -60862,7 +61291,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54085,7 +19325,7 @@
+@@ -54235,7 +19423,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -60871,7 +61300,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54098,12 +19338,12 @@
+@@ -54248,12 +19436,12 @@
  		enable_static=yes
  		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
  		LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -60886,7 +61315,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54141,16 +19381,16 @@
+@@ -54291,16 +19479,16 @@
  
  
  
@@ -60906,7 +61335,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54176,7 +19416,7 @@
+@@ -54326,7 +19514,7 @@
  	if eval $BLDSHARED = true; then
  		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -60915,7 +61344,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54189,12 +19429,12 @@
+@@ -54339,12 +19527,12 @@
  		enable_static=yes
  		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
  		LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -60930,7 +61359,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54232,19 +19472,19 @@
+@@ -54382,19 +19570,19 @@
  
  
  
@@ -60953,7 +61382,7 @@
  $as_echo "no" >&6; }
  		build_lib=no
  		;;
-@@ -54253,7 +19493,7 @@
+@@ -54403,7 +19591,7 @@
  else
  
  # if unspecified, default is not to build
@@ -60962,7 +61391,7 @@
  $as_echo "no" >&6; }
  build_lib=no
  
-@@ -54269,7 +19509,7 @@
+@@ -54419,7 +19607,7 @@
  	if eval $BLDSHARED = true; then
  		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
  		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -60971,7 +61400,7 @@
  $as_echo "yes" >&6; }
  		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
  			enable_static=yes
-@@ -54282,12 +19522,12 @@
+@@ -54432,12 +19620,12 @@
  		enable_static=yes
  		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
  		LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -60986,7 +61415,7 @@
  $as_echo "shared library not selected" >&6; }
  fi
  if test $enable_static = yes; then
-@@ -54304,165 +19544,39 @@
+@@ -54454,165 +19642,39 @@
  
  ################
  
@@ -61164,7 +61593,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54472,102 +19586,9 @@
+@@ -54622,102 +19684,9 @@
  fi
  
  else
@@ -61269,7 +61698,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -54582,17 +19603,13 @@
+@@ -54732,17 +19701,13 @@
  # Check if the compiler supports the LL prefix on long long integers.
  # AIX needs this.
  
@@ -61290,7 +61719,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -54603,190 +19620,97 @@
+@@ -54753,190 +19718,97 @@
    return 0;
  }
  _ACEOF
@@ -61511,7 +61940,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54796,67 +19720,34 @@
+@@ -54946,67 +19818,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
@@ -61589,7 +62018,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54866,67 +19757,34 @@
+@@ -55016,67 +19855,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -61667,7 +62096,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -54936,67 +19794,34 @@
+@@ -55086,67 +19892,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
@@ -61745,7 +62174,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55006,67 +19831,34 @@
+@@ -55156,67 +19929,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -61823,7 +62252,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55076,64 +19868,31 @@
+@@ -55226,64 +19966,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
@@ -61897,7 +62326,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55149,55 +19908,28 @@
+@@ -55299,55 +20006,28 @@
    return 0;
  }
  _ACEOF
@@ -61960,7 +62389,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55213,58 +19945,31 @@
+@@ -55363,58 +20043,31 @@
    return 0;
  }
  _ACEOF
@@ -62027,7 +62456,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55273,67 +19978,34 @@
+@@ -55423,67 +20076,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = major(dev); return 0; }
  _ACEOF
@@ -62105,7 +62534,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55342,67 +20014,34 @@
+@@ -55492,67 +20112,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = minor(dev); return 0; }
  _ACEOF
@@ -62183,7 +62612,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -55411,129 +20050,63 @@
+@@ -55561,129 +20148,63 @@
  #include <sys/types.h>
  main() { dev_t dev = makedev(1,2); return 0; }
  _ACEOF
@@ -62332,7 +62761,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -55546,55 +20119,28 @@
+@@ -55696,55 +20217,28 @@
    return 0;
  }
  _ACEOF
@@ -62395,7 +62824,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -55605,55 +20151,28 @@
+@@ -55755,55 +20249,28 @@
    return 0;
  }
  _ACEOF
@@ -62458,7 +62887,7 @@
  /* end confdefs.h.  */
  
  #include <sys/time.h>
-@@ -55666,46 +20185,19 @@
+@@ -55816,46 +20283,19 @@
    return 0;
  }
  _ACEOF
@@ -62511,7 +62940,7 @@
  
  fi
  
-@@ -55717,120 +20209,24 @@
+@@ -55867,120 +20307,24 @@
      # which rely on signals.
  
  
@@ -62640,7 +63069,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -55854,58 +20250,27 @@
+@@ -56004,58 +20348,27 @@
    return 0;
  }
  _ACEOF
@@ -62707,7 +63136,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -55929,58 +20294,27 @@
+@@ -56079,58 +20392,27 @@
    return 0;
  }
  _ACEOF
@@ -62774,7 +63203,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56004,49 +20338,22 @@
+@@ -56154,49 +20436,22 @@
    return 0;
  }
  _ACEOF
@@ -62830,7 +63259,7 @@
  
  
  
-@@ -56064,18 +20371,14 @@
+@@ -56214,18 +20469,14 @@
  	    ;;
            *)
  	    # clock_gettime was not found, try adding librt
@@ -62852,7 +63281,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -56093,60 +20396,29 @@
+@@ -56243,60 +20494,29 @@
    return 0;
  }
  _ACEOF
@@ -62922,7 +63351,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56170,58 +20442,27 @@
+@@ -56320,58 +20540,27 @@
    return 0;
  }
  _ACEOF
@@ -62989,7 +63418,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56245,58 +20486,27 @@
+@@ -56395,58 +20584,27 @@
    return 0;
  }
  _ACEOF
@@ -63056,7 +63485,7 @@
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -56320,49 +20530,22 @@
+@@ -56470,49 +20628,22 @@
    return 0;
  }
  _ACEOF
@@ -63112,7 +63541,7 @@
  
  
  
-@@ -56387,20 +20570,16 @@
+@@ -56537,20 +20668,16 @@
  
  fi
  
@@ -63137,7 +63566,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -56408,216 +20587,67 @@
+@@ -56558,216 +20685,67 @@
  if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
  di->d_name[0] == 0) exit(0); exit(1);}
  _ACEOF
@@ -63395,7 +63824,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -56626,17 +20656,13 @@
+@@ -56776,17 +20754,13 @@
  done
  
  
@@ -63416,7 +63845,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56648,55 +20674,28 @@
+@@ -56798,55 +20772,28 @@
    return 0;
  }
  _ACEOF
@@ -63479,7 +63908,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56708,55 +20707,28 @@
+@@ -56858,55 +20805,28 @@
    return 0;
  }
  _ACEOF
@@ -63542,7 +63971,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56768,55 +20740,28 @@
+@@ -56918,55 +20838,28 @@
    return 0;
  }
  _ACEOF
@@ -63605,7 +64034,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56828,55 +20773,28 @@
+@@ -56978,55 +20871,28 @@
    return 0;
  }
  _ACEOF
@@ -63668,7 +64097,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56888,55 +20806,28 @@
+@@ -57038,55 +20904,28 @@
    return 0;
  }
  _ACEOF
@@ -63731,7 +64160,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -56948,55 +20839,28 @@
+@@ -57098,55 +20937,28 @@
    return 0;
  }
  _ACEOF
@@ -63794,7 +64223,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57008,55 +20872,28 @@
+@@ -57158,55 +20970,28 @@
    return 0;
  }
  _ACEOF
@@ -63857,7 +64286,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57068,55 +20905,28 @@
+@@ -57218,55 +21003,28 @@
    return 0;
  }
  _ACEOF
@@ -63920,7 +64349,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57128,55 +20938,28 @@
+@@ -57278,55 +21036,28 @@
    return 0;
  }
  _ACEOF
@@ -63983,7 +64412,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57188,55 +20971,28 @@
+@@ -57338,55 +21069,28 @@
    return 0;
  }
  _ACEOF
@@ -64046,7 +64475,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57248,56 +21004,29 @@
+@@ -57398,56 +21102,29 @@
    return 0;
  }
  _ACEOF
@@ -64110,7 +64539,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -57309,56 +21038,29 @@
+@@ -57459,56 +21136,29 @@
    return 0;
  }
  _ACEOF
@@ -64174,7 +64603,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmpx.h>
-@@ -57370,41 +21072,18 @@
+@@ -57520,41 +21170,18 @@
    return 0;
  }
  _ACEOF
@@ -64220,7 +64649,7 @@
  
  fi
  
-@@ -57415,12 +21094,10 @@
+@@ -57565,12 +21192,10 @@
  ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
  
  # Check whether --with-libiconv was given.
@@ -64235,7 +64664,7 @@
    else
       if test "$withval" != "yes" ; then
  	ICONV_PATH_SPEC=yes
-@@ -57466,7 +21143,7 @@
+@@ -57616,7 +21241,7 @@
  		export LDFLAGS LIBS CPPFLAGS
  		# Try to find iconv(3)
  
@@ -64244,7 +64673,7 @@
  $as_echo_n "checking for iconv in $i/$l... " >&6; }
      jm_cv_func_iconv="no"
      jm_cv_lib_iconv=""
-@@ -57474,11 +21151,7 @@
+@@ -57624,11 +21249,7 @@
      jm_save_LIBS="$LIBS"
  
      if test "$jm_cv_func_iconv" != yes; then
@@ -64257,7 +64686,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57492,48 +21165,17 @@
+@@ -57642,48 +21263,17 @@
    return 0;
  }
  _ACEOF
@@ -64310,7 +64739,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57547,49 +21189,18 @@
+@@ -57697,49 +21287,18 @@
    return 0;
  }
  _ACEOF
@@ -64364,7 +64793,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -57603,53 +21214,22 @@
+@@ -57753,53 +21312,22 @@
    return 0;
  }
  _ACEOF
@@ -64422,7 +64851,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -57663,50 +21243,19 @@
+@@ -57813,50 +21341,19 @@
    return 0;
  }
  _ACEOF
@@ -64477,7 +64906,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <biconv.h>
-@@ -57720,42 +21269,15 @@
+@@ -57870,42 +21367,15 @@
    return 0;
  }
  _ACEOF
@@ -64523,7 +64952,7 @@
  
              LIBS="$jm_save_LIBS"
            fi
-@@ -57766,36 +21288,30 @@
+@@ -57916,36 +21386,30 @@
    if test "$jm_cv_func_iconv" = yes; then
      if test "$jm_cv_giconv" = yes; then
  
@@ -64567,7 +64996,7 @@
  $as_echo "no" >&6; }
    fi
  
-@@ -57833,16 +21349,12 @@
+@@ -57983,16 +21447,12 @@
  	# check for default dos charset name
  	for j in CP850 IBM850 ; do
  
@@ -64587,7 +65016,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -57855,43 +21367,16 @@
+@@ -58005,43 +21465,16 @@
  }
  
  _ACEOF
@@ -64636,7 +65065,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_dos_charset="$ICONV_CHARSET"
-@@ -57903,16 +21388,12 @@
+@@ -58053,16 +21486,12 @@
  	# check for default display charset name
  	for j in ASCII 646 ; do
  
@@ -64656,7 +65085,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -57925,43 +21406,16 @@
+@@ -58075,43 +21504,16 @@
  }
  
  _ACEOF
@@ -64705,7 +65134,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_display_charset="$ICONV_CHARSET"
-@@ -57973,16 +21427,12 @@
+@@ -58123,16 +21525,12 @@
  	# check for default unix charset name
  	for j in UTF-8 UTF8 ; do
  
@@ -64725,7 +65154,7 @@
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -57995,43 +21445,16 @@
+@@ -58145,43 +21543,16 @@
  }
  
  _ACEOF
@@ -64774,7 +65203,7 @@
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_unix_charset="$ICONV_CHARSET"
-@@ -58070,9 +21493,9 @@
+@@ -58220,9 +21591,9 @@
  	    default_display_charset="ASCII"
  	    default_unix_charset="UTF-8"
  	    samba_cv_HAVE_NATIVE_ICONV=yes
@@ -64786,7 +65215,7 @@
  $as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
  	fi
  
-@@ -58096,9 +21519,7 @@
+@@ -58246,9 +21617,7 @@
  	    default_unix_charset="\"$default_unix_charset\""
  
  
@@ -64797,7 +65226,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -58132,7 +21553,7 @@
+@@ -58282,7 +21651,7 @@
  
  
  if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -64806,7 +65235,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;}
-@@ -58154,20 +21575,16 @@
+@@ -58304,20 +21673,16 @@
  fi
  
  
@@ -64831,7 +65260,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58181,67 +21598,34 @@
+@@ -58331,67 +21696,34 @@
  }
  
  _ACEOF
@@ -64909,7 +65338,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58255,204 +21639,36 @@
+@@ -58405,204 +21737,36 @@
  }
  
  _ACEOF
@@ -65127,7 +65556,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -58460,120 +21676,26 @@
+@@ -58610,120 +21774,26 @@
  fi
  
  done
@@ -65257,7 +65686,7 @@
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -58584,54 +21706,29 @@
+@@ -58734,54 +21804,29 @@
    return 0;
  }
  _ACEOF
@@ -65318,7 +65747,7 @@
  
  fi
  
-@@ -58640,157 +21737,18 @@
+@@ -58790,157 +21835,18 @@
  #	http://oss.sgi.com/projects/fam/
  #	http://savannah.nongnu.org/projects/fam/
  # Check whether --enable-fam was given.
@@ -65482,7 +65911,7 @@
  _ACEOF
   samba_cv_HAVE_FAM_H=yes
  else
-@@ -58802,18 +21760,14 @@
+@@ -58952,18 +21858,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.
@@ -65504,7 +65933,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -58831,43 +21785,18 @@
+@@ -58981,43 +21883,18 @@
    return 0;
  }
  _ACEOF
@@ -65554,7 +65983,7 @@
    samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
  else
    samba_cv_HAVE_LIBFAM=no
-@@ -58878,23 +21807,17 @@
+@@ -59028,23 +21905,17 @@
              samba_fam_xtra=-lC
  
  
@@ -65581,7 +66010,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -58912,72 +21835,41 @@
+@@ -59062,72 +21933,41 @@
    return 0;
  }
  _ACEOF
@@ -65662,7 +66091,7 @@
  /* end confdefs.h.  */
  #include <fam.h>
  int
-@@ -58988,43 +21880,16 @@
+@@ -59138,43 +21978,16 @@
    return 0;
  }
  _ACEOF
@@ -65709,7 +66138,7 @@
      fi
  fi
  
-@@ -59037,18 +21902,14 @@
+@@ -59187,18 +22000,14 @@
      samba_dmapi_libs=""
  
      if test x"$samba_dmapi_libs" = x"" ; then
@@ -65731,7 +66160,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59066,61 +21927,32 @@
+@@ -59216,61 +22025,32 @@
    return 0;
  }
  _ACEOF
@@ -65802,7 +66231,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59138,61 +21970,32 @@
+@@ -59288,61 +22068,32 @@
    return 0;
  }
  _ACEOF
@@ -65873,7 +66302,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59210,61 +22013,32 @@
+@@ -59360,61 +22111,32 @@
    return 0;
  }
  _ACEOF
@@ -65944,7 +66373,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -59282,43 +22056,18 @@
+@@ -59432,43 +22154,18 @@
    return 0;
  }
  _ACEOF
@@ -65994,7 +66423,7 @@
    samba_dmapi_libs="-lxdsm"
  fi
  
-@@ -59327,153 +22076,12 @@
+@@ -59477,153 +22174,12 @@
  
      # Only bother to test ehaders if we have a candidate DMAPI library
      if test x"$samba_dmapi_libs" != x"" ; then
@@ -66154,7 +66583,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -59487,11 +22095,7 @@
+@@ -59637,11 +22193,7 @@
      if test x"$samba_dmapi_libs" != x"" ; then
  	samba_dmapi_save_LIBS="$LIBS"
  	LIBS="$LIBS $samba_dmapi_libs"
@@ -66167,7 +66596,7 @@
  /* end confdefs.h.  */
  
  #include <time.h>      /* needed by Tru64 */
-@@ -59526,50 +22130,25 @@
+@@ -59676,50 +22228,25 @@
    return 0;
  }
  _ACEOF
@@ -66222,7 +66651,7 @@
  $as_echo "$as_me: DMAPI support not present" >&6;}
  
  	# DMAPI detection failure actions end
-@@ -59577,11 +22156,9 @@
+@@ -59727,11 +22254,9 @@
  	# DMAPI detection success actions start
  
  
@@ -66236,7 +66665,7 @@
  $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
  
  	# DMAPI detection success actions end
-@@ -59595,20 +22172,16 @@
+@@ -59745,20 +22270,16 @@
      default_shared_modules="$default_shared_modules vfs_tsmsm"
  fi
  
@@ -66261,7 +66690,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -59624,65 +22197,32 @@
+@@ -59774,65 +22295,32 @@
  }
  
  _ACEOF
@@ -66336,7 +66765,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -59694,185 +22234,29 @@
+@@ -59844,185 +22332,29 @@
    return 0;
  }
  _ACEOF
@@ -66529,7 +66958,7 @@
  
  fi
  
-@@ -59882,110 +22266,18 @@
+@@ -60032,110 +22364,18 @@
  
      ac_save_LIBS=$LIBS
  
@@ -66646,7 +67075,7 @@
  
  
  
-@@ -60002,18 +22294,14 @@
+@@ -60152,18 +22392,14 @@
  	    ;;
            *)
  	    # cap_get_proc was not found, try adding libcap
@@ -66668,7 +67097,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -60031,50 +22319,23 @@
+@@ -60181,50 +22417,23 @@
    return 0;
  }
  _ACEOF
@@ -66726,7 +67155,7 @@
  
  
  
-@@ -60096,20 +22357,16 @@
+@@ -60246,20 +22455,16 @@
  
  
  
@@ -66751,7 +67180,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -60125,52 +22382,23 @@
+@@ -60275,52 +22480,23 @@
   exit(0);
  }
  _ACEOF
@@ -66810,7 +67239,7 @@
  
  else
      LIBS=$ac_save_LIBS
-@@ -60183,17 +22411,13 @@
+@@ -60333,17 +22509,13 @@
  # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
  #
  
@@ -66831,7 +67260,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60207,55 +22431,28 @@
+@@ -60357,55 +22529,28 @@
    return 0;
  }
  _ACEOF
@@ -66894,7 +67323,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60269,55 +22466,28 @@
+@@ -60419,55 +22564,28 @@
    return 0;
  }
  _ACEOF
@@ -66957,7 +67386,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60331,55 +22501,28 @@
+@@ -60481,55 +22599,28 @@
    return 0;
  }
  _ACEOF
@@ -67021,7 +67450,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -60393,56 +22536,29 @@
+@@ -60543,56 +22634,29 @@
    return 0;
  }
  _ACEOF
@@ -67085,7 +67514,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_SECURITY_H
-@@ -60460,238 +22576,112 @@
+@@ -60610,238 +22674,112 @@
    return 0;
  }
  _ACEOF
@@ -67360,7 +67789,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60702,63 +22692,32 @@
+@@ -60852,63 +22790,32 @@
    return 0;
  }
  _ACEOF
@@ -67433,7 +67862,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60769,63 +22728,32 @@
+@@ -60919,63 +22826,32 @@
    return 0;
  }
  _ACEOF
@@ -67506,7 +67935,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60836,63 +22764,32 @@
+@@ -60986,63 +22862,32 @@
    return 0;
  }
  _ACEOF
@@ -67579,7 +68008,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -60903,147 +22800,30 @@
+@@ -61053,147 +22898,30 @@
    return 0;
  }
  _ACEOF
@@ -67737,7 +68166,7 @@
  _ACEOF
  
  fi
-@@ -61055,20 +22835,16 @@
+@@ -61205,20 +22933,16 @@
  seteuid=no;
  
  if test $seteuid = no; then
@@ -67762,7 +68191,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61076,50 +22852,21 @@
+@@ -61226,50 +22950,21 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -67819,7 +68248,7 @@
  
  fi
  fi
-@@ -61127,20 +22874,16 @@
+@@ -61277,20 +22972,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
@@ -67844,7 +68273,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61148,69 +22891,36 @@
+@@ -61298,69 +22989,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -67924,7 +68353,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61218,69 +22928,36 @@
+@@ -61368,69 +23026,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68004,7 +68433,7 @@
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -61288,64 +22965,31 @@
+@@ -61438,64 +23063,31 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -68078,7 +68507,7 @@
  /* end confdefs.h.  */
  
  #include <sys/syscall.h>
-@@ -61359,195 +23003,98 @@
+@@ -61509,195 +23101,98 @@
    return 0;
  }
  _ACEOF
@@ -68304,7 +68733,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -61571,67 +23118,34 @@
+@@ -61721,67 +23216,34 @@
  #endif
  }
  _ACEOF
@@ -68381,7 +68810,7 @@
  /* end confdefs.h.  */
  
    #define _XOPEN_SOURCE 600
-@@ -61649,56 +23163,29 @@
+@@ -61799,56 +23261,29 @@
    return 0;
  }
  _ACEOF
@@ -68445,7 +68874,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -61711,141 +23198,24 @@
+@@ -61861,141 +23296,24 @@
    return 0;
  }
  _ACEOF
@@ -68594,7 +69023,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_BLKSIZE_T 1
-@@ -61853,103 +23223,9 @@
+@@ -62003,103 +23321,9 @@
  
  
  fi
@@ -68701,7 +69130,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_BLKCNT_T 1
-@@ -61959,17 +23235,13 @@
+@@ -62109,17 +23333,13 @@
  fi
  
  
@@ -68722,7 +69151,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -61982,55 +23254,28 @@
+@@ -62132,55 +23352,28 @@
    return 0;
  }
  _ACEOF
@@ -68785,7 +69214,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -62043,57 +23288,30 @@
+@@ -62193,57 +23386,30 @@
    return 0;
  }
  _ACEOF
@@ -68850,7 +69279,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -62109,58 +23327,31 @@
+@@ -62259,58 +23425,31 @@
    return 0;
  }
  _ACEOF
@@ -68917,7 +69346,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -62179,74 +23370,45 @@
+@@ -62329,74 +23468,45 @@
  }
  
  _ACEOF
@@ -69003,7 +69432,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62255,24 +23417,24 @@
+@@ -62405,24 +23515,24 @@
  ####################################################
  # check for Linux-specific AFS fake-kaserver support
  samba_cv_WITH_FAKE_KASERVER=no
@@ -69033,7 +69462,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62284,18 +23446,14 @@
+@@ -62434,18 +23544,14 @@
     test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
  
      # see if this box has the OpenSSL DES libraries
@@ -69055,7 +69484,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62313,208 +23471,43 @@
+@@ -62463,208 +23569,43 @@
    return 0;
  }
  _ACEOF
@@ -69280,7 +69709,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62526,12 +23519,10 @@
+@@ -62676,12 +23617,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
@@ -69295,7 +69724,7 @@
  	fi
      else
      	have_afs_headers=yes
-@@ -62541,9 +23532,7 @@
+@@ -62691,9 +23630,7 @@
  FAKE_KASERVER_OBJ=""
  if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69306,7 +69735,7 @@
  
      FAKE_KASERVER_OBJ="utils/net_afs.o"
  fi
-@@ -62552,24 +23541,24 @@
+@@ -62702,24 +23639,24 @@
  #################################################
  # check whether to compile AFS/NT ACL mapping module
  samba_cv_WITH_VFS_AFSACL=no
@@ -69336,7 +69765,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62581,36 +23570,32 @@
+@@ -62731,36 +23668,32 @@
  
  if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -69380,7 +69809,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -62620,12 +23605,12 @@
+@@ -62770,12 +23703,12 @@
  # Compile with LDAP support?
  
  with_ldap_support=auto
@@ -69395,7 +69824,7 @@
    withval=$with_ldap;  case "$withval" in
      yes|no)
  	with_ldap_support=$withval
-@@ -62634,7 +23619,7 @@
+@@ -62784,7 +23717,7 @@
  fi
  
  
@@ -69404,7 +69833,7 @@
  $as_echo "$with_ldap_support" >&6; }
  
  SMBLDAP=""
-@@ -62649,150 +23634,12 @@
+@@ -62799,150 +23732,12 @@
    ##################################################################
    # first test for ldap.h and lber.h
    # (ldap.h is required for this test)
@@ -69561,7 +69990,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62804,11 +23651,9 @@
+@@ -62954,11 +23749,9 @@
  
    if test x"$ac_cv_header_ldap_h" != x"yes"; then
  	if test x"$with_ldap_support" = x"yes"; then
@@ -69575,7 +70004,7 @@
  $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
  	fi
  
-@@ -62820,117 +23665,24 @@
+@@ -62970,117 +23763,24 @@
    # unsigned int in include/includes.h
    case $host_os in
  	*hpux*)
@@ -69700,7 +70129,7 @@
  $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
  		fi
  		with_ldap_support=no
-@@ -62947,23 +23699,17 @@
+@@ -63097,23 +23797,17 @@
    # this test must be before the libldap test
  
  
@@ -69727,7 +70156,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62981,54 +23727,28 @@
+@@ -63131,54 +23825,28 @@
    return 0;
  }
  _ACEOF
@@ -69789,7 +70218,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLBER 1
  _ACEOF
-@@ -63044,25 +23764,19 @@
+@@ -63194,25 +23862,19 @@
  
  fi
  
@@ -69818,7 +70247,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.  */
-@@ -63103,61 +23817,31 @@
+@@ -63253,61 +23915,31 @@
    return 0;
  }
  _ACEOF
@@ -69889,7 +70318,7 @@
  /* end confdefs.h.  */
  #include <ldap.h>
  int
-@@ -63168,59 +23852,32 @@
+@@ -63318,59 +23950,32 @@
    return 0;
  }
  _ACEOF
@@ -69956,7 +70385,7 @@
  /* end confdefs.h.  */
  #include <lber.h>
  int
-@@ -63231,42 +23888,19 @@
+@@ -63381,42 +23986,19 @@
    return 0;
  }
  _ACEOF
@@ -70003,7 +70432,7 @@
  
    fi
  
-@@ -63274,23 +23908,17 @@
+@@ -63424,23 +24006,17 @@
    # now see if we can find the ldap libs in standard paths
  
  
@@ -70030,7 +70459,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63308,54 +23936,28 @@
+@@ -63458,54 +24034,28 @@
    return 0;
  }
  _ACEOF
@@ -70092,7 +70521,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLDAP 1
  _ACEOF
-@@ -63371,25 +23973,19 @@
+@@ -63521,25 +24071,19 @@
  
  fi
  
@@ -70121,7 +70550,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.  */
-@@ -63430,62 +24026,32 @@
+@@ -63580,62 +24124,32 @@
    return 0;
  }
  _ACEOF
@@ -70193,7 +70622,7 @@
  /* end confdefs.h.  */
  
  	#include <lber.h>
-@@ -63498,37 +24064,16 @@
+@@ -63648,37 +24162,16 @@
    return 0;
  }
  _ACEOF
@@ -70234,7 +70663,7 @@
  $as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
  
  
-@@ -63539,19 +24084,14 @@
+@@ -63689,19 +24182,14 @@
  
  
  
@@ -70257,7 +70686,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.  */
-@@ -63592,55 +24132,27 @@
+@@ -63742,55 +24230,27 @@
    return 0;
  }
  _ACEOF
@@ -70320,7 +70749,7 @@
  
      CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
      default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -63648,17 +24160,15 @@
+@@ -63798,17 +24258,15 @@
      SMBLDAP="lib/smbldap.o"
      SMBLDAPUTIL="lib/smbldap_util.o"
      with_ldap_support=yes
@@ -70342,7 +70771,7 @@
  $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
      fi
  
-@@ -63673,12 +24183,12 @@
+@@ -63823,12 +24281,12 @@
  # active directory support
  
  with_ads_support=auto
@@ -70357,7 +70786,7 @@
    withval=$with_ads;  case "$withval" in
      yes|no)
  	with_ads_support="$withval"
-@@ -63687,7 +24197,7 @@
+@@ -63837,7 +24295,7 @@
  fi
  
  
@@ -70366,7 +70795,7 @@
  $as_echo "$with_ads_support" >&6; }
  
  FOUND_KRB5=no
-@@ -63696,11 +24206,9 @@
+@@ -63846,11 +24304,9 @@
  if test x"$with_ldap_support" != x"yes"; then
  
      if test x"$with_ads_support" = x"yes"; then
@@ -70380,7 +70809,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
  	with_ads_support=no
      fi
-@@ -63715,19 +24223,14 @@
+@@ -63865,19 +24321,14 @@
  	*hpux*)
  
  
@@ -70403,7 +70832,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.  */
-@@ -63768,57 +24271,29 @@
+@@ -63918,57 +24369,29 @@
    return 0;
  }
  _ACEOF
@@ -70469,7 +70898,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -63827,19 +24302,14 @@
+@@ -63977,19 +24400,14 @@
  	*)
  
  
@@ -70492,7 +70921,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.  */
-@@ -63880,57 +24350,29 @@
+@@ -64030,57 +24448,29 @@
    return 0;
  }
  _ACEOF
@@ -70558,7 +70987,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -63941,19 +24383,14 @@
+@@ -64091,19 +24481,14 @@
  
  
  
@@ -70581,7 +71010,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.  */
-@@ -63994,57 +24431,29 @@
+@@ -64144,57 +24529,29 @@
    return 0;
  }
  _ACEOF
@@ -70647,7 +71076,7 @@
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -64060,23 +24469,23 @@
+@@ -64210,23 +24567,23 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # check for location of Kerberos 5 install
@@ -70676,7 +71105,7 @@
  $as_echo "$withval" >&6; }
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
-@@ -64088,7 +24497,7 @@
+@@ -64238,7 +24595,7 @@
          ;;
        esac
  else
@@ -70685,7 +71114,7 @@
  $as_echo "no krb5-path given" >&6; }
  
  fi
-@@ -64099,9 +24508,9 @@
+@@ -64249,9 +24606,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
@@ -70697,7 +71126,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $KRB5CONFIG in
-@@ -64114,14 +24523,14 @@
+@@ -64264,14 +24621,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -70715,7 +71144,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -64129,15 +24538,15 @@
+@@ -64279,15 +24636,15 @@
  fi
  KRB5CONFIG=$ac_cv_path_KRB5CONFIG
  if test -n "$KRB5CONFIG"; then
@@ -70734,7 +71163,7 @@
  $as_echo_n "checking for working krb5-config... " >&6; }
    if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
      ac_save_CFLAGS=$CFLAGS
-@@ -64151,17 +24560,17 @@
+@@ -64301,17 +24658,17 @@
      CFLAGS=$ac_save_CFLAGS;export CFLAGS
      LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
      FOUND_KRB5=yes
@@ -70755,7 +71184,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
-@@ -64169,17 +24578,17 @@
+@@ -64319,17 +24676,17 @@
            KRB5_CPPFLAGS="-I/usr/include/heimdal"
            KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
  	  FOUND_KRB5=yes
@@ -70776,7 +71205,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64187,17 +24596,17 @@
+@@ -64337,17 +24694,17 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the RedHat location for kerberos
@@ -70797,7 +71226,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64205,16 +24614,16 @@
+@@ -64355,16 +24712,16 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the OpenBSD location for heimdal krb5
@@ -70817,7 +71246,7 @@
  $as_echo "no" >&6; }
      fi
    fi
-@@ -64259,193 +24668,54 @@
+@@ -64409,193 +24766,54 @@
    KRB5_LIBS=$ac_new_flags
  
  
@@ -71056,7 +71485,7 @@
  _ACEOF
  
  fi
-@@ -64459,11 +24729,9 @@
+@@ -64609,11 +24827,9 @@
      # i.e with_ads_support = auto, otherwise die with an error.
  
      if test x"$with_ads_support" = x"yes"; then
@@ -71070,7 +71499,7 @@
  $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
      fi
  
-@@ -64475,65 +24743,16 @@
+@@ -64625,65 +24841,16 @@
      CPPFLAGS=$ac_save_CPPFLAGS
      LDFLAGS=$ac_save_LDFLAGS
    fi
@@ -71142,7 +71571,7 @@
  _ACEOF
  
  fi
-@@ -64550,17 +24769,13 @@
+@@ -64700,17 +24867,13 @@
  
    # check for new heimdal KRB5_DEPRECATED handling
  
@@ -71163,7 +71592,7 @@
  /* end confdefs.h.  */
  #define KRB5_DEPRECATED 1
        #include <krb5.h>
-@@ -64572,42 +24787,19 @@
+@@ -64722,42 +24885,19 @@
    return 0;
  }
  _ACEOF
@@ -71210,7 +71639,7 @@
  
    fi
  fi
-@@ -64621,152 +24813,12 @@
+@@ -64771,152 +24911,12 @@
  
    # now check for gssapi headers.  This is also done here to allow for
    # different kerberos include paths
@@ -71369,7 +71798,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -64780,23 +24832,17 @@
+@@ -64930,23 +24930,17 @@
    # we might need the k5crypto and com_err libraries on some systems
  
  
@@ -71396,7 +71825,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -64814,54 +24860,28 @@
+@@ -64964,54 +24958,28 @@
    return 0;
  }
  _ACEOF
@@ -71458,7 +71887,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCOM_ERR 1
  _ACEOF
-@@ -64878,24 +24898,17 @@
+@@ -65028,24 +24996,17 @@
  fi
  
  
@@ -71486,7 +71915,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -64913,54 +24926,28 @@
+@@ -65063,54 +25024,28 @@
    return 0;
  }
  _ACEOF
@@ -71548,7 +71977,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBK5CRYPTO 1
  _ACEOF
-@@ -64976,27 +24963,20 @@
+@@ -65126,27 +25061,20 @@
  
  fi
  
@@ -71579,7 +72008,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65014,54 +24994,28 @@
+@@ -65164,54 +25092,28 @@
    return 0;
  }
  _ACEOF
@@ -71641,7 +72070,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPTO 1
  _ACEOF
-@@ -65078,24 +25032,17 @@
+@@ -65228,24 +25130,17 @@
  fi
  
  
@@ -71669,7 +72098,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65113,54 +25060,28 @@
+@@ -65263,54 +25158,28 @@
    return 0;
  }
  _ACEOF
@@ -71731,7 +72160,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBASN1 1
  _ACEOF
-@@ -65177,24 +25098,17 @@
+@@ -65327,24 +25196,17 @@
  fi
  
  
@@ -71759,7 +72188,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65212,54 +25126,28 @@
+@@ -65362,54 +25224,28 @@
    return 0;
  }
  _ACEOF
@@ -71821,7 +72250,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBROKEN 1
  _ACEOF
-@@ -65275,27 +25163,20 @@
+@@ -65425,27 +25261,20 @@
  
  fi
  
@@ -71852,7 +72281,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65313,54 +25194,28 @@
+@@ -65463,54 +25292,28 @@
    return 0;
  }
  _ACEOF
@@ -71914,7 +72343,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI 1
  _ACEOF
-@@ -65376,29 +25231,22 @@
+@@ -65526,29 +25329,22 @@
  
  fi
  
@@ -71947,7 +72376,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65416,54 +25264,28 @@
+@@ -65566,54 +25362,28 @@
    return 0;
  }
  _ACEOF
@@ -72009,7 +72438,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65480,24 +25302,17 @@
+@@ -65630,24 +25400,17 @@
  fi
  
  
@@ -72037,7 +72466,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65515,54 +25330,28 @@
+@@ -65665,54 +25428,28 @@
    return 0;
  }
  _ACEOF
@@ -72099,7 +72528,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -65578,29 +25367,22 @@
+@@ -65728,29 +25465,22 @@
  
  fi
  
@@ -72132,7 +72561,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -65618,54 +25400,28 @@
+@@ -65768,54 +25498,28 @@
    return 0;
  }
  _ACEOF
@@ -72194,7 +72623,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI_KRB5 1
  _ACEOF
-@@ -65680,24 +25436,18 @@
+@@ -65830,24 +25534,18 @@
  		have_gssapi=yes
  
  fi
@@ -72222,7 +72651,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.  */
-@@ -65738,43 +25488,18 @@
+@@ -65888,43 +25586,18 @@
    return 0;
  }
  _ACEOF
@@ -72272,7 +72701,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_REAL_TIME 1
  _ACEOF
-@@ -65782,20 +25507,14 @@
+@@ -65932,20 +25605,14 @@
  fi
  
  
@@ -72296,7 +72725,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.  */
-@@ -65836,43 +25555,18 @@
+@@ -65986,43 +25653,18 @@
    return 0;
  }
  _ACEOF
@@ -72346,7 +72775,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -65880,20 +25574,14 @@
+@@ -66030,20 +25672,14 @@
  fi
  
  
@@ -72370,7 +72799,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.  */
-@@ -65934,43 +25622,18 @@
+@@ -66084,43 +25720,18 @@
    return 0;
  }
  _ACEOF
@@ -72420,7 +72849,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
  _ACEOF
-@@ -65978,20 +25641,14 @@
+@@ -66128,20 +25739,14 @@
  fi
  
  
@@ -72444,7 +72873,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.  */
-@@ -66032,43 +25689,18 @@
+@@ -66182,43 +25787,18 @@
    return 0;
  }
  _ACEOF
@@ -72494,7 +72923,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
  _ACEOF
-@@ -66076,20 +25708,14 @@
+@@ -66226,20 +25806,14 @@
  fi
  
  
@@ -72518,7 +72947,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.  */
-@@ -66130,43 +25756,18 @@
+@@ -66280,43 +25854,18 @@
    return 0;
  }
  _ACEOF
@@ -72568,7 +72997,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL2SALT 1
  _ACEOF
-@@ -66174,20 +25775,14 @@
+@@ -66324,20 +25873,14 @@
  fi
  
  
@@ -72592,7 +73021,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.  */
-@@ -66228,43 +25823,18 @@
+@@ -66378,43 +25921,18 @@
    return 0;
  }
  _ACEOF
@@ -72642,7 +73071,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_USE_ENCTYPE 1
  _ACEOF
-@@ -66272,20 +25842,14 @@
+@@ -66422,20 +25940,14 @@
  fi
  
  
@@ -72666,7 +73095,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.  */
-@@ -66326,43 +25890,18 @@
+@@ -66476,43 +25988,18 @@
    return 0;
  }
  _ACEOF
@@ -72716,7 +73145,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY 1
  _ACEOF
-@@ -66370,20 +25909,14 @@
+@@ -66520,20 +26007,14 @@
  fi
  
  
@@ -72740,7 +73169,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.  */
-@@ -66424,43 +25957,18 @@
+@@ -66574,43 +26055,18 @@
    return 0;
  }
  _ACEOF
@@ -72790,7 +73219,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PW_SALT 1
  _ACEOF
-@@ -66468,20 +25976,14 @@
+@@ -66618,20 +26074,14 @@
  fi
  
  
@@ -72814,7 +73243,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.  */
-@@ -66522,43 +26024,18 @@
+@@ -66672,43 +26122,18 @@
    return 0;
  }
  _ACEOF
@@ -72864,7 +73293,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY_SALT 1
  _ACEOF
-@@ -66566,20 +26043,14 @@
+@@ -66716,20 +26141,14 @@
  fi
  
  
@@ -72888,7 +73317,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.  */
-@@ -66620,43 +26091,18 @@
+@@ -66770,43 +26189,18 @@
    return 0;
  }
  _ACEOF
@@ -72938,7 +73367,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETKEY 1
  _ACEOF
-@@ -66664,20 +26110,14 @@
+@@ -66814,20 +26208,14 @@
  fi
  
  
@@ -72962,7 +73391,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.  */
-@@ -66718,43 +26158,18 @@
+@@ -66868,43 +26256,18 @@
    return 0;
  }
  _ACEOF
@@ -73012,7 +73441,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
  _ACEOF
-@@ -66762,20 +26177,14 @@
+@@ -66912,20 +26275,14 @@
  fi
  
  
@@ -73036,7 +73465,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.  */
-@@ -66816,43 +26225,18 @@
+@@ -66966,43 +26323,18 @@
    return 0;
  }
  _ACEOF
@@ -73086,7 +73515,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_LOCATE_KDC 1
  _ACEOF
-@@ -66860,20 +26244,14 @@
+@@ -67010,20 +26342,14 @@
  fi
  
  
@@ -73110,7 +73539,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.  */
-@@ -66914,43 +26292,18 @@
+@@ -67064,43 +26390,18 @@
    return 0;
  }
  _ACEOF
@@ -73160,7 +73589,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
  _ACEOF
-@@ -66958,20 +26311,14 @@
+@@ -67108,20 +26409,14 @@
  fi
  
  
@@ -73184,7 +73613,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.  */
-@@ -67012,43 +26359,18 @@
+@@ -67162,43 +26457,18 @@
    return 0;
  }
  _ACEOF
@@ -73234,7 +73663,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -67056,20 +26378,14 @@
+@@ -67206,20 +26476,14 @@
  fi
  
  
@@ -73258,7 +73687,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.  */
-@@ -67110,43 +26426,18 @@
+@@ -67260,43 +26524,18 @@
    return 0;
  }
  _ACEOF
@@ -73308,7 +73737,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_DATA_CONTENTS 1
  _ACEOF
-@@ -67154,20 +26445,14 @@
+@@ -67304,20 +26543,14 @@
  fi
  
  
@@ -73332,7 +73761,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.  */
-@@ -67208,43 +26493,18 @@
+@@ -67358,43 +26591,18 @@
    return 0;
  }
  _ACEOF
@@ -73382,7 +73811,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
  _ACEOF
-@@ -67252,20 +26512,14 @@
+@@ -67402,20 +26610,14 @@
  fi
  
  
@@ -73406,7 +73835,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.  */
-@@ -67306,43 +26560,18 @@
+@@ -67456,43 +26658,18 @@
    return 0;
  }
  _ACEOF
@@ -73456,7 +73885,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_UNPARSED_NAME 1
  _ACEOF
-@@ -67350,20 +26579,14 @@
+@@ -67500,20 +26677,14 @@
  fi
  
  
@@ -73480,7 +73909,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.  */
-@@ -67404,43 +26627,18 @@
+@@ -67554,43 +26725,18 @@
    return 0;
  }
  _ACEOF
@@ -73530,7 +73959,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
  _ACEOF
-@@ -67448,20 +26646,14 @@
+@@ -67598,20 +26744,14 @@
  fi
  
  
@@ -73554,7 +73983,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.  */
-@@ -67502,43 +26694,18 @@
+@@ -67652,43 +26792,18 @@
    return 0;
  }
  _ACEOF
@@ -73604,7 +74033,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KT_FREE_ENTRY 1
  _ACEOF
-@@ -67546,20 +26713,14 @@
+@@ -67696,20 +26811,14 @@
  fi
  
  
@@ -73628,7 +74057,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.  */
-@@ -67600,43 +26761,18 @@
+@@ -67750,43 +26859,18 @@
    return 0;
  }
  _ACEOF
@@ -73678,7 +74107,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_INIT 1
  _ACEOF
-@@ -67644,20 +26780,14 @@
+@@ -67794,20 +26878,14 @@
  fi
  
  
@@ -73702,7 +74131,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.  */
-@@ -67698,43 +26828,18 @@
+@@ -67848,43 +26926,18 @@
    return 0;
  }
  _ACEOF
@@ -73752,7 +74181,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
  _ACEOF
-@@ -67742,20 +26847,14 @@
+@@ -67892,20 +26945,14 @@
  fi
  
  
@@ -73776,7 +74205,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.  */
-@@ -67796,43 +26895,18 @@
+@@ -67946,43 +26993,18 @@
    return 0;
  }
  _ACEOF
@@ -73826,7 +74255,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_ENCTYPE_COMPARE 1
  _ACEOF
-@@ -67840,20 +26914,14 @@
+@@ -67990,20 +27012,14 @@
  fi
  
  
@@ -73850,7 +74279,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.  */
-@@ -67894,43 +26962,18 @@
+@@ -68044,43 +27060,18 @@
    return 0;
  }
  _ACEOF
@@ -73900,7 +74329,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
  _ACEOF
-@@ -67938,20 +26981,14 @@
+@@ -68088,20 +27079,14 @@
  fi
  
  
@@ -73924,7 +74353,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.  */
-@@ -67992,43 +27029,18 @@
+@@ -68142,43 +27127,18 @@
    return 0;
  }
  _ACEOF
@@ -73974,7 +74403,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_INIT 1
  _ACEOF
-@@ -68036,20 +27048,14 @@
+@@ -68186,20 +27146,14 @@
  fi
  
  
@@ -73998,7 +74427,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.  */
-@@ -68090,43 +27096,18 @@
+@@ -68240,43 +27194,18 @@
    return 0;
  }
  _ACEOF
@@ -74048,7 +74477,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_DESTROY 1
  _ACEOF
-@@ -68134,20 +27115,14 @@
+@@ -68284,20 +27213,14 @@
  fi
  
  
@@ -74072,7 +74501,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.  */
-@@ -68188,43 +27163,18 @@
+@@ -68338,43 +27261,18 @@
    return 0;
  }
  _ACEOF
@@ -74122,7 +74551,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_DECODE_AP_REQ 1
  _ACEOF
-@@ -68232,20 +27182,14 @@
+@@ -68382,20 +27280,14 @@
  fi
  
  
@@ -74146,7 +74575,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.  */
-@@ -68286,43 +27230,18 @@
+@@ -68436,43 +27328,18 @@
    return 0;
  }
  _ACEOF
@@ -74196,7 +74625,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_FREE_AP_REQ 1
  _ACEOF
-@@ -68330,20 +27249,14 @@
+@@ -68480,20 +27347,14 @@
  fi
  
  
@@ -74220,7 +74649,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.  */
-@@ -68384,43 +27297,18 @@
+@@ -68534,43 +27395,18 @@
    return 0;
  }
  _ACEOF
@@ -74270,7 +74699,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68428,20 +27316,14 @@
+@@ -68578,20 +27414,14 @@
  fi
  
  
@@ -74294,7 +74723,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.  */
-@@ -68482,43 +27364,18 @@
+@@ -68632,43 +27462,18 @@
    return 0;
  }
  _ACEOF
@@ -74344,7 +74773,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -68526,20 +27383,14 @@
+@@ -68676,20 +27481,14 @@
  fi
  
  
@@ -74368,7 +74797,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.  */
-@@ -68580,43 +27431,18 @@
+@@ -68730,43 +27529,18 @@
    return 0;
  }
  _ACEOF
@@ -74418,7 +74847,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
  _ACEOF
-@@ -68624,20 +27450,14 @@
+@@ -68774,20 +27548,14 @@
  fi
  
  
@@ -74442,7 +74871,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.  */
-@@ -68678,43 +27498,18 @@
+@@ -68828,43 +27596,18 @@
    return 0;
  }
  _ACEOF
@@ -74492,7 +74921,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PARSE_NAME_NOREALM 1
  _ACEOF
-@@ -68722,20 +27517,14 @@
+@@ -68872,20 +27615,14 @@
  fi
  
  
@@ -74516,7 +74945,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.  */
-@@ -68776,43 +27565,18 @@
+@@ -68926,43 +27663,18 @@
    return 0;
  }
  _ACEOF
@@ -74566,7 +74995,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINC_SIZE 1
  _ACEOF
-@@ -68820,20 +27584,14 @@
+@@ -68970,20 +27682,14 @@
  fi
  
  
@@ -74590,7 +75019,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.  */
-@@ -68874,43 +27632,18 @@
+@@ -69024,43 +27730,18 @@
    return 0;
  }
  _ACEOF
@@ -74640,7 +75069,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
  _ACEOF
-@@ -68918,20 +27651,14 @@
+@@ -69068,20 +27749,14 @@
  fi
  
  
@@ -74664,7 +75093,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.  */
-@@ -68972,43 +27699,18 @@
+@@ -69122,43 +27797,18 @@
    return 0;
  }
  _ACEOF
@@ -74714,7 +75143,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_RENEWED_CREDS 1
  _ACEOF
-@@ -69016,20 +27718,14 @@
+@@ -69166,20 +27816,14 @@
  fi
  
  
@@ -74738,7 +75167,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.  */
-@@ -69070,43 +27766,18 @@
+@@ -69220,43 +27864,18 @@
    return 0;
  }
  _ACEOF
@@ -74788,7 +75217,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_KDC_CRED 1
  _ACEOF
-@@ -69114,20 +27785,14 @@
+@@ -69264,20 +27883,14 @@
  fi
  
  
@@ -74812,7 +75241,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.  */
-@@ -69168,43 +27833,18 @@
+@@ -69318,43 +27931,18 @@
    return 0;
  }
  _ACEOF
@@ -74862,7 +75291,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_ERROR_CONTENTS 1
  _ACEOF
-@@ -69212,20 +27852,14 @@
+@@ -69362,20 +27950,14 @@
  fi
  
  
@@ -74886,7 +75315,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.  */
-@@ -69266,43 +27900,18 @@
+@@ -69416,43 +27998,18 @@
    return 0;
  }
  _ACEOF
@@ -74936,7 +75365,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
  _ACEOF
-@@ -69310,20 +27919,14 @@
+@@ -69460,20 +28017,14 @@
  fi
  
  
@@ -74960,7 +75389,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.  */
-@@ -69364,43 +27967,18 @@
+@@ -69514,43 +28065,18 @@
    return 0;
  }
  _ACEOF
@@ -75010,7 +75439,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -69408,20 +27986,14 @@
+@@ -69558,20 +28084,14 @@
  fi
  
  
@@ -75034,7 +75463,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.  */
-@@ -69462,43 +28034,18 @@
+@@ -69612,43 +28132,18 @@
    return 0;
  }
  _ACEOF
@@ -75084,7 +75513,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
  _ACEOF
-@@ -69506,20 +28053,14 @@
+@@ -69656,20 +28151,14 @@
  fi
  
  
@@ -75108,7 +75537,7 @@
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_get_error to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_get_error.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -69551,52 +28092,27 @@
+@@ -69701,52 +28190,27 @@
  #if defined __stub_krb5_get_init_creds_opt_get_error || defined __stub___krb5_get_init_creds_opt_get_error
  choke me
  #endif
@@ -75176,7 +75605,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
  _ACEOF
-@@ -69604,20 +28120,14 @@
+@@ -69754,20 +28218,14 @@
  fi
  
  
@@ -75200,7 +75629,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.  */
-@@ -69658,43 +28168,18 @@
+@@ -69808,43 +28266,18 @@
    return 0;
  }
  _ACEOF
@@ -75250,7 +75679,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPE_TO_STRING 1
  _ACEOF
-@@ -69702,20 +28187,14 @@
+@@ -69852,20 +28285,14 @@
  fi
  
  
@@ -75274,7 +75703,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.  */
-@@ -69756,43 +28235,18 @@
+@@ -69906,43 +28333,18 @@
    return 0;
  }
  _ACEOF
@@ -75324,7 +75753,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FWD_TGT_CREDS 1
  _ACEOF
-@@ -69800,20 +28254,14 @@
+@@ -69950,20 +28352,14 @@
  fi
  
  
@@ -75348,7 +75777,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.  */
-@@ -69854,43 +28302,18 @@
+@@ -70004,43 +28400,18 @@
    return 0;
  }
  _ACEOF
@@ -75398,7 +75827,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
  _ACEOF
-@@ -69898,20 +28321,14 @@
+@@ -70048,20 +28419,14 @@
  fi
  
  
@@ -75422,7 +75851,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.  */
-@@ -69952,43 +28369,18 @@
+@@ -70102,43 +28467,18 @@
    return 0;
  }
  _ACEOF
@@ -75472,7 +75901,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -69996,20 +28388,14 @@
+@@ -70146,20 +28486,14 @@
  fi
  
  
@@ -75496,7 +75925,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.  */
-@@ -70050,43 +28436,18 @@
+@@ -70200,43 +28534,18 @@
    return 0;
  }
  _ACEOF
@@ -75546,7 +75975,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
  _ACEOF
-@@ -70094,20 +28455,14 @@
+@@ -70244,20 +28553,14 @@
  fi
  
  
@@ -75570,7 +75999,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.  */
-@@ -70148,43 +28503,18 @@
+@@ -70298,43 +28601,18 @@
    return 0;
  }
  _ACEOF
@@ -75620,7 +76049,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDS 1
  _ACEOF
-@@ -70192,20 +28522,14 @@
+@@ -70342,20 +28620,14 @@
  fi
  
  
@@ -75644,7 +76073,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.  */
-@@ -70246,43 +28570,18 @@
+@@ -70396,43 +28668,18 @@
    return 0;
  }
  _ACEOF
@@ -75694,7 +76123,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1
  _ACEOF
-@@ -70290,20 +28589,14 @@
+@@ -70440,20 +28687,14 @@
  fi
  
  
@@ -75718,7 +76147,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.  */
-@@ -70344,43 +28637,18 @@
+@@ -70494,43 +28735,18 @@
    return 0;
  }
  _ACEOF
@@ -75768,7 +76197,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_HOST_REALM 1
  _ACEOF
-@@ -70388,20 +28656,14 @@
+@@ -70538,20 +28754,14 @@
  fi
  
  
@@ -75792,7 +76221,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.  */
-@@ -70442,208 +28704,62 @@
+@@ -70592,208 +28802,62 @@
    return 0;
  }
  _ACEOF
@@ -76022,7 +76451,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -70663,57 +28779,30 @@
+@@ -70813,57 +28877,30 @@
    return 0;
  }
  _ACEOF
@@ -76087,7 +76516,7 @@
  /* end confdefs.h.  */
  
  		    #include <krb5.h>
-@@ -70729,58 +28818,31 @@
+@@ -70879,58 +28916,31 @@
    return 0;
  }
  _ACEOF
@@ -76153,7 +76582,7 @@
  /* end confdefs.h.  */
  
  	#include <krb5.h>
-@@ -70792,36 +28854,15 @@
+@@ -70942,36 +28952,15 @@
    return 0;
  }
  _ACEOF
@@ -76193,7 +76622,7 @@
  $as_echo "$smb_krb5_cv_verify_checksum" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -70829,17 +28870,13 @@
+@@ -70979,17 +28968,13 @@
  _ACEOF
  
  
@@ -76214,7 +76643,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70850,56 +28887,29 @@
+@@ -71000,56 +28985,29 @@
    return 0;
  }
  _ACEOF
@@ -76278,7 +76707,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70910,56 +28920,29 @@
+@@ -71060,56 +29018,29 @@
    return 0;
  }
  _ACEOF
@@ -76342,7 +76771,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -70970,56 +28953,29 @@
+@@ -71120,56 +29051,29 @@
    return 0;
  }
  _ACEOF
@@ -76406,7 +76835,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71030,56 +28986,29 @@
+@@ -71180,56 +29084,29 @@
    return 0;
  }
  _ACEOF
@@ -76470,7 +76899,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71090,56 +29019,29 @@
+@@ -71240,56 +29117,29 @@
    return 0;
  }
  _ACEOF
@@ -76534,7 +76963,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71150,56 +29052,29 @@
+@@ -71300,56 +29150,29 @@
    return 0;
  }
  _ACEOF
@@ -76598,7 +77027,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71210,56 +29085,29 @@
+@@ -71360,56 +29183,29 @@
    return 0;
  }
  _ACEOF
@@ -76662,7 +77091,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71270,55 +29118,28 @@
+@@ -71420,55 +29216,28 @@
    return 0;
  }
  _ACEOF
@@ -76725,7 +77154,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71329,56 +29150,29 @@
+@@ -71479,56 +29248,29 @@
    return 0;
  }
  _ACEOF
@@ -76789,7 +77218,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71389,56 +29183,29 @@
+@@ -71539,56 +29281,29 @@
    return 0;
  }
  _ACEOF
@@ -76853,7 +77282,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71449,56 +29216,29 @@
+@@ -71599,56 +29314,29 @@
    return 0;
  }
  _ACEOF
@@ -76917,7 +77346,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71509,56 +29249,29 @@
+@@ -71659,56 +29347,29 @@
    return 0;
  }
  _ACEOF
@@ -76981,7 +77410,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71569,47 +29282,22 @@
+@@ -71719,47 +29380,22 @@
    return 0;
  }
  _ACEOF
@@ -77035,7 +77464,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71620,58 +29308,31 @@
+@@ -71770,58 +29406,31 @@
    return 0;
  }
  _ACEOF
@@ -77101,7 +77530,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71682,56 +29343,29 @@
+@@ -71832,56 +29441,29 @@
    return 0;
  }
  _ACEOF
@@ -77165,7 +77594,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71742,56 +29376,29 @@
+@@ -71892,56 +29474,29 @@
    return 0;
  }
  _ACEOF
@@ -77229,7 +77658,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71802,56 +29409,29 @@
+@@ -71952,56 +29507,29 @@
    return 0;
  }
  _ACEOF
@@ -77293,7 +77722,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71862,56 +29442,29 @@
+@@ -72012,56 +29540,29 @@
    return 0;
  }
  _ACEOF
@@ -77357,7 +77786,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71922,61 +29475,30 @@
+@@ -72072,61 +29573,30 @@
    return 0;
  }
  _ACEOF
@@ -77428,7 +77857,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -71987,56 +29509,29 @@
+@@ -72137,56 +29607,29 @@
    return 0;
  }
  _ACEOF
@@ -77492,7 +77921,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72047,56 +29542,29 @@
+@@ -72197,56 +29640,29 @@
    return 0;
  }
  _ACEOF
@@ -77556,7 +77985,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72107,65 +29575,35 @@
+@@ -72257,65 +29673,35 @@
    return 0;
  }
  _ACEOF
@@ -77633,7 +78062,7 @@
  /* end confdefs.h.  */
  
  #include<krb5.h>
-@@ -72178,65 +29616,32 @@
+@@ -72328,65 +29714,32 @@
      return krb5_kt_resolve(context, "WRFILE:api", &keytab);
    }
  _ACEOF
@@ -77708,7 +78137,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72247,56 +29652,29 @@
+@@ -72397,56 +29750,29 @@
    return 0;
  }
  _ACEOF
@@ -77772,7 +78201,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72310,56 +29688,29 @@
+@@ -72460,56 +29786,29 @@
    return 0;
  }
  _ACEOF
@@ -77836,7 +78265,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72370,56 +29721,29 @@
+@@ -72520,56 +29819,29 @@
    return 0;
  }
  _ACEOF
@@ -77900,7 +78329,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72431,49 +29755,26 @@
+@@ -72581,49 +29853,26 @@
    return 0;
  }
  _ACEOF
@@ -77956,7 +78385,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72487,20 +29788,13 @@
+@@ -72637,20 +29886,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -77982,7 +78411,7 @@
  /* end confdefs.h.  */
  
  		#include <stdlib.h>
-@@ -72514,42 +29808,15 @@
+@@ -72664,42 +29906,15 @@
  		}
  
  _ACEOF
@@ -78029,7 +78458,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72561,20 +29828,18 @@
+@@ -72711,20 +29926,18 @@
  	export LDFLAGS;
  
  fi
@@ -78054,7 +78483,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72588,20 +29853,13 @@
+@@ -72738,20 +29951,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -78080,7 +78509,7 @@
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -72612,42 +29870,15 @@
+@@ -72762,42 +29968,15 @@
  		}
  
  _ACEOF
@@ -78127,7 +78556,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72659,29 +29890,23 @@
+@@ -72809,29 +29988,23 @@
  	export LDFLAGS;
  
  fi
@@ -78162,7 +78591,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72692,61 +29917,30 @@
+@@ -72842,61 +30015,30 @@
    return 0;
  }
  _ACEOF
@@ -78233,7 +78662,7 @@
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -72757,47 +29951,20 @@
+@@ -72907,47 +30049,20 @@
    return 0;
  }
  _ACEOF
@@ -78287,7 +78716,7 @@
  
    fi
  
-@@ -72809,7 +29976,7 @@
+@@ -72959,7 +30074,7 @@
    #
    #
    if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -78296,7 +78725,7 @@
  $as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
      use_ads=no
    fi
-@@ -72817,7 +29984,7 @@
+@@ -72967,7 +30082,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
@@ -78305,7 +78734,7 @@
  $as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -72825,7 +29992,7 @@
+@@ -72975,7 +30090,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
@@ -78314,7 +78743,7 @@
  $as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -72833,7 +30000,7 @@
+@@ -72983,7 +30098,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
@@ -78323,7 +78752,7 @@
  $as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -72841,7 +30008,7 @@
+@@ -72991,7 +30106,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
@@ -78332,7 +78761,7 @@
  $as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -72853,14 +30020,14 @@
+@@ -73003,14 +30118,14 @@
  
        if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
        then
@@ -78349,7 +78778,7 @@
  $as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
  	use_ads=no
        fi
-@@ -72869,29 +30036,21 @@
+@@ -73019,29 +30134,21 @@
  
    if test x"$use_ads" = x"yes"; then
  
@@ -78384,7 +78813,7 @@
  $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
      fi
  
-@@ -72917,9 +30076,9 @@
+@@ -73067,9 +30174,9 @@
      KRB5_LIBS=""
      with_ads_support=no
    fi
@@ -78396,7 +78825,7 @@
  $as_echo "$use_ads" >&6; }
  
  LIBS="$ac_save_LIBS"
-@@ -72931,23 +30090,17 @@
+@@ -73081,23 +30188,17 @@
  
  
  
@@ -78423,7 +78852,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -72965,54 +30118,28 @@
+@@ -73115,54 +30216,28 @@
    return 0;
  }
  _ACEOF
@@ -78485,7 +78914,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSCD 1
  _ACEOF
-@@ -73027,7 +30154,6 @@
+@@ -73177,7 +30252,6 @@
  
  
  fi
@@ -78493,7 +78922,7 @@
  PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
  
  
-@@ -73035,12 +30161,12 @@
+@@ -73185,12 +30259,12 @@
  # Compile with DNS Updates support?
  
  with_dnsupdate_support=no
@@ -78508,7 +78937,7 @@
    withval=$with_dnsupdate;  case "$withval" in
      yes|no)
  	with_dnsupdate_support=$withval
-@@ -73049,7 +30175,7 @@
+@@ -73199,7 +30273,7 @@
  fi
  
  
@@ -78517,7 +78946,7 @@
  $as_echo "$with_dnsupdate_support" >&6; }
  
  if test x"$with_dnsupdate_support" != x"no"; then
-@@ -73063,151 +30189,12 @@
+@@ -73213,151 +30287,12 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
@@ -78674,7 +79103,7 @@
  _ACEOF
  
  fi
-@@ -73217,11 +30204,9 @@
+@@ -73367,11 +30302,9 @@
  
    if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
  	if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78688,7 +79117,7 @@
  $as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
  	fi
  	with_dnsupdate_support=no
-@@ -73237,102 +30222,12 @@
+@@ -73387,102 +30320,12 @@
  
    UUID_LIBS=""
  
@@ -78796,7 +79225,7 @@
  _ACEOF
  
          # uuid_generate was found in libc or existing $LIBS
-@@ -73349,9 +30244,7 @@
+@@ -73499,9 +30342,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -78807,7 +79236,7 @@
  
  
  
-@@ -73364,11 +30257,9 @@
+@@ -73514,11 +30355,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78821,7 +79250,7 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73377,18 +30268,14 @@
+@@ -73527,18 +30366,14 @@
  	    ;;
            *)
  	    # uuid_generate was not found, try adding libuuid
@@ -78843,7 +79272,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -73406,43 +30293,18 @@
+@@ -73556,43 +30391,18 @@
    return 0;
  }
  _ACEOF
@@ -78893,7 +79322,7 @@
  
  		LIBS="-luuid $LIBS"
  
-@@ -73458,9 +30320,7 @@
+@@ -73608,9 +30418,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -78904,7 +79333,7 @@
  
  
  
-@@ -73470,11 +30330,9 @@
+@@ -73620,11 +30428,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78918,7 +79347,7 @@
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -73494,28 +30352,26 @@
+@@ -73644,28 +30450,26 @@
  
  #################################################
  # check for automount support
@@ -78953,7 +79382,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -73526,34 +30382,30 @@
+@@ -73676,34 +30480,30 @@
  CIFSMOUNT_PROGS=""
  INSTALL_CIFSMOUNT=""
  UNINSTALL_CIFSMOUNT=""
@@ -78994,7 +79423,7 @@
  		;;
  	esac
      ;;
-@@ -73561,19 +30413,17 @@
+@@ -73711,19 +30511,17 @@
  else
     case "$host_os" in
    *linux*)
@@ -79017,7 +79446,7 @@
  $as_echo "no" >&6; }
  	;;
    esac
-@@ -73584,40 +30434,36 @@
+@@ -73734,40 +30532,36 @@
  CIFSUMOUNT_PROGS=""
  INSTALL_CIFSUMOUNT=""
  UNINSTALL_CIFSUMOUNT=""
@@ -79065,7 +79494,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -73625,151 +30471,12 @@
+@@ -73775,151 +30569,12 @@
  
  #################################################
  # check for cifs.upcall support
@@ -79221,7 +79650,7 @@
  _ACEOF
   HAVE_KEYUTILS_H=1
  else
-@@ -73781,34 +30488,28 @@
+@@ -73931,34 +30586,28 @@
  CIFSUPCALL_PROGS=""
  INSTALL_CIFSUPCALL=""
  UNINSTALL_CIFSUPCALL=""
@@ -79263,7 +79692,7 @@
  
  			CIFSUPCALL_PROGS="bin/cifs.upcall"
  			INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73816,9 +30517,7 @@
+@@ -73966,9 +30615,7 @@
  		fi
  		;;
  	*)
@@ -79274,7 +79703,7 @@
  		;;
  	esac
      ;;
-@@ -73827,18 +30526,16 @@
+@@ -73977,18 +30624,16 @@
     case "$host_os" in
    *linux*)
  	if test x"$use_ads" != x"yes"; then
@@ -79297,7 +79726,7 @@
  
  		CIFSUPCALL_PROGS="bin/cifs.upcall"
  		INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73846,191 +30543,53 @@
+@@ -73996,191 +30641,53 @@
  	fi
  	;;
    *)
@@ -79527,7 +79956,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74042,9 +30601,7 @@
+@@ -74192,9 +30699,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
@@ -79538,7 +79967,7 @@
  		fi
  		use_pam=no
  		create_pam_modules=no
-@@ -74052,23 +30609,17 @@
+@@ -74202,23 +30707,17 @@
  
  
  
@@ -79565,7 +79994,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -74086,54 +30637,28 @@
+@@ -74236,54 +30735,28 @@
    return 0;
  }
  _ACEOF
@@ -79627,7 +80056,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -74148,34 +30673,18 @@
+@@ -74298,34 +30771,18 @@
  
  
  fi
@@ -79667,7 +80096,7 @@
  		#if HAVE_SECURITY_PAM_APPL_H
  		#include <security/pam_appl.h>
  		#endif
-@@ -74183,44 +30692,9 @@
+@@ -74333,44 +30790,9 @@
  		#include <pam/pam_appl.h>
  		#endif
  
@@ -79715,7 +80144,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74232,179 +30706,33 @@
+@@ -74382,179 +30804,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
@@ -79905,7 +80334,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74413,150 +30741,12 @@
+@@ -74563,150 +30839,12 @@
  
  done
  
@@ -80062,7 +80491,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -74567,19 +30757,14 @@
+@@ -74717,19 +30855,14 @@
  
  
  
@@ -80085,7 +80514,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.  */
-@@ -74620,72 +30805,42 @@
+@@ -74770,72 +30903,42 @@
    return 0;
  }
  _ACEOF
@@ -80170,7 +80599,7 @@
  /* end confdefs.h.  */
  
  #if (!defined(LINUX))
-@@ -74723,36 +30878,11 @@
+@@ -74873,36 +30976,11 @@
    return 0;
  }
  _ACEOF
@@ -80209,7 +80638,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  #################################################
-@@ -74762,19 +30892,17 @@
+@@ -74912,19 +30990,17 @@
  UNINSTALL_PAM_MODULES=""
  
  try_pam_smbpass=auto
@@ -80232,7 +80661,7 @@
    ;;
    esac
  
-@@ -74788,16 +30916,12 @@
+@@ -74938,16 +31014,12 @@
  	# Conditions under which pam_smbpass can't be built.
  	if test x"$BLDSHARED" != xtrue ; then
  		if test x"${try_pam_smbpass}" = xyes ; then
@@ -80251,7 +80680,7 @@
  		fi
  		use_pam_smbpass=no
  	fi
-@@ -74808,7 +30932,7 @@
+@@ -74958,7 +31030,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  fi
@@ -80260,7 +80689,7 @@
  $as_echo "$use_pam_smbpass" >&6; }
  
  
-@@ -74819,98 +30943,63 @@
+@@ -74969,98 +31041,63 @@
  ## $with_pam_for_crypt variable as above   --jerry
  ##
  if test $with_pam_for_crypt = no; then
@@ -80375,7 +80804,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -74918,28 +31007,26 @@
+@@ -75068,28 +31105,26 @@
  
  #################################################
  # check for syslog logging
@@ -80410,7 +80839,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -74947,16 +31034,14 @@
+@@ -75097,16 +31132,14 @@
  
  #################################################
  # check for custom syslog facility
@@ -80430,7 +80859,7 @@
    else
       if test "$withval" != "yes" ; then
          syslog_facility="$withval"
-@@ -74981,14 +31066,14 @@
+@@ -75131,14 +31164,14 @@
  samba_cv_TRY_SYS_QUOTAS=auto
  samba_cv_SYSQUOTA_FOUND=no
  
@@ -80448,7 +80877,7 @@
  $as_echo "yes" >&6; }
      samba_cv_WITH_QUOTAS=yes
      samba_cv_TRY_QUOTAS=yes
-@@ -74997,7 +31082,7 @@
+@@ -75147,7 +31180,7 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    auto)
@@ -80457,7 +80886,7 @@
  $as_echo "auto" >&6; }
      samba_cv_WITH_QUOTAS=auto
      samba_cv_TRY_QUOTAS=auto
-@@ -75006,74 +31091,74 @@
+@@ -75156,74 +31189,74 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    no)
@@ -80545,7 +80974,7 @@
  $as_echo "no" >&6; }
              samba_cv_TRY_SYS_QUOTAS=no
  	    ;;
-@@ -75084,641 +31169,87 @@
+@@ -75234,641 +31267,87 @@
  # only check for quota stuff if --with-quotas
  if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
  
@@ -81245,7 +81674,7 @@
  _ACEOF
  
  fi
-@@ -75728,17 +31259,13 @@
+@@ -75878,17 +31357,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
@@ -81266,7 +81695,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -75758,35 +31285,14 @@
+@@ -75908,35 +31383,14 @@
    return 0;
  }
  _ACEOF
@@ -81305,7 +81734,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
-@@ -75794,17 +31300,13 @@
+@@ -75944,17 +31398,13 @@
  fi
  
  # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -81326,7 +81755,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -75822,41 +31324,18 @@
+@@ -75972,41 +31422,18 @@
    return 0;
  }
  _ACEOF
@@ -81372,7 +81801,7 @@
  
  fi
  
-@@ -75864,9 +31343,9 @@
+@@ -76014,9 +31441,9 @@
  # look for a working quota system
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -81384,7 +81813,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -75880,14 +31359,10 @@
+@@ -76030,14 +31457,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81401,7 +81830,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4A 1
-@@ -75895,42 +31370,15 @@
+@@ -76045,42 +31468,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81448,7 +81877,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -75942,23 +31390,21 @@
+@@ -76092,23 +31488,21 @@
  	export LDFLAGS;
  
  fi
@@ -81476,7 +81905,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -75972,14 +31418,10 @@
+@@ -76122,14 +31516,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81493,7 +81922,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4B 1
-@@ -75987,42 +31429,15 @@
+@@ -76137,42 +31527,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81540,7 +81969,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -76034,24 +31449,22 @@
+@@ -76184,24 +31547,22 @@
  	export LDFLAGS;
  
  fi
@@ -81569,7 +81998,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -76065,14 +31478,10 @@
+@@ -76215,14 +31576,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -81586,7 +82015,7 @@
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_3 1
-@@ -76080,42 +31489,15 @@
+@@ -76230,42 +31587,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -81633,7 +82062,7 @@
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -76127,15 +31509,13 @@
+@@ -76277,15 +31607,13 @@
  	export LDFLAGS;
  
  fi
@@ -81651,7 +82080,7 @@
  
      samba_cv_sysquotas_file="lib/sysquotas_3.c"
  fi
-@@ -76143,151 +31523,12 @@
+@@ -76293,151 +31621,12 @@
  
  #################################################
  # check for mntent.h and struct mntent
@@ -81807,7 +82236,7 @@
  _ACEOF
  
  fi
-@@ -76296,102 +31537,12 @@
+@@ -76446,102 +31635,12 @@
  
  #################################################
  # check for setmntent,getmntent,endmntent
@@ -81915,7 +82344,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -76402,151 +31553,12 @@
+@@ -76552,151 +31651,12 @@
  
  #################################################
  # check for devnm.h and struct mntent
@@ -82071,7 +82500,7 @@
  _ACEOF
  
  fi
-@@ -76555,102 +31567,12 @@
+@@ -76705,102 +31665,12 @@
  
  #################################################
  # check for devnm
@@ -82178,7 +82607,7 @@
  _ACEOF
  
  fi
-@@ -76673,19 +31595,15 @@
+@@ -76823,19 +31693,15 @@
  fi
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -82201,7 +82630,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76703,76 +31621,47 @@
+@@ -76853,76 +31719,47 @@
    return 0;
  }
  _ACEOF
@@ -82289,7 +82718,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76790,62 +31679,35 @@
+@@ -76940,62 +31777,35 @@
    return 0;
  }
  _ACEOF
@@ -82359,7 +82788,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -76861,56 +31723,33 @@
+@@ -77011,56 +31821,33 @@
    return 0;
  }
  _ACEOF
@@ -82424,7 +82853,7 @@
  $as_echo "no" >&6; }
      fi
  fi
-@@ -76922,12 +31761,12 @@
+@@ -77072,12 +31859,12 @@
  #################################################
  # check for experimental utmp accounting
  
@@ -82439,7 +82868,7 @@
    withval=$with_utmp;  case "$withval" in
    no)
  		WITH_UTMP=no
-@@ -76950,41 +31789,35 @@
+@@ -77100,41 +31887,35 @@
  # Display test results
  
  if test x"$WITH_UTMP" = x"yes"; then
@@ -82489,7 +82918,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -76998,51 +31831,22 @@
+@@ -77148,51 +31929,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -82548,7 +82977,7 @@
  
    fi
  fi
-@@ -77055,16 +31859,12 @@
+@@ -77205,16 +31957,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -82568,7 +82997,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77076,47 +31876,20 @@
+@@ -77226,47 +31974,20 @@
    return 0;
  }
  _ACEOF
@@ -82622,7 +83051,7 @@
  
    fi
  fi
-@@ -77124,17 +31897,13 @@
+@@ -77274,17 +31995,13 @@
  # smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
  # This is not the case on ancient Linux systems.
  
@@ -82643,7 +83072,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77146,57 +31915,30 @@
+@@ -77296,57 +32013,30 @@
    return 0;
  }
  _ACEOF
@@ -82708,7 +83137,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77208,56 +31950,29 @@
+@@ -77358,56 +32048,29 @@
    return 0;
  }
  _ACEOF
@@ -82772,7 +83201,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77269,55 +31984,28 @@
+@@ -77419,55 +32082,28 @@
    return 0;
  }
  _ACEOF
@@ -82835,7 +83264,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -77329,59 +32017,32 @@
+@@ -77479,59 +32115,32 @@
    return 0;
  }
  _ACEOF
@@ -82903,7 +83332,7 @@
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -77394,71 +32055,38 @@
+@@ -77544,71 +32153,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -82985,7 +83414,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -77477,71 +32105,38 @@
+@@ -77627,71 +32203,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -83067,7 +83496,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -77551,71 +32146,38 @@
+@@ -77701,71 +32244,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -83149,7 +83578,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -77631,71 +32193,38 @@
+@@ -77781,71 +32291,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -83231,7 +83660,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -77715,52 +32244,23 @@
+@@ -77865,52 +32342,23 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -83290,7 +83719,7 @@
  
    fi
  fi
-@@ -77773,13 +32273,9 @@
+@@ -77923,13 +32371,9 @@
  # If we don't have all of these then disable large
  # file support.
  #
@@ -83306,7 +83735,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -77796,41 +32292,18 @@
+@@ -77946,41 +32390,18 @@
    return 0;
  }
  _ACEOF
@@ -83352,7 +83781,7 @@
  $as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
  
  #################################################
-@@ -77840,10 +32313,10 @@
+@@ -77990,10 +32411,10 @@
  
  
  # Check whether --with-ctdb was given.
@@ -83365,7 +83794,7 @@
  $as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
      ;;
    *)
-@@ -77857,71 +32330,23 @@
+@@ -78007,71 +32428,23 @@
  CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
  ctdb_broken="missing or broken headers"
  
@@ -83447,7 +83876,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -77932,17 +32357,13 @@
+@@ -78082,17 +32455,13 @@
  
  
  
@@ -83468,7 +83897,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -77963,41 +32384,18 @@
+@@ -78113,41 +32482,18 @@
    return 0;
  }
  _ACEOF
@@ -83514,7 +83943,7 @@
  
   fi
  
-@@ -78008,255 +32406,43 @@
+@@ -78158,255 +32504,43 @@
  fi
  
  # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
@@ -83786,7 +84215,7 @@
  
  
  else
-@@ -78266,139 +32452,33 @@
+@@ -78416,139 +32550,33 @@
  fi
  
  
@@ -83936,7 +84365,7 @@
    withval=$with_cluster_support;
  fi
  
-@@ -78409,44 +32489,38 @@
+@@ -78559,44 +32587,38 @@
  
  if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
  	if test "x$with_cluster_support" = "xyes"; then
@@ -83988,7 +84417,7 @@
    withval=$with_acl_support;  case "$withval" in
  	yes|no)
  		with_acl_support="$withval"
-@@ -78459,105 +32533,85 @@
+@@ -78609,105 +32631,85 @@
  	with_acl_support="auto"
  fi
  
@@ -84115,7 +84544,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78575,60 +32629,31 @@
+@@ -78725,60 +32727,31 @@
    return 0;
  }
  _ACEOF
@@ -84185,7 +84614,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78646,61 +32671,32 @@
+@@ -78796,61 +32769,32 @@
    return 0;
  }
  _ACEOF
@@ -84256,7 +84685,7 @@
  /* end confdefs.h.  */
  
  				#include <sys/types.h>
-@@ -78719,64 +32715,33 @@
+@@ -78869,64 +32813,33 @@
    return 0;
  }
  _ACEOF
@@ -84331,7 +84760,7 @@
  /* end confdefs.h.  */
  
  					#include <sys/types.h>
-@@ -78794,58 +32759,29 @@
+@@ -78944,58 +32857,29 @@
    return 0;
  }
  _ACEOF
@@ -84398,7 +84827,7 @@
  
  		fi
  		;;
-@@ -78857,31 +32793,27 @@
+@@ -79007,31 +32891,27 @@
  #################################################
  # check for AIO support
  
@@ -84436,7 +84865,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78899,58 +32831,29 @@
+@@ -79049,58 +32929,29 @@
    return 0;
  }
  _ACEOF
@@ -84504,7 +84933,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78968,59 +32871,30 @@
+@@ -79118,59 +32969,30 @@
    return 0;
  }
  _ACEOF
@@ -84573,7 +85002,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -79032,55 +32906,26 @@
+@@ -79182,55 +33004,26 @@
    return 0;
  }
  _ACEOF
@@ -84637,7 +85066,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -79092,716 +32937,317 @@
+@@ -79242,716 +33035,317 @@
    return 0;
  }
  _ACEOF
@@ -85492,7 +85921,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -79818,30 +33264,26 @@
+@@ -79968,30 +33362,26 @@
  # check for sendfile support
  
  with_sendfile_support=yes
@@ -85529,7 +85958,7 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -79857,53 +33299,24 @@
+@@ -80007,53 +33397,24 @@
    return 0;
  }
  _ACEOF
@@ -85591,7 +86020,7 @@
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -79919,54 +33332,25 @@
+@@ -80069,54 +33430,25 @@
    return 0;
  }
  _ACEOF
@@ -85654,7 +86083,7 @@
  /* end confdefs.h.  */
  \
  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -79986,103 +33370,58 @@
+@@ -80136,103 +33468,58 @@
    return 0;
  }
  _ACEOF
@@ -85775,7 +86204,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/types.h>
-@@ -80109,76 +33448,41 @@
+@@ -80259,76 +33546,41 @@
    return 0;
  }
  _ACEOF
@@ -85864,7 +86293,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80202,73 +33506,38 @@
+@@ -80352,73 +33604,38 @@
    return 0;
  }
  _ACEOF
@@ -85950,7 +86379,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80292,77 +33561,41 @@
+@@ -80442,77 +33659,41 @@
    return 0;
  }
  _ACEOF
@@ -86040,7 +86469,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80380,43 +33613,18 @@
+@@ -80530,43 +33711,18 @@
    return 0;
  }
  _ACEOF
@@ -86090,7 +86519,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSENDFILE 1
  _ACEOF
-@@ -80425,17 +33633,13 @@
+@@ -80575,17 +33731,13 @@
  
  fi
  
@@ -86111,7 +86540,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80466,74 +33670,39 @@
+@@ -80616,74 +33768,39 @@
    return 0;
  }
  _ACEOF
@@ -86198,7 +86627,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -80564,75 +33733,40 @@
+@@ -80714,75 +33831,40 @@
    return 0;
  }
  _ACEOF
@@ -86286,7 +86715,7 @@
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -80660,59 +33794,28 @@
+@@ -80810,59 +33892,28 @@
    return 0;
  }
  _ACEOF
@@ -86355,7 +86784,7 @@
  $as_echo "no" >&6; };
  	fi
  	;;
-@@ -80721,12 +33824,12 @@
+@@ -80871,12 +33922,12 @@
          esac
          ;;
    *)
@@ -86370,7 +86799,7 @@
  $as_echo "yes" >&6; }
  
  fi
-@@ -80735,17 +33838,13 @@
+@@ -80885,17 +33936,13 @@
  ############################################
  # See if we have the Linux readahead syscall.
  
@@ -86391,7 +86820,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80760,62 +33859,31 @@
+@@ -80910,62 +33957,31 @@
    return 0;
  }
  _ACEOF
@@ -86463,7 +86892,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -80826,41 +33894,18 @@
+@@ -80976,41 +33992,18 @@
    return 0;
  }
  _ACEOF
@@ -86509,7 +86938,7 @@
  
   fi
  
-@@ -80868,17 +33913,13 @@
+@@ -81018,17 +34011,13 @@
  ############################################
  # See if we have the posix_fadvise syscall.
  
@@ -86530,7 +86959,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80893,47 +33934,20 @@
+@@ -81043,47 +34032,20 @@
    return 0;
  }
  _ACEOF
@@ -86585,7 +87014,7 @@
  
  fi
  
-@@ -80942,17 +33956,13 @@
+@@ -81092,17 +34054,13 @@
  
  case "$host_os" in
  *linux*)
@@ -86606,7 +87035,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -80967,40 +33977,15 @@
+@@ -81117,40 +34075,15 @@
    return 0;
  }
  _ACEOF
@@ -86652,7 +87081,7 @@
  $as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
  ;;
  *)
-@@ -81010,24 +33995,18 @@
+@@ -81160,24 +34093,18 @@
  
  if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
  
@@ -86681,7 +87110,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -81038,41 +34017,18 @@
+@@ -81188,41 +34115,18 @@
    return 0;
  }
  _ACEOF
@@ -86727,7 +87156,7 @@
  
   fi
  
-@@ -81080,68 +34036,35 @@
+@@ -81230,68 +34134,35 @@
  ############################################
  # See if we have the a broken readlink syscall.
  
@@ -86806,7 +87235,7 @@
  
  fi
  
-@@ -81149,7 +34072,7 @@
+@@ -81299,7 +34170,7 @@
  # Check whether winbind is supported on this platform.  If so we need to
  # build and install client programs, sbin programs and shared libraries
  
@@ -86815,7 +87244,7 @@
  $as_echo_n "checking whether to build winbind... " >&6; }
  
  # Initially, the value of $host_os decides whether winbind is supported
-@@ -81161,7 +34084,7 @@
+@@ -81311,7 +34182,7 @@
  # We define this here so --with-winbind can override it.
  
  # Check whether --with-wbclient was given.
@@ -86824,7 +87253,7 @@
    withval=$with_wbclient;
    case "$withval" in
          no)
-@@ -81259,7 +34182,7 @@
+@@ -81409,7 +34280,7 @@
  
  
  # Check whether --with-winbind was given.
@@ -86833,7 +87262,7 @@
    withval=$with_winbind;
    case "$withval" in
  	yes)
-@@ -81290,18 +34213,14 @@
+@@ -81440,18 +34311,14 @@
  	WINBIND_WINS_NSS=""
  fi
  if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -86855,7 +87284,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -81319,57 +34238,28 @@
+@@ -81469,57 +34336,28 @@
    return 0;
  }
  _ACEOF
@@ -86922,7 +87351,7 @@
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  else
-@@ -81398,12 +34288,10 @@
+@@ -81548,12 +34386,10 @@
  fi
  
  if test x"$HAVE_WINBIND" = x"yes"; then
@@ -86937,7 +87366,7 @@
  
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -81414,7 +34302,7 @@
+@@ -81564,7 +34400,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  else
@@ -86946,7 +87375,7 @@
  $as_echo "no$winbind_no_reason" >&6; }
  fi
  
-@@ -81427,108 +34315,11 @@
+@@ -81577,108 +34413,11 @@
  
  
  # Solaris 10 does have new member in nss_XbyY_key
@@ -87059,7 +87488,7 @@
  
  fi
  
-@@ -81536,318 +34327,29 @@
+@@ -81686,318 +34425,29 @@
  # Solaris has some extra fields in struct passwd that need to be
  # initialised otherwise nscd crashes.
  
@@ -87389,7 +87818,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -81856,104 +34358,9 @@
+@@ -82006,104 +34456,9 @@
  
  fi
  
@@ -87497,7 +87926,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -81963,17 +34370,13 @@
+@@ -82113,17 +34468,13 @@
  fi
  
  
@@ -87518,7 +87947,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -81988,41 +34391,18 @@
+@@ -82138,41 +34489,18 @@
    return 0;
  }
  _ACEOF
@@ -87564,7 +87993,7 @@
  
  fi
  
-@@ -82032,7 +34412,7 @@
+@@ -82182,7 +34510,7 @@
  
  
  # Check whether --with-included-popt was given.
@@ -87573,7 +88002,7 @@
    withval=$with_included_popt;
    case "$withval" in
  	yes)
-@@ -82045,18 +34425,14 @@
+@@ -82195,18 +34523,14 @@
  fi
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -87595,7 +88024,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82074,43 +34450,18 @@
+@@ -82224,43 +34548,18 @@
    return 0;
  }
  _ACEOF
@@ -87645,7 +88074,7 @@
    INCLUDED_POPT=no
  else
    INCLUDED_POPT=yes
-@@ -82118,16 +34469,16 @@
+@@ -82268,16 +34567,16 @@
  
  fi
  
@@ -87665,7 +88094,7 @@
  $as_echo "no" >&6; }
  	BUILD_POPT=""
      POPTLIBS="-lpopt"
-@@ -82140,7 +34491,7 @@
+@@ -82290,7 +34589,7 @@
  # Check if user wants DNS service discovery support
  
  # Check whether --enable-dnssd was given.
@@ -87674,7 +88103,7 @@
    enableval=$enable_dnssd;
  fi
  
-@@ -82149,151 +34500,12 @@
+@@ -82299,151 +34598,12 @@
  if test x"$enable_dnssd" = x"yes"; then
      have_dnssd_support=yes
  
@@ -87831,7 +88260,7 @@
  _ACEOF
  
  fi
-@@ -82306,102 +34518,12 @@
+@@ -82456,102 +34616,12 @@
  
      # On Darwin the DNSSD API is in libc, but on other platforms it's
      # probably in -ldns_sd
@@ -87939,7 +88368,7 @@
  _ACEOF
  
  fi
-@@ -82409,23 +34531,17 @@
+@@ -82559,23 +34629,17 @@
  
  
  
@@ -87966,7 +88395,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82438,59 +34554,33 @@
+@@ -82588,59 +34652,33 @@
  int
  main ()
  {
@@ -88038,7 +88467,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDNS_SD 1
  _ACEOF
-@@ -82505,7 +34595,6 @@
+@@ -82655,7 +34693,6 @@
  
  
  fi
@@ -88046,7 +88475,7 @@
      if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
              x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
  	have_dnssd_support=no
-@@ -82513,15 +34602,11 @@
+@@ -82663,15 +34700,11 @@
  
      if test x"$have_dnssd_support" = x"yes"; then
  
@@ -88064,7 +88493,7 @@
  	fi
      fi
  
-@@ -82531,7 +34616,7 @@
+@@ -82681,7 +34714,7 @@
  # Check if user wants avahi support
  
  # Check whether --enable-avahi was given.
@@ -88073,7 +88502,7 @@
    enableval=$enable_avahi;
  fi
  
-@@ -82539,151 +34624,12 @@
+@@ -82689,151 +34722,12 @@
  if test x"$enable_avahi" != x"no"; then
      have_avahi_support=yes
  
@@ -88230,7 +88659,7 @@
  _ACEOF
  
  fi
-@@ -82694,151 +34640,12 @@
+@@ -82844,151 +34738,12 @@
  	have_avahi_support=no
      fi
  
@@ -88387,7 +88816,7 @@
  _ACEOF
  
  fi
-@@ -82850,18 +34657,14 @@
+@@ -83000,18 +34755,14 @@
      fi
  
      save_LIBS="$LIBS"
@@ -88409,7 +88838,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82879,58 +34682,29 @@
+@@ -83029,58 +34780,29 @@
    return 0;
  }
  _ACEOF
@@ -88477,7 +88906,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -82948,43 +34722,18 @@
+@@ -83098,43 +34820,18 @@
    return 0;
  }
  _ACEOF
@@ -88527,7 +88956,7 @@
    have_avahi_strerror=yes
  fi
  
-@@ -82999,17 +34748,13 @@
+@@ -83149,17 +34846,13 @@
          AVAHI_LIBS="-lavahi-client -lavahi-common"
  
  
@@ -88547,7 +88976,7 @@
  	fi
      fi
  fi
-@@ -83024,18 +34769,14 @@
+@@ -83174,18 +34867,14 @@
  # If it's error, then the user didn't
  # define it.
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88569,7 +88998,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83053,43 +34794,18 @@
+@@ -83203,43 +34892,18 @@
    return 0;
  }
  _ACEOF
@@ -88619,7 +89048,7 @@
  
  	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
  	     PTHREAD_LDFLAGS="-lpthread"
-@@ -83098,18 +34814,14 @@
+@@ -83248,18 +34912,14 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88641,7 +89070,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83127,43 +34839,18 @@
+@@ -83277,43 +34937,18 @@
    return 0;
  }
  _ACEOF
@@ -88691,7 +89120,7 @@
  
  	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
  	     PTHREAD_LDFLAGS="-lpthreads"
-@@ -83172,18 +34859,14 @@
+@@ -83322,18 +34957,14 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88713,7 +89142,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83201,43 +34884,18 @@
+@@ -83351,43 +34982,18 @@
    return 0;
  }
  _ACEOF
@@ -88763,7 +89192,7 @@
  
  		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
  		PTHREAD_LDFLAGS="-pthread"
-@@ -83246,92 +34904,8 @@
+@@ -83396,92 +35002,8 @@
  fi
  
  if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88858,7 +89287,7 @@
  
  		 PTHREAD_CFLAGS="-D_REENTRANT"
  		 PTHREAD_LDFLAGS="-lpthread"
-@@ -83342,18 +34916,14 @@
+@@ -83492,18 +35014,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
@@ -88880,7 +89309,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83371,43 +34941,18 @@
+@@ -83521,43 +35039,18 @@
    return 0;
  }
  _ACEOF
@@ -88930,7 +89359,7 @@
  
  		PTHREAD_CFLAGS="-D_REENTRANT"
  		PTHREAD_LDFLAGS="-lpthread"
-@@ -83426,151 +34971,12 @@
+@@ -83576,151 +35069,12 @@
  	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
  	ac_save_LDFLAGS=$LDFLAGS
  	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
@@ -89087,7 +89516,7 @@
  _ACEOF
  
  fi
-@@ -83580,9 +34986,7 @@
+@@ -83730,9 +35084,7 @@
  	CFLAGS=$ac_save_CFLAGS
  	LDFLAGS=$ac_save_LDFLAGS
  
@@ -89098,7 +89527,7 @@
  
  fi
  
-@@ -83590,24 +34994,20 @@
+@@ -83740,24 +35092,20 @@
  # Check if user wants pthreadpool support
  
  # Check whether --enable-pthreadpool was given.
@@ -89126,7 +89555,7 @@
  
      PTHREADPOOL_OBJ="lib/pthreadpool.o"
  
-@@ -83618,7 +35018,7 @@
+@@ -83768,7 +35116,7 @@
  
  
  # Check whether --with-included-iniparser was given.
@@ -89135,7 +89564,7 @@
    withval=$with_included_iniparser;
    case "$withval" in
  	yes)
-@@ -83631,18 +35031,14 @@
+@@ -83781,18 +35129,14 @@
  fi
  
  if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -89157,7 +89586,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -83660,43 +35056,18 @@
+@@ -83810,43 +35154,18 @@
    return 0;
  }
  _ACEOF
@@ -89207,7 +89636,7 @@
    INCLUDED_INIPARSER=no
  else
    INCLUDED_INIPARSER=yes
-@@ -83704,260 +35075,40 @@
+@@ -83854,260 +35173,40 @@
  
  fi
  
@@ -89493,7 +89922,7 @@
  _ACEOF
  
  fi
-@@ -83965,20 +35116,16 @@
+@@ -84115,20 +35214,16 @@
  done
  
  
@@ -89518,7 +89947,7 @@
  /* end confdefs.h.  */
  
  		#include <sys/types.h>
-@@ -83990,46 +35137,19 @@
+@@ -84140,46 +35235,19 @@
  			return statfs (".", &fsd);
  		}
  _ACEOF
@@ -89570,7 +89999,7 @@
  $as_echo "$vfsfileid_cv_statfs" >&6; }
  
  if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -84064,7 +35184,7 @@
+@@ -84214,7 +35282,7 @@
  
  
  # Check whether --with-static-modules was given.
@@ -89579,7 +90008,7 @@
    withval=$with_static_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -84076,7 +35196,7 @@
+@@ -84226,7 +35294,7 @@
  
  
  # Check whether --with-shared-modules was given.
@@ -89588,7 +90017,7 @@
    withval=$with_shared_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -84093,7 +35213,7 @@
+@@ -84243,7 +35311,7 @@
  fi
  
  
@@ -89597,7 +90026,7 @@
  $as_echo_n "checking how to build pdb_ldap... " >&6; }
  	if test "$MODULE_pdb_ldap"; then
  		DEST=$MODULE_pdb_ldap
-@@ -84105,12 +35225,10 @@
+@@ -84255,12 +35323,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89612,7 +90041,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -84121,16 +35239,16 @@
+@@ -84271,16 +35337,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
  
  		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -89632,7 +90061,7 @@
  $as_echo_n "checking how to build pdb_ads... " >&6; }
  	if test "$MODULE_pdb_ads"; then
  		DEST=$MODULE_pdb_ads
-@@ -84142,12 +35260,10 @@
+@@ -84292,12 +35358,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89647,7 +90076,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ads"
-@@ -84158,16 +35274,16 @@
+@@ -84308,16 +35372,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
  
  
@@ -89667,7 +90096,7 @@
  $as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
  	if test "$MODULE_pdb_smbpasswd"; then
  		DEST=$MODULE_pdb_smbpasswd
-@@ -84179,12 +35295,10 @@
+@@ -84329,12 +35393,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89682,7 +90111,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -84195,16 +35309,16 @@
+@@ -84345,16 +35407,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
  
  
@@ -89702,7 +90131,7 @@
  $as_echo_n "checking how to build pdb_tdbsam... " >&6; }
  	if test "$MODULE_pdb_tdbsam"; then
  		DEST=$MODULE_pdb_tdbsam
-@@ -84216,12 +35330,10 @@
+@@ -84366,12 +35428,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89717,7 +90146,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -84232,16 +35344,16 @@
+@@ -84382,16 +35442,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
  
  
@@ -89737,7 +90166,7 @@
  $as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
  	if test "$MODULE_pdb_wbc_sam"; then
  		DEST=$MODULE_pdb_wbc_sam
-@@ -84253,12 +35365,10 @@
+@@ -84403,12 +35463,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89752,7 +90181,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -84269,11 +35379,11 @@
+@@ -84419,11 +35477,11 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
  
  
@@ -89766,7 +90195,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84295,7 +35405,7 @@
+@@ -84445,7 +35503,7 @@
  
  
  
@@ -89775,7 +90204,7 @@
  $as_echo_n "checking how to build rpc_lsarpc... " >&6; }
  	if test "$MODULE_rpc_lsarpc"; then
  		DEST=$MODULE_rpc_lsarpc
-@@ -84307,12 +35417,10 @@
+@@ -84457,12 +35515,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89790,7 +90219,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -84323,16 +35431,16 @@
+@@ -84473,16 +35529,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
  
  
@@ -89810,7 +90239,7 @@
  $as_echo_n "checking how to build rpc_winreg... " >&6; }
  	if test "$MODULE_rpc_winreg"; then
  		DEST=$MODULE_rpc_winreg
-@@ -84344,12 +35452,10 @@
+@@ -84494,12 +35550,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89825,7 +90254,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -84360,16 +35466,16 @@
+@@ -84510,16 +35564,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
  
  
@@ -89845,7 +90274,7 @@
  $as_echo_n "checking how to build rpc_initshutdown... " >&6; }
  	if test "$MODULE_rpc_initshutdown"; then
  		DEST=$MODULE_rpc_initshutdown
-@@ -84381,12 +35487,10 @@
+@@ -84531,12 +35585,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89860,7 +90289,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -84397,16 +35501,16 @@
+@@ -84547,16 +35599,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
  
  
@@ -89880,7 +90309,7 @@
  $as_echo_n "checking how to build rpc_dssetup... " >&6; }
  	if test "$MODULE_rpc_dssetup"; then
  		DEST=$MODULE_rpc_dssetup
-@@ -84418,12 +35522,10 @@
+@@ -84568,12 +35620,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89895,7 +90324,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -84434,16 +35536,16 @@
+@@ -84584,16 +35634,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
  
  
@@ -89915,7 +90344,7 @@
  $as_echo_n "checking how to build rpc_wkssvc... " >&6; }
  	if test "$MODULE_rpc_wkssvc"; then
  		DEST=$MODULE_rpc_wkssvc
-@@ -84455,12 +35557,10 @@
+@@ -84605,12 +35655,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89930,7 +90359,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -84471,16 +35571,16 @@
+@@ -84621,16 +35669,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
  
  
@@ -89950,7 +90379,7 @@
  $as_echo_n "checking how to build rpc_svcctl... " >&6; }
  	if test "$MODULE_rpc_svcctl"; then
  		DEST=$MODULE_rpc_svcctl
-@@ -84492,12 +35592,10 @@
+@@ -84642,12 +35690,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89965,7 +90394,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -84508,16 +35606,16 @@
+@@ -84658,16 +35704,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
  
  
@@ -89985,7 +90414,7 @@
  $as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
  	if test "$MODULE_rpc_ntsvcs"; then
  		DEST=$MODULE_rpc_ntsvcs
-@@ -84529,12 +35627,10 @@
+@@ -84679,12 +35725,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90000,7 +90429,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -84545,16 +35641,16 @@
+@@ -84695,16 +35739,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
  
  
@@ -90020,7 +90449,7 @@
  $as_echo_n "checking how to build rpc_netlogon... " >&6; }
  	if test "$MODULE_rpc_netlogon"; then
  		DEST=$MODULE_rpc_netlogon
-@@ -84566,12 +35662,10 @@
+@@ -84716,12 +35760,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90035,7 +90464,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -84582,16 +35676,16 @@
+@@ -84732,16 +35774,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
  
  
@@ -90055,7 +90484,7 @@
  $as_echo_n "checking how to build rpc_netdfs... " >&6; }
  	if test "$MODULE_rpc_netdfs"; then
  		DEST=$MODULE_rpc_netdfs
-@@ -84603,12 +35697,10 @@
+@@ -84753,12 +35795,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90070,7 +90499,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -84619,16 +35711,16 @@
+@@ -84769,16 +35809,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
  
  
@@ -90090,7 +90519,7 @@
  $as_echo_n "checking how to build rpc_srvsvc... " >&6; }
  	if test "$MODULE_rpc_srvsvc"; then
  		DEST=$MODULE_rpc_srvsvc
-@@ -84640,12 +35732,10 @@
+@@ -84790,12 +35830,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90105,7 +90534,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -84656,16 +35746,16 @@
+@@ -84806,16 +35844,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
  
  
@@ -90125,7 +90554,7 @@
  $as_echo_n "checking how to build rpc_spoolss... " >&6; }
  	if test "$MODULE_rpc_spoolss"; then
  		DEST=$MODULE_rpc_spoolss
-@@ -84677,12 +35767,10 @@
+@@ -84827,12 +35865,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90140,7 +90569,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -84693,16 +35781,16 @@
+@@ -84843,16 +35879,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
  
  
@@ -90160,7 +90589,7 @@
  $as_echo_n "checking how to build rpc_eventlog... " >&6; }
  	if test "$MODULE_rpc_eventlog"; then
  		DEST=$MODULE_rpc_eventlog
-@@ -84714,12 +35802,10 @@
+@@ -84864,12 +35900,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90175,7 +90604,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -84730,16 +35816,16 @@
+@@ -84880,16 +35914,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
  
  
@@ -90195,7 +90624,7 @@
  $as_echo_n "checking how to build rpc_samr... " >&6; }
  	if test "$MODULE_rpc_samr"; then
  		DEST=$MODULE_rpc_samr
-@@ -84751,12 +35837,10 @@
+@@ -84901,12 +35935,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90210,7 +90639,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_samr"
-@@ -84767,16 +35851,16 @@
+@@ -84917,16 +35949,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
  
  
@@ -90230,7 +90659,7 @@
  $as_echo_n "checking how to build rpc_rpcecho... " >&6; }
  	if test "$MODULE_rpc_rpcecho"; then
  		DEST=$MODULE_rpc_rpcecho
-@@ -84788,12 +35872,10 @@
+@@ -84938,12 +35970,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90245,7 +90674,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -84804,11 +35886,11 @@
+@@ -84954,11 +35984,11 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
  
  
@@ -90259,7 +90688,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -84829,7 +35911,7 @@
+@@ -84979,7 +36009,7 @@
  
  
  
@@ -90268,7 +90697,7 @@
  $as_echo_n "checking how to build idmap_ldap... " >&6; }
  	if test "$MODULE_idmap_ldap"; then
  		DEST=$MODULE_idmap_ldap
-@@ -84841,12 +35923,10 @@
+@@ -84991,12 +36021,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90283,7 +90712,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -84857,16 +35937,16 @@
+@@ -85007,16 +36035,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
  
  
@@ -90303,7 +90732,7 @@
  $as_echo_n "checking how to build idmap_tdb... " >&6; }
  	if test "$MODULE_idmap_tdb"; then
  		DEST=$MODULE_idmap_tdb
-@@ -84878,12 +35958,10 @@
+@@ -85028,12 +36056,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90318,7 +90747,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -84894,16 +35972,16 @@
+@@ -85044,16 +36070,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
  
  
@@ -90338,7 +90767,7 @@
  $as_echo_n "checking how to build idmap_tdb2... " >&6; }
  	if test "$MODULE_idmap_tdb2"; then
  		DEST=$MODULE_idmap_tdb2
-@@ -84915,12 +35993,10 @@
+@@ -85065,12 +36091,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90353,7 +90782,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -84931,16 +36007,16 @@
+@@ -85081,16 +36105,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
  
  
@@ -90373,7 +90802,7 @@
  $as_echo_n "checking how to build idmap_passdb... " >&6; }
  	if test "$MODULE_idmap_passdb"; then
  		DEST=$MODULE_idmap_passdb
-@@ -84952,12 +36028,10 @@
+@@ -85102,12 +36126,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90388,7 +90817,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -84968,16 +36042,16 @@
+@@ -85118,16 +36140,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
  
  
@@ -90408,7 +90837,7 @@
  $as_echo_n "checking how to build idmap_nss... " >&6; }
  	if test "$MODULE_idmap_nss"; then
  		DEST=$MODULE_idmap_nss
-@@ -84989,12 +36063,10 @@
+@@ -85139,12 +36161,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90423,7 +90852,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_nss"
-@@ -85005,16 +36077,16 @@
+@@ -85155,16 +36175,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
  
  
@@ -90443,7 +90872,7 @@
  $as_echo_n "checking how to build idmap_rid... " >&6; }
  	if test "$MODULE_idmap_rid"; then
  		DEST=$MODULE_idmap_rid
-@@ -85026,12 +36098,10 @@
+@@ -85176,12 +36196,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90458,7 +90887,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_rid"
-@@ -85042,16 +36112,16 @@
+@@ -85192,16 +36210,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
  
  
@@ -90478,7 +90907,7 @@
  $as_echo_n "checking how to build idmap_ad... " >&6; }
  	if test "$MODULE_idmap_ad"; then
  		DEST=$MODULE_idmap_ad
-@@ -85063,12 +36133,10 @@
+@@ -85213,12 +36231,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90493,7 +90922,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ad"
-@@ -85079,16 +36147,16 @@
+@@ -85229,16 +36245,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
  
  
@@ -90513,7 +90942,7 @@
  $as_echo_n "checking how to build idmap_hash... " >&6; }
  	if test "$MODULE_idmap_hash"; then
  		DEST=$MODULE_idmap_hash
-@@ -85100,12 +36168,10 @@
+@@ -85250,12 +36266,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90528,7 +90957,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_hash"
-@@ -85116,16 +36182,16 @@
+@@ -85266,16 +36280,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
  
  
@@ -90548,7 +90977,7 @@
  $as_echo_n "checking how to build idmap_adex... " >&6; }
  	if test "$MODULE_idmap_adex"; then
  		DEST=$MODULE_idmap_adex
-@@ -85137,12 +36203,10 @@
+@@ -85287,12 +36301,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90563,7 +90992,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_adex"
-@@ -85153,11 +36217,11 @@
+@@ -85303,11 +36315,11 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
  
  
@@ -90577,7 +91006,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85178,7 +36242,7 @@
+@@ -85328,7 +36340,7 @@
  
  
  
@@ -90586,7 +91015,7 @@
  $as_echo_n "checking how to build nss_info_template... " >&6; }
  	if test "$MODULE_nss_info_template"; then
  		DEST=$MODULE_nss_info_template
-@@ -85190,12 +36254,10 @@
+@@ -85340,12 +36352,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90601,7 +91030,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules nss_info_template"
-@@ -85206,11 +36268,11 @@
+@@ -85356,11 +36366,11 @@
  		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
  
  
@@ -90615,7 +91044,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85231,7 +36293,7 @@
+@@ -85381,7 +36391,7 @@
  
  
  
@@ -90624,7 +91053,7 @@
  $as_echo_n "checking how to build charset_weird... " >&6; }
  	if test "$MODULE_charset_weird"; then
  		DEST=$MODULE_charset_weird
-@@ -85243,12 +36305,10 @@
+@@ -85393,12 +36403,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90639,7 +91068,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_weird"
-@@ -85259,16 +36319,16 @@
+@@ -85409,16 +36417,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
  
  
@@ -90659,7 +91088,7 @@
  $as_echo_n "checking how to build charset_CP850... " >&6; }
  	if test "$MODULE_charset_CP850"; then
  		DEST=$MODULE_charset_CP850
-@@ -85280,12 +36340,10 @@
+@@ -85430,12 +36438,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90674,7 +91103,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP850"
-@@ -85296,16 +36354,16 @@
+@@ -85446,16 +36452,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
  
  
@@ -90694,7 +91123,7 @@
  $as_echo_n "checking how to build charset_CP437... " >&6; }
  	if test "$MODULE_charset_CP437"; then
  		DEST=$MODULE_charset_CP437
-@@ -85317,12 +36375,10 @@
+@@ -85467,12 +36473,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90709,7 +91138,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP437"
-@@ -85333,16 +36389,16 @@
+@@ -85483,16 +36487,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
  
  
@@ -90729,7 +91158,7 @@
  $as_echo_n "checking how to build charset_macosxfs... " >&6; }
  	if test "$MODULE_charset_macosxfs"; then
  		DEST=$MODULE_charset_macosxfs
-@@ -85354,12 +36410,10 @@
+@@ -85504,12 +36508,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90744,7 +91173,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -85370,11 +36424,11 @@
+@@ -85520,11 +36522,11 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
  
  
@@ -90758,7 +91187,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85395,7 +36449,7 @@
+@@ -85545,7 +36547,7 @@
  
  
  
@@ -90767,7 +91196,7 @@
  $as_echo_n "checking how to build auth_sam... " >&6; }
  	if test "$MODULE_auth_sam"; then
  		DEST=$MODULE_auth_sam
-@@ -85407,12 +36461,10 @@
+@@ -85557,12 +36559,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90782,7 +91211,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_sam"
-@@ -85423,16 +36475,16 @@
+@@ -85573,16 +36573,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
  
  
@@ -90802,7 +91231,7 @@
  $as_echo_n "checking how to build auth_unix... " >&6; }
  	if test "$MODULE_auth_unix"; then
  		DEST=$MODULE_auth_unix
-@@ -85444,12 +36496,10 @@
+@@ -85594,12 +36594,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90817,7 +91246,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_unix"
-@@ -85460,16 +36510,16 @@
+@@ -85610,16 +36608,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
  
  
@@ -90837,7 +91266,7 @@
  $as_echo_n "checking how to build auth_winbind... " >&6; }
  	if test "$MODULE_auth_winbind"; then
  		DEST=$MODULE_auth_winbind
-@@ -85481,12 +36531,10 @@
+@@ -85631,12 +36629,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90852,7 +91281,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_winbind"
-@@ -85497,16 +36545,16 @@
+@@ -85647,16 +36643,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
  
  
@@ -90872,7 +91301,7 @@
  $as_echo_n "checking how to build auth_wbc... " >&6; }
  	if test "$MODULE_auth_wbc"; then
  		DEST=$MODULE_auth_wbc
-@@ -85518,12 +36566,10 @@
+@@ -85668,12 +36664,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90887,7 +91316,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_wbc"
-@@ -85534,16 +36580,16 @@
+@@ -85684,16 +36678,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
  
  
@@ -90907,7 +91336,7 @@
  $as_echo_n "checking how to build auth_server... " >&6; }
  	if test "$MODULE_auth_server"; then
  		DEST=$MODULE_auth_server
-@@ -85555,12 +36601,10 @@
+@@ -85705,12 +36699,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90922,7 +91351,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_server"
-@@ -85571,16 +36615,16 @@
+@@ -85721,16 +36713,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
  
  
@@ -90942,7 +91371,7 @@
  $as_echo_n "checking how to build auth_domain... " >&6; }
  	if test "$MODULE_auth_domain"; then
  		DEST=$MODULE_auth_domain
-@@ -85592,12 +36636,10 @@
+@@ -85742,12 +36734,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90957,7 +91386,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_domain"
-@@ -85608,16 +36650,16 @@
+@@ -85758,16 +36748,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
  
  
@@ -90977,7 +91406,7 @@
  $as_echo_n "checking how to build auth_builtin... " >&6; }
  	if test "$MODULE_auth_builtin"; then
  		DEST=$MODULE_auth_builtin
-@@ -85629,12 +36671,10 @@
+@@ -85779,12 +36769,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90992,7 +91421,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_builtin"
-@@ -85645,16 +36685,16 @@
+@@ -85795,16 +36783,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
  
  
@@ -91012,7 +91441,7 @@
  $as_echo_n "checking how to build auth_script... " >&6; }
  	if test "$MODULE_auth_script"; then
  		DEST=$MODULE_auth_script
-@@ -85666,12 +36706,10 @@
+@@ -85816,12 +36804,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91027,7 +91456,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_script"
-@@ -85682,16 +36720,16 @@
+@@ -85832,16 +36818,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
  
  
@@ -91047,7 +91476,7 @@
  $as_echo_n "checking how to build auth_netlogond... " >&6; }
  	if test "$MODULE_auth_netlogond"; then
  		DEST=$MODULE_auth_netlogond
-@@ -85703,12 +36741,10 @@
+@@ -85853,12 +36839,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91062,7 +91491,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -85719,11 +36755,11 @@
+@@ -85869,11 +36853,11 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
  
  
@@ -91076,7 +91505,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -85744,7 +36780,7 @@
+@@ -85894,7 +36878,7 @@
  
  
  
@@ -91085,7 +91514,7 @@
  $as_echo_n "checking how to build vfs_default... " >&6; }
  	if test "$MODULE_vfs_default"; then
  		DEST=$MODULE_vfs_default
-@@ -85756,12 +36792,10 @@
+@@ -85906,12 +36890,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91100,7 +91529,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default"
-@@ -85772,16 +36806,16 @@
+@@ -85922,16 +36904,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
  
  
@@ -91120,7 +91549,7 @@
  $as_echo_n "checking how to build vfs_recycle... " >&6; }
  	if test "$MODULE_vfs_recycle"; then
  		DEST=$MODULE_vfs_recycle
-@@ -85793,12 +36827,10 @@
+@@ -85943,12 +36925,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91135,7 +91564,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -85809,16 +36841,16 @@
+@@ -85959,16 +36939,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
  
  
@@ -91155,7 +91584,7 @@
  $as_echo_n "checking how to build vfs_audit... " >&6; }
  	if test "$MODULE_vfs_audit"; then
  		DEST=$MODULE_vfs_audit
-@@ -85830,12 +36862,10 @@
+@@ -85980,12 +36960,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91170,7 +91599,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_audit"
-@@ -85846,16 +36876,16 @@
+@@ -85996,16 +36974,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
  
  
@@ -91190,7 +91619,7 @@
  $as_echo_n "checking how to build vfs_extd_audit... " >&6; }
  	if test "$MODULE_vfs_extd_audit"; then
  		DEST=$MODULE_vfs_extd_audit
-@@ -85867,12 +36897,10 @@
+@@ -86017,12 +36995,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91205,7 +91634,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -85883,16 +36911,16 @@
+@@ -86033,16 +37009,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
  
  
@@ -91225,7 +91654,7 @@
  $as_echo_n "checking how to build vfs_full_audit... " >&6; }
  	if test "$MODULE_vfs_full_audit"; then
  		DEST=$MODULE_vfs_full_audit
-@@ -85904,12 +36932,10 @@
+@@ -86054,12 +37030,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91240,7 +91669,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -85920,16 +36946,16 @@
+@@ -86070,16 +37044,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
  
  
@@ -91260,7 +91689,7 @@
  $as_echo_n "checking how to build vfs_netatalk... " >&6; }
  	if test "$MODULE_vfs_netatalk"; then
  		DEST=$MODULE_vfs_netatalk
-@@ -85941,12 +36967,10 @@
+@@ -86091,12 +37065,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91275,7 +91704,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -85957,16 +36981,16 @@
+@@ -86107,16 +37079,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
  
  
@@ -91295,7 +91724,7 @@
  $as_echo_n "checking how to build vfs_fake_perms... " >&6; }
  	if test "$MODULE_vfs_fake_perms"; then
  		DEST=$MODULE_vfs_fake_perms
-@@ -85978,12 +37002,10 @@
+@@ -86128,12 +37100,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91310,7 +91739,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -85994,16 +37016,16 @@
+@@ -86144,16 +37114,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
  
  
@@ -91330,7 +91759,7 @@
  $as_echo_n "checking how to build vfs_default_quota... " >&6; }
  	if test "$MODULE_vfs_default_quota"; then
  		DEST=$MODULE_vfs_default_quota
-@@ -86015,12 +37037,10 @@
+@@ -86165,12 +37135,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91345,7 +91774,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -86031,16 +37051,16 @@
+@@ -86181,16 +37149,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
  
  
@@ -91365,7 +91794,7 @@
  $as_echo_n "checking how to build vfs_readonly... " >&6; }
  	if test "$MODULE_vfs_readonly"; then
  		DEST=$MODULE_vfs_readonly
-@@ -86052,12 +37072,10 @@
+@@ -86202,12 +37170,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91380,7 +91809,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -86068,16 +37086,16 @@
+@@ -86218,16 +37184,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
  
  
@@ -91400,7 +91829,7 @@
  $as_echo_n "checking how to build vfs_cap... " >&6; }
  	if test "$MODULE_vfs_cap"; then
  		DEST=$MODULE_vfs_cap
-@@ -86089,12 +37107,10 @@
+@@ -86239,12 +37205,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91415,7 +91844,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cap"
-@@ -86105,16 +37121,16 @@
+@@ -86255,16 +37219,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
  
  
@@ -91435,7 +91864,7 @@
  $as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
  	if test "$MODULE_vfs_expand_msdfs"; then
  		DEST=$MODULE_vfs_expand_msdfs
-@@ -86126,12 +37142,10 @@
+@@ -86276,12 +37240,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91450,7 +91879,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -86142,16 +37156,16 @@
+@@ -86292,16 +37254,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
  
  
@@ -91470,7 +91899,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
  	if test "$MODULE_vfs_shadow_copy"; then
  		DEST=$MODULE_vfs_shadow_copy
-@@ -86163,12 +37177,10 @@
+@@ -86313,12 +37275,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91485,7 +91914,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -86179,16 +37191,16 @@
+@@ -86329,16 +37289,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
  
  
@@ -91505,7 +91934,7 @@
  $as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
  	if test "$MODULE_vfs_shadow_copy2"; then
  		DEST=$MODULE_vfs_shadow_copy2
-@@ -86200,12 +37212,10 @@
+@@ -86350,12 +37310,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91520,7 +91949,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -86216,16 +37226,16 @@
+@@ -86366,16 +37324,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
  
  
@@ -91540,7 +91969,7 @@
  $as_echo_n "checking how to build vfs_afsacl... " >&6; }
  	if test "$MODULE_vfs_afsacl"; then
  		DEST=$MODULE_vfs_afsacl
-@@ -86237,12 +37247,10 @@
+@@ -86387,12 +37345,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91555,7 +91984,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -86253,16 +37261,16 @@
+@@ -86403,16 +37359,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
  
  
@@ -91575,7 +92004,7 @@
  $as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
  	if test "$MODULE_vfs_xattr_tdb"; then
  		DEST=$MODULE_vfs_xattr_tdb
-@@ -86274,12 +37282,10 @@
+@@ -86424,12 +37380,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91590,7 +92019,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -86290,16 +37296,16 @@
+@@ -86440,16 +37394,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
  
  
@@ -91610,7 +92039,7 @@
  $as_echo_n "checking how to build vfs_posixacl... " >&6; }
  	if test "$MODULE_vfs_posixacl"; then
  		DEST=$MODULE_vfs_posixacl
-@@ -86311,12 +37317,10 @@
+@@ -86461,12 +37415,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91625,7 +92054,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -86327,16 +37331,16 @@
+@@ -86477,16 +37429,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
  
  
@@ -91645,7 +92074,7 @@
  $as_echo_n "checking how to build vfs_aixacl... " >&6; }
  	if test "$MODULE_vfs_aixacl"; then
  		DEST=$MODULE_vfs_aixacl
-@@ -86348,12 +37352,10 @@
+@@ -86498,12 +37450,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91660,7 +92089,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -86364,16 +37366,16 @@
+@@ -86514,16 +37464,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
  
  
@@ -91680,7 +92109,7 @@
  $as_echo_n "checking how to build vfs_aixacl2... " >&6; }
  	if test "$MODULE_vfs_aixacl2"; then
  		DEST=$MODULE_vfs_aixacl2
-@@ -86385,12 +37387,10 @@
+@@ -86535,12 +37485,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91695,7 +92124,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -86401,16 +37401,16 @@
+@@ -86551,16 +37499,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
  
  
@@ -91715,7 +92144,7 @@
  $as_echo_n "checking how to build vfs_solarisacl... " >&6; }
  	if test "$MODULE_vfs_solarisacl"; then
  		DEST=$MODULE_vfs_solarisacl
-@@ -86422,12 +37422,10 @@
+@@ -86572,12 +37520,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91730,7 +92159,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -86438,16 +37436,16 @@
+@@ -86588,16 +37534,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
  
  
@@ -91750,7 +92179,7 @@
  $as_echo_n "checking how to build vfs_irixacl... " >&6; }
  	if test "$MODULE_vfs_irixacl"; then
  		DEST=$MODULE_vfs_irixacl
-@@ -86459,12 +37457,10 @@
+@@ -86609,12 +37555,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91765,7 +92194,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -86475,16 +37471,16 @@
+@@ -86625,16 +37569,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
  
  
@@ -91785,7 +92214,7 @@
  $as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
  	if test "$MODULE_vfs_hpuxacl"; then
  		DEST=$MODULE_vfs_hpuxacl
-@@ -86496,12 +37492,10 @@
+@@ -86646,12 +37590,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91800,7 +92229,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -86512,16 +37506,16 @@
+@@ -86662,16 +37604,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
  
  
@@ -91820,7 +92249,7 @@
  $as_echo_n "checking how to build vfs_tru64acl... " >&6; }
  	if test "$MODULE_vfs_tru64acl"; then
  		DEST=$MODULE_vfs_tru64acl
-@@ -86533,12 +37527,10 @@
+@@ -86683,12 +37625,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91835,7 +92264,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -86549,16 +37541,16 @@
+@@ -86699,16 +37639,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
  
  
@@ -91855,7 +92284,7 @@
  $as_echo_n "checking how to build vfs_catia... " >&6; }
  	if test "$MODULE_vfs_catia"; then
  		DEST=$MODULE_vfs_catia
-@@ -86570,12 +37562,10 @@
+@@ -86720,12 +37660,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91870,7 +92299,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_catia"
-@@ -86586,16 +37576,16 @@
+@@ -86736,16 +37674,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
  
  
@@ -91890,7 +92319,7 @@
  $as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
  	if test "$MODULE_vfs_streams_xattr"; then
  		DEST=$MODULE_vfs_streams_xattr
-@@ -86607,12 +37597,10 @@
+@@ -86757,12 +37695,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91905,7 +92334,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -86623,16 +37611,16 @@
+@@ -86773,16 +37709,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
  
  
@@ -91925,7 +92354,7 @@
  $as_echo_n "checking how to build vfs_streams_depot... " >&6; }
  	if test "$MODULE_vfs_streams_depot"; then
  		DEST=$MODULE_vfs_streams_depot
-@@ -86644,12 +37632,10 @@
+@@ -86794,12 +37730,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91940,7 +92369,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -86660,16 +37646,16 @@
+@@ -86810,16 +37744,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
  
  
@@ -91960,7 +92389,7 @@
  $as_echo_n "checking how to build vfs_cacheprime... " >&6; }
  	if test "$MODULE_vfs_cacheprime"; then
  		DEST=$MODULE_vfs_cacheprime
-@@ -86681,12 +37667,10 @@
+@@ -86831,12 +37765,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -91975,7 +92404,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -86697,16 +37681,16 @@
+@@ -86847,16 +37779,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
  
  
@@ -91995,7 +92424,7 @@
  $as_echo_n "checking how to build vfs_prealloc... " >&6; }
  	if test "$MODULE_vfs_prealloc"; then
  		DEST=$MODULE_vfs_prealloc
-@@ -86718,12 +37702,10 @@
+@@ -86868,12 +37800,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92010,7 +92439,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -86734,16 +37716,16 @@
+@@ -86884,16 +37814,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
  
  
@@ -92030,7 +92459,7 @@
  $as_echo_n "checking how to build vfs_commit... " >&6; }
  	if test "$MODULE_vfs_commit"; then
  		DEST=$MODULE_vfs_commit
-@@ -86755,12 +37737,10 @@
+@@ -86905,12 +37835,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92045,7 +92474,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_commit"
-@@ -86771,16 +37751,16 @@
+@@ -86921,16 +37849,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
  
  
@@ -92065,7 +92494,7 @@
  $as_echo_n "checking how to build vfs_gpfs... " >&6; }
  	if test "$MODULE_vfs_gpfs"; then
  		DEST=$MODULE_vfs_gpfs
-@@ -86792,12 +37772,10 @@
+@@ -86942,12 +37870,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92080,7 +92509,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -86808,16 +37786,16 @@
+@@ -86958,16 +37884,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
  
  
@@ -92100,7 +92529,7 @@
  $as_echo_n "checking how to build vfs_readahead... " >&6; }
  	if test "$MODULE_vfs_readahead"; then
  		DEST=$MODULE_vfs_readahead
-@@ -86829,12 +37807,10 @@
+@@ -86979,12 +37905,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92115,7 +92544,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -86845,16 +37821,16 @@
+@@ -86995,16 +37919,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
  
  
@@ -92135,7 +92564,7 @@
  $as_echo_n "checking how to build vfs_tsmsm... " >&6; }
  	if test "$MODULE_vfs_tsmsm"; then
  		DEST=$MODULE_vfs_tsmsm
-@@ -86866,12 +37842,10 @@
+@@ -87016,12 +37940,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92150,7 +92579,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -86882,16 +37856,16 @@
+@@ -87032,16 +37954,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
  
  
@@ -92170,7 +92599,7 @@
  $as_echo_n "checking how to build vfs_fileid... " >&6; }
  	if test "$MODULE_vfs_fileid"; then
  		DEST=$MODULE_vfs_fileid
-@@ -86903,12 +37877,10 @@
+@@ -87053,12 +37975,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92185,7 +92614,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -86919,16 +37891,16 @@
+@@ -87069,16 +37989,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
  
  
@@ -92205,7 +92634,7 @@
  $as_echo_n "checking how to build vfs_aio_fork... " >&6; }
  	if test "$MODULE_vfs_aio_fork"; then
  		DEST=$MODULE_vfs_aio_fork
-@@ -86940,12 +37912,10 @@
+@@ -87090,12 +38010,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92220,7 +92649,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -86956,16 +37926,16 @@
+@@ -87106,16 +38024,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
  
  
@@ -92240,7 +92669,7 @@
  $as_echo_n "checking how to build vfs_preopen... " >&6; }
  	if test "$MODULE_vfs_preopen"; then
  		DEST=$MODULE_vfs_preopen
-@@ -86977,12 +37947,10 @@
+@@ -87127,12 +38045,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92255,7 +92684,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -86993,16 +37961,16 @@
+@@ -87143,16 +38059,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
  
  
@@ -92275,7 +92704,7 @@
  $as_echo_n "checking how to build vfs_syncops... " >&6; }
  	if test "$MODULE_vfs_syncops"; then
  		DEST=$MODULE_vfs_syncops
-@@ -87014,12 +37982,10 @@
+@@ -87164,12 +38080,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92290,7 +92719,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -87030,16 +37996,16 @@
+@@ -87180,16 +38094,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
  
  
@@ -92310,7 +92739,7 @@
  $as_echo_n "checking how to build vfs_zfsacl... " >&6; }
  	if test "$MODULE_vfs_zfsacl"; then
  		DEST=$MODULE_vfs_zfsacl
-@@ -87051,12 +38017,10 @@
+@@ -87201,12 +38115,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92325,7 +92754,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -87067,16 +38031,16 @@
+@@ -87217,16 +38129,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
  
  
@@ -92345,7 +92774,7 @@
  $as_echo_n "checking how to build vfs_notify_fam... " >&6; }
  	if test "$MODULE_vfs_notify_fam"; then
  		DEST=$MODULE_vfs_notify_fam
-@@ -87088,12 +38052,10 @@
+@@ -87238,12 +38150,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92360,7 +92789,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -87104,16 +38066,16 @@
+@@ -87254,16 +38164,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
  
  
@@ -92380,7 +92809,7 @@
  $as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
  	if test "$MODULE_vfs_acl_xattr"; then
  		DEST=$MODULE_vfs_acl_xattr
-@@ -87125,12 +38087,10 @@
+@@ -87275,12 +38185,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92395,7 +92824,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -87141,16 +38101,16 @@
+@@ -87291,16 +38199,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
  
  
@@ -92415,7 +92844,7 @@
  $as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
  	if test "$MODULE_vfs_acl_tdb"; then
  		DEST=$MODULE_vfs_acl_tdb
-@@ -87162,12 +38122,10 @@
+@@ -87312,12 +38220,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92430,7 +92859,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -87178,16 +38136,16 @@
+@@ -87328,16 +38234,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
  
  
@@ -92450,7 +92879,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
-@@ -87199,12 +38157,10 @@
+@@ -87349,12 +38255,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92465,7 +92894,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -87215,16 +38171,16 @@
+@@ -87365,16 +38269,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
  
  
@@ -92485,7 +92914,7 @@
  $as_echo_n "checking how to build vfs_onefs... " >&6; }
  	if test "$MODULE_vfs_onefs"; then
  		DEST=$MODULE_vfs_onefs
-@@ -87236,12 +38192,10 @@
+@@ -87386,12 +38290,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92500,7 +92929,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -87252,16 +38206,16 @@
+@@ -87402,16 +38304,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
  
  
@@ -92520,7 +92949,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
-@@ -87273,12 +38227,10 @@
+@@ -87423,12 +38325,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92535,7 +92964,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -87289,16 +38241,16 @@
+@@ -87439,16 +38339,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
  
  
@@ -92555,7 +92984,7 @@
  $as_echo_n "checking how to build vfs_dirsort... " >&6; }
  	if test "$MODULE_vfs_dirsort"; then
  		DEST=$MODULE_vfs_dirsort
-@@ -87310,12 +38262,10 @@
+@@ -87460,12 +38360,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92570,7 +92999,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -87326,16 +38276,16 @@
+@@ -87476,16 +38374,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
  
  
@@ -92590,7 +93019,7 @@
  $as_echo_n "checking how to build vfs_scannedonly... " >&6; }
  	if test "$MODULE_vfs_scannedonly"; then
  		DEST=$MODULE_vfs_scannedonly
-@@ -87347,12 +38297,10 @@
+@@ -87497,12 +38395,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92605,7 +93034,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_scannedonly"
-@@ -87363,11 +38311,11 @@
+@@ -87513,11 +38409,11 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
  
  
@@ -92619,7 +93048,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87389,7 +38337,7 @@
+@@ -87539,7 +38435,7 @@
  
  
  
@@ -92628,7 +93057,7 @@
  $as_echo_n "checking how to build perfcount_onefs... " >&6; }
  	if test "$MODULE_perfcount_onefs"; then
  		DEST=$MODULE_perfcount_onefs
-@@ -87401,12 +38349,10 @@
+@@ -87551,12 +38447,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92643,7 +93072,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -87417,16 +38363,16 @@
+@@ -87567,16 +38461,16 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
  
  
@@ -92663,7 +93092,7 @@
  $as_echo_n "checking how to build perfcount_test... " >&6; }
  	if test "$MODULE_perfcount_test"; then
  		DEST=$MODULE_perfcount_test
-@@ -87438,12 +38384,10 @@
+@@ -87588,12 +38482,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92678,7 +93107,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_test"
-@@ -87454,11 +38398,11 @@
+@@ -87604,11 +38496,11 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
  
  
@@ -92692,7 +93121,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87479,7 +38423,7 @@
+@@ -87629,7 +38521,7 @@
  
  
  
@@ -92701,7 +93130,7 @@
  $as_echo_n "checking how to build gpext_registry... " >&6; }
  	if test "$MODULE_gpext_registry"; then
  		DEST=$MODULE_gpext_registry
-@@ -87491,12 +38435,10 @@
+@@ -87641,12 +38533,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92716,7 +93145,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_registry"
-@@ -87507,16 +38449,16 @@
+@@ -87657,16 +38547,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
  
  
@@ -92736,7 +93165,7 @@
  $as_echo_n "checking how to build gpext_scripts... " >&6; }
  	if test "$MODULE_gpext_scripts"; then
  		DEST=$MODULE_gpext_scripts
-@@ -87528,12 +38470,10 @@
+@@ -87678,12 +38568,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92751,7 +93180,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -87544,16 +38484,16 @@
+@@ -87694,16 +38582,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
  
  
@@ -92771,7 +93200,7 @@
  $as_echo_n "checking how to build gpext_security... " >&6; }
  	if test "$MODULE_gpext_security"; then
  		DEST=$MODULE_gpext_security
-@@ -87565,12 +38505,10 @@
+@@ -87715,12 +38603,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -92786,7 +93215,7 @@
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_security"
-@@ -87581,11 +38519,11 @@
+@@ -87731,11 +38617,11 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
  
  
@@ -92800,7 +93229,7 @@
  $as_echo "not" >&6; }
  	fi
  
-@@ -87621,18 +38559,16 @@
+@@ -87771,18 +38657,16 @@
  #################################################
  # If run from the build farm, enable NASTY hacks
  #################################################
@@ -92823,7 +93252,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87649,11 +38585,11 @@
+@@ -87799,11 +38683,11 @@
      rt_signal_lease_works=yes
      rt_signal_aio_works=yes
  
@@ -92838,7 +93267,7 @@
  $as_echo "cross" >&6; }
  
  	    # cross compiling, I hope you know what you are doing
-@@ -87661,11 +38597,7 @@
+@@ -87811,11 +38695,7 @@
  
  
  else
@@ -92851,7 +93280,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -87724,41 +38656,16 @@
+@@ -87874,41 +38754,16 @@
  }
  
  _ACEOF
@@ -92897,7 +93326,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -87769,61 +38676,31 @@
+@@ -87919,61 +38774,31 @@
    return 0;
  }
  _ACEOF
@@ -92966,7 +93395,7 @@
  $as_echo "no" >&6; }
  	    case "$ac_status" in
  		1|11|101|111)  rt_signal_lease_ok=no ;;
-@@ -87837,13 +38714,9 @@
+@@ -87987,13 +38812,9 @@
  
  	    # no RT_SIGNAL bug, we are golden
  
@@ -92982,7 +93411,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -87854,65 +38727,39 @@
+@@ -88004,65 +38825,39 @@
    return 0;
  }
  _ACEOF
@@ -93057,7 +93486,7 @@
    enableval=$enable_merged_build;  enable_merged_build=$enableval
  else
     enable_merged_build=auto
-@@ -87921,9 +38768,7 @@
+@@ -88071,9 +38866,7 @@
  
  if test x"$enable_merged_build" = x"yes" -a \
  	x"$merged_build_possible" = x"no" ; then
@@ -93068,7 +93497,7 @@
  fi
  
  
-@@ -87946,9 +38791,9 @@
+@@ -88096,9 +38889,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
@@ -93080,7 +93509,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -87961,14 +38806,14 @@
+@@ -88111,14 +38904,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93098,7 +93527,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -87976,10 +38821,10 @@
+@@ -88126,10 +38919,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93111,7 +93540,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -87990,9 +38835,9 @@
+@@ -88140,9 +38933,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
@@ -93123,7 +93552,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -88005,14 +38850,14 @@
+@@ -88155,14 +38948,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93141,7 +93570,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88020,10 +38865,10 @@
+@@ -88170,10 +38963,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93154,7 +93583,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88031,7 +38876,7 @@
+@@ -88181,7 +38974,7 @@
  	fi
  	if test -z "$PYTHON"; then
  		working_python=no
@@ -93163,7 +93592,7 @@
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -88042,9 +38887,9 @@
+@@ -88192,9 +38985,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
@@ -93175,7 +93604,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88057,14 +38902,14 @@
+@@ -88207,14 +39000,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93193,7 +93622,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88072,10 +38917,10 @@
+@@ -88222,10 +39015,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93206,7 +93635,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88086,9 +38931,9 @@
+@@ -88236,9 +39029,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
@@ -93218,7 +93647,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88101,14 +38946,14 @@
+@@ -88251,14 +39044,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93236,7 +93665,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88116,10 +38961,10 @@
+@@ -88266,10 +39059,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93249,7 +93678,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88127,7 +38972,7 @@
+@@ -88277,7 +39070,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -93258,7 +93687,7 @@
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -88137,11 +38982,7 @@
+@@ -88287,11 +39080,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93271,7 +93700,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88158,42 +38999,15 @@
+@@ -88308,42 +39097,15 @@
    return 0;
  }
  _ACEOF
@@ -93317,7 +93746,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88205,11 +39019,7 @@
+@@ -88355,11 +39117,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93330,7 +93759,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88226,42 +39036,15 @@
+@@ -88376,42 +39134,15 @@
    return 0;
  }
  _ACEOF
@@ -93376,7 +93805,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88276,11 +39059,7 @@
+@@ -88426,11 +39157,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93389,7 +93818,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88297,42 +39076,15 @@
+@@ -88447,42 +39174,15 @@
    return 0;
  }
  _ACEOF
@@ -93435,7 +93864,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88344,11 +39096,7 @@
+@@ -88494,11 +39194,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93448,7 +93877,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88365,42 +39113,15 @@
+@@ -88515,42 +39211,15 @@
    return 0;
  }
  _ACEOF
@@ -93494,7 +93923,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88430,11 +39151,7 @@
+@@ -88580,11 +39249,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -93507,7 +93936,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88451,64 +39168,37 @@
+@@ -88601,64 +39266,37 @@
    return 0;
  }
  _ACEOF
@@ -93580,7 +94009,7 @@
  $as_echo "$merged_build_possible" >&6; }
  
  	# Enable merged build automatically if possible, when in developer mode
-@@ -88564,9 +39254,9 @@
+@@ -88714,9 +39352,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
@@ -93592,7 +94021,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -88579,14 +39269,14 @@
+@@ -88729,14 +39367,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93610,7 +94039,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88594,10 +39284,10 @@
+@@ -88744,10 +39382,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93623,7 +94052,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88608,9 +39298,9 @@
+@@ -88758,9 +39396,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
@@ -93635,7 +94064,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -88623,14 +39313,14 @@
+@@ -88773,14 +39411,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93653,7 +94082,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88638,10 +39328,10 @@
+@@ -88788,10 +39426,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -93666,7 +94095,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88649,7 +39339,7 @@
+@@ -88799,7 +39437,7 @@
  	fi
  	if test -z "$PYTHON"; then
  		working_python=no
@@ -93675,7 +94104,7 @@
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -88660,9 +39350,9 @@
+@@ -88810,9 +39448,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
@@ -93687,7 +94116,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88675,14 +39365,14 @@
+@@ -88825,14 +39463,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93705,7 +94134,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88690,10 +39380,10 @@
+@@ -88840,10 +39478,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93718,7 +94147,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88704,9 +39394,9 @@
+@@ -88854,9 +39492,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
@@ -93730,7 +94159,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -88719,14 +39409,14 @@
+@@ -88869,14 +39507,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -93748,7 +94177,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -88734,10 +39424,10 @@
+@@ -88884,10 +39522,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -93761,7 +94190,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -88745,7 +39435,7 @@
+@@ -88895,7 +39533,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -93770,7 +94199,7 @@
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -88755,11 +39445,7 @@
+@@ -88905,11 +39543,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93783,7 +94212,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88776,42 +39462,15 @@
+@@ -88926,42 +39560,15 @@
    return 0;
  }
  _ACEOF
@@ -93829,7 +94258,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88823,11 +39482,7 @@
+@@ -88973,11 +39580,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93842,7 +94271,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88844,42 +39499,15 @@
+@@ -88994,42 +39597,15 @@
    return 0;
  }
  _ACEOF
@@ -93888,7 +94317,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88894,11 +39522,7 @@
+@@ -89044,11 +39620,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -93901,7 +94330,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88915,42 +39539,15 @@
+@@ -89065,42 +39637,15 @@
    return 0;
  }
  _ACEOF
@@ -93947,7 +94376,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -88962,11 +39559,7 @@
+@@ -89112,11 +39657,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -93960,7 +94389,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -88983,42 +39576,15 @@
+@@ -89133,42 +39674,15 @@
    return 0;
  }
  _ACEOF
@@ -94006,7 +94435,7 @@
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -89048,11 +39614,7 @@
+@@ -89198,11 +39712,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -94019,7 +94448,7 @@
  /* end confdefs.h.  */
  
                                  #undef HAVE_UINTPTR_T
-@@ -89069,52 +39631,25 @@
+@@ -89219,52 +39729,25 @@
    return 0;
  }
  _ACEOF
@@ -94077,7 +94506,7 @@
  $as_echo "yes" >&6; }
  
  
-@@ -89142,20 +39677,18 @@
+@@ -89292,20 +39775,18 @@
  
  
  	else
@@ -94102,7 +94531,7 @@
  $as_echo "$pythondir" >&6; }
  
  
-@@ -89170,553 +39703,133 @@
+@@ -89320,553 +39801,133 @@
  
  
  
@@ -94743,7 +95172,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89734,63 +39847,32 @@
+@@ -89884,63 +39945,32 @@
    return 0;
  }
  _ACEOF
@@ -94818,7 +95247,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -89808,43 +39890,18 @@
+@@ -89958,43 +39988,18 @@
    return 0;
  }
  _ACEOF
@@ -94868,7 +95297,7 @@
    TERMLIBS="-lreadline $TERMLIBS"
         EXTERNAL_READLINE=yes
         break
-@@ -89858,11 +39915,11 @@
+@@ -90008,11 +40013,11 @@
  
      ;;
    no)
@@ -94882,7 +95311,7 @@
  $as_echo "yes" >&6; }
  
      # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -89874,151 +39931,12 @@
+@@ -90024,151 +40029,12 @@
      LDFLAGS="-L$with_readline/lib $LDFLAGS"
      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  
@@ -95040,7 +95469,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -90027,151 +39945,12 @@
+@@ -90177,151 +40043,12 @@
  
  done
  
@@ -95197,7 +95626,7 @@
  _ACEOF
  
  fi
-@@ -90179,168 +39958,26 @@
+@@ -90329,168 +40056,26 @@
  done
  
  
@@ -95375,7 +95804,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -90358,63 +39995,32 @@
+@@ -90508,63 +40093,32 @@
    return 0;
  }
  _ACEOF
@@ -95450,7 +95879,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -90432,43 +40038,18 @@
+@@ -90582,43 +40136,18 @@
    return 0;
  }
  _ACEOF
@@ -95500,7 +95929,7 @@
    TERMLDFLAGS="-L$with_readline/lib"
         TERMCPPFLAGS="-I$with_readline/include"
         LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -90488,7 +40069,7 @@
+@@ -90638,7 +40167,7 @@
      ;;
    esac
  else
@@ -95509,7 +95938,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -90497,18 +40078,14 @@
+@@ -90647,18 +40176,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.
@@ -95531,7 +95960,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -90521,142 +40098,53 @@
+@@ -90671,142 +40196,53 @@
  int
  main ()
  {
@@ -95705,7 +96134,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -90674,60 +40162,31 @@
+@@ -90824,60 +40260,31 @@
    return 0;
  }
  _ACEOF
@@ -95776,7 +96205,7 @@
  
  
  MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -90782,7 +40241,7 @@
+@@ -90932,7 +40339,7 @@
  ###################################
  "
  
@@ -95785,7 +96214,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -90791,102 +40250,9 @@
+@@ -90941,102 +40348,9 @@
  
  
  
@@ -95890,7 +96319,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -90895,102 +40261,9 @@
+@@ -91045,102 +40359,9 @@
  
  fi
  
@@ -95995,7 +96424,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -91000,151 +40273,12 @@
+@@ -91150,151 +40371,12 @@
  fi
  
  
@@ -96151,7 +96580,7 @@
  _ACEOF
  
  else
-@@ -91154,151 +40288,12 @@
+@@ -91304,151 +40386,12 @@
  done
  
  
@@ -96307,7 +96736,7 @@
  _ACEOF
  
  else
-@@ -91308,29 +40303,6 @@
+@@ -91458,29 +40401,6 @@
  done
  
  
@@ -96337,7 +96766,7 @@
  for ac_header in 				\
  	crypt.h					\
  	curses.h				\
-@@ -91356,147 +40328,11 @@
+@@ -91506,147 +40426,11 @@
  	netinet6/in6.h				\
  	libintl.h
  
@@ -96490,7 +96919,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -91506,42 +40342,6 @@
+@@ -91656,42 +40440,6 @@
  done
  
  
@@ -96533,7 +96962,7 @@
  for ac_func in 				\
  	atexit					\
  	cgetent					\
-@@ -91574,271 +40374,65 @@
+@@ -91724,271 +40472,65 @@
  	warn					\
  	errx					\
  	warnx					\
@@ -96842,7 +97271,7 @@
  _ACEOF
  
  fi
-@@ -91854,11 +40448,11 @@
+@@ -92004,11 +40546,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -96856,7 +97285,7 @@
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -91868,17 +40462,13 @@
+@@ -92018,17 +40560,13 @@
  
  
  
@@ -96877,7 +97306,7 @@
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_BSWAP_H
  #include <sys/bswap.h>
-@@ -91891,140 +40481,25 @@
+@@ -92041,140 +40579,25 @@
    return 0;
  }
  _ACEOF
@@ -97027,7 +97456,7 @@
  _ACEOF
  
  fi
-@@ -92040,11 +40515,11 @@
+@@ -92190,11 +40613,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -97041,7 +97470,7 @@
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -92055,25 +40530,21 @@
+@@ -92205,25 +40628,21 @@
  
  
  
@@ -97071,7 +97500,7 @@
    ac_cv_struct_winsize=yes; break
  fi
  rm -f conftest*
-@@ -92083,63 +40554,45 @@
+@@ -92233,63 +40652,45 @@
  
  if test "$ac_cv_struct_winsize" = "yes"; then
  
@@ -97146,7 +97575,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
-@@ -92152,35 +40605,14 @@
+@@ -92302,35 +40703,14 @@
    return 0;
  }
  _ACEOF
@@ -97185,7 +97614,7 @@
  $as_echo "$ac_cv_type_signal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -92190,9 +40622,7 @@
+@@ -92340,9 +40720,7 @@
  
  if test "$ac_cv_type_signal" = "void" ; then
  
@@ -97196,7 +97625,7 @@
  
  fi
  
-@@ -92223,18 +40653,14 @@
+@@ -92373,18 +40751,14 @@
  
  
  
@@ -97218,7 +97647,7 @@
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
-@@ -92251,44 +40677,15 @@
+@@ -92401,44 +40775,15 @@
    return 0;
  }
  _ACEOF
@@ -97268,7 +97697,7 @@
  /* end confdefs.h.  */
  extern int h_errno;
  int foo(void) { return h_errno; }
-@@ -92300,44 +40697,19 @@
+@@ -92450,44 +40795,19 @@
    return 0;
  }
  _ACEOF
@@ -97318,7 +97747,7 @@
  $as_echo "$ac_foo" >&6; }
  if test "$ac_foo" = yes; then
  
-@@ -92345,81 +40717,23 @@
+@@ -92495,81 +40815,23 @@
  #define HAVE_H_ERRNO 1
  _ACEOF
  
@@ -97406,7 +97835,7 @@
  fi
  
  
-@@ -92435,151 +40749,12 @@
+@@ -92585,151 +40847,12 @@
  
  
  
@@ -97563,7 +97992,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -92591,23 +40766,17 @@
+@@ -92741,23 +40864,17 @@
  
  
  
@@ -97590,7 +98019,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -92625,54 +40794,28 @@
+@@ -92775,54 +40892,28 @@
    return 0;
  }
  _ACEOF
@@ -97652,7 +98081,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBUTIL 1
  _ACEOF
-@@ -92689,7 +40832,6 @@
+@@ -92839,7 +40930,6 @@
  fi
  
  
@@ -97660,7 +98089,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  OPENPTY_ENABLE = YES
  "
-@@ -92709,23 +40851,17 @@
+@@ -92859,23 +40949,17 @@
  
  
  
@@ -97687,7 +98116,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -92743,54 +40879,28 @@
+@@ -92893,54 +40977,28 @@
    return 0;
  }
  _ACEOF
@@ -97749,7 +98178,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBINTL 1
  _ACEOF
-@@ -92807,7 +40917,6 @@
+@@ -92957,7 +41015,6 @@
  fi
  
  
@@ -97757,7 +98186,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  INTL_ENABLE = YES
  "
-@@ -92831,150 +40940,12 @@
+@@ -92981,150 +41038,12 @@
  
  
  
@@ -97913,7 +98342,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -92984,22 +40955,9 @@
+@@ -93134,22 +41053,9 @@
  done
  
  
@@ -97938,7 +98367,7 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -93010,46 +40968,10 @@
+@@ -93160,46 +41066,10 @@
  #include <arpa/nameser.h>
  #endif
  
@@ -97988,7 +98417,7 @@
  _ACEOF
  
  fi
-@@ -93061,9 +40983,9 @@
+@@ -93211,9 +41081,9 @@
  
  
  
@@ -98000,7 +98429,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93078,11 +41000,7 @@
+@@ -93228,11 +41098,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98013,7 +98442,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -93104,148 +41022,31 @@
+@@ -93254,148 +41120,31 @@
  {
  res_search(0,0,0,0,0)
    ;
@@ -98183,7 +98612,7 @@
  _ACEOF
  
  fi
-@@ -93265,13 +41066,13 @@
+@@ -93415,13 +41164,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98199,7 +98628,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93285,7 +41086,7 @@
+@@ -93435,7 +41184,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98208,7 +98637,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93300,9 +41101,9 @@
+@@ -93450,9 +41199,9 @@
  
  
  
@@ -98220,7 +98649,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93317,11 +41118,7 @@
+@@ -93467,11 +41216,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98233,7 +98662,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -93346,38 +41143,11 @@
+@@ -93496,38 +41241,11 @@
    return 0;
  }
  _ACEOF
@@ -98275,7 +98704,7 @@
  	done
  	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93389,102 +41159,12 @@
+@@ -93539,102 +41257,12 @@
  eval "ac_res=\$ac_cv_funclib_res_nsearch"
  
  if false; then
@@ -98383,7 +98812,7 @@
  _ACEOF
  
  fi
-@@ -93504,13 +41184,13 @@
+@@ -93654,13 +41282,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98399,7 +98828,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93524,7 +41204,7 @@
+@@ -93674,7 +41302,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98408,7 +98837,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93539,9 +41219,9 @@
+@@ -93689,9 +41317,9 @@
  
  
  
@@ -98420,7 +98849,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93556,11 +41236,7 @@
+@@ -93706,11 +41334,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98433,7 +98862,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -93585,38 +41261,11 @@
+@@ -93735,38 +41359,11 @@
    return 0;
  }
  _ACEOF
@@ -98475,7 +98904,7 @@
  	done
  	eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93628,102 +41277,12 @@
+@@ -93778,102 +41375,12 @@
  eval "ac_res=\$ac_cv_funclib_res_ndestroy"
  
  if false; then
@@ -98583,7 +99012,7 @@
  _ACEOF
  
  fi
-@@ -93743,13 +41302,13 @@
+@@ -93893,13 +41400,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98599,7 +99028,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93763,7 +41322,7 @@
+@@ -93913,7 +41420,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98608,7 +99037,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -93777,9 +41336,9 @@
+@@ -93927,9 +41434,9 @@
  
  
  
@@ -98620,7 +99049,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -93794,11 +41353,7 @@
+@@ -93944,11 +41451,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98633,7 +99062,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_DNS_H
-@@ -93813,38 +41368,11 @@
+@@ -93963,38 +41466,11 @@
    return 0;
  }
  _ACEOF
@@ -98675,7 +99104,7 @@
  	done
  	eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
  	LIBS="$ac_save_LIBS"
-@@ -93856,102 +41384,12 @@
+@@ -94006,102 +41482,12 @@
  eval "ac_res=\$ac_cv_funclib_dns_search"
  
  if false; then
@@ -98783,7 +99212,7 @@
  _ACEOF
  
  fi
-@@ -93971,13 +41409,13 @@
+@@ -94121,13 +41507,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98799,7 +99228,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -93991,7 +41429,7 @@
+@@ -94141,7 +41527,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -98808,7 +99237,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -94003,9 +41441,9 @@
+@@ -94153,9 +41539,9 @@
  
  
  
@@ -98820,7 +99249,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -94020,11 +41458,7 @@
+@@ -94170,11 +41556,7 @@
  		*) ac_lib="-l$ac_lib" ;;
  		esac
  		LIBS=" $ac_lib  $ac_save_LIBS"
@@ -98833,7 +99262,7 @@
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -94049,38 +41483,11 @@
+@@ -94199,38 +41581,11 @@
    return 0;
  }
  _ACEOF
@@ -98875,7 +99304,7 @@
  	done
  	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
  	LIBS="$ac_save_LIBS"
-@@ -94092,102 +41499,12 @@
+@@ -94242,102 +41597,12 @@
  eval "ac_res=\$ac_cv_funclib_dn_expand"
  
  if false; then
@@ -98983,7 +99412,7 @@
  _ACEOF
  
  fi
-@@ -94207,13 +41524,13 @@
+@@ -94357,13 +41622,13 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -98999,7 +99428,7 @@
  $as_echo "no" >&6; }
  	;;
  	*)
-@@ -94227,7 +41544,7 @@
+@@ -94377,7 +41642,7 @@
  #define $ac_tr_lib 1
  _ACEOF
  
@@ -99008,7 +99437,7 @@
  $as_echo "yes, in $ac_res" >&6; }
  	;;
  esac
-@@ -94239,18 +41556,14 @@
+@@ -94389,18 +41654,14 @@
  
  
  
@@ -99030,7 +99459,7 @@
  /* end confdefs.h.  */
  #include <stdio.h>
  #ifdef HAVE_SYS_TYPES_H
-@@ -94274,44 +41587,15 @@
+@@ -94424,44 +41685,15 @@
    return 0;
  }
  _ACEOF
@@ -99080,7 +99509,7 @@
  /* end confdefs.h.  */
  extern int _res;
  int foo(void) { return _res; }
-@@ -94323,44 +41607,19 @@
+@@ -94473,44 +41705,19 @@
    return 0;
  }
  _ACEOF
@@ -99130,7 +99559,7 @@
  $as_echo "$ac_foo" >&6; }
  if test "$ac_foo" = yes; then
  
-@@ -94368,18 +41627,7 @@
+@@ -94518,18 +41725,7 @@
  #define HAVE__RES 1
  _ACEOF
  
@@ -99150,7 +99579,7 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -94392,64 +41640,17 @@
+@@ -94542,64 +41738,17 @@
  #ifdef HAVE_RESOLV_H
  #include <resolv.h>
  #endif
@@ -99220,7 +99649,7 @@
  fi
  
  
-@@ -94515,9 +41716,9 @@
+@@ -94665,9 +41814,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
@@ -99232,7 +99661,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LEX"; then
-@@ -94528,24 +41729,24 @@
+@@ -94678,24 +41827,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -99262,7 +99691,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -94574,20 +41775,20 @@
+@@ -94724,20 +41873,20 @@
    return ! yylex () + ! yywrap ();
  }
  _ACEOF
@@ -99290,7 +99719,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -94596,19 +41797,17 @@
+@@ -94746,19 +41895,17 @@
  elif test -f lexyy.c; then
    ac_cv_prog_lex_root=lexyy
  else
@@ -99314,7 +99743,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -94616,55 +41815,29 @@
+@@ -94766,55 +41913,29 @@
      ac_cv_lib_lex='none needed'
      for ac_lib in '' -lfl -ll; do
        LIBS="$ac_lib $ac_save_LIBS"
@@ -99378,7 +99807,7 @@
    $as_echo_n "(cached) " >&6
  else
    # POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -94673,52 +41846,24 @@
+@@ -94823,52 +41944,24 @@
  ac_cv_prog_lex_yytext_pointer=no
  ac_save_LIBS=$LIBS
  LIBS="$LEXLIB $ac_save_LIBS"
@@ -99438,7 +99867,7 @@
  
  fi
  rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -94728,9 +41873,9 @@
+@@ -94878,9 +41971,9 @@
  if test x"$LEX_BASENAME" = x"flex"; then
  	# "flex 2.5.33"
  	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -99450,7 +99879,7 @@
  $as_echo "$FLEX_VERSION" >&6; }
  	FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
  	FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -94743,9 +41888,9 @@
+@@ -94893,9 +41986,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
@@ -99462,7 +99891,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$YACC"; then
-@@ -94756,24 +41901,24 @@
+@@ -94906,24 +41999,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -99492,7 +99921,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -94786,9 +41931,9 @@
+@@ -94936,9 +42029,9 @@
  if test x"$YACC_BASENAME" = x"bison -y"; then
  	# bison (GNU Bison) 2.3
  	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -99504,7 +99933,7 @@
  $as_echo "$BISON_VERSION" >&6; }
  	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
  	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -94796,7 +41941,7 @@
+@@ -94946,7 +42039,7 @@
  	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
  fi
  
@@ -99513,7 +99942,7 @@
  $as_echo_n "checking working LEX YACC combination... " >&6; }
  LEX_YACC="no"
  if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-@@ -94812,7 +41957,7 @@
+@@ -94962,7 +42055,7 @@
  	LEX=false
  	YACC=false
  fi
@@ -99522,7 +99951,7 @@
  $as_echo "$LEX_YACC" >&6; }
  
  # Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -94820,21 +41965,15 @@
+@@ -94970,21 +42063,15 @@
  
  # if we ever get to using a host kerberos, we might add conditionals here
  
@@ -99547,7 +99976,7 @@
  
  HAVE_GSSAPI=YES
  
-@@ -94914,193 +42053,48 @@
+@@ -95064,193 +42151,48 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
  
@@ -99769,7 +100198,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -95118,46 +42112,15 @@
+@@ -95268,46 +42210,15 @@
    return 0;
  }
  _ACEOF
@@ -99820,7 +100249,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -95175,65 +42138,32 @@
+@@ -95325,65 +42236,32 @@
    return 0;
  }
  _ACEOF
@@ -99894,7 +100323,7 @@
  /* end confdefs.h.  */
  /* Define backtrace to an innocuous variant, in case <limits.h> declares backtrace.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -95274,43 +42204,18 @@
+@@ -95424,43 +42302,18 @@
    return 0;
  }
  _ACEOF
@@ -99944,7 +100373,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_BACKTRACE 1
  _ACEOF
-@@ -95318,7 +42223,6 @@
+@@ -95468,7 +42321,6 @@
  fi
  
  
@@ -99952,7 +100381,7 @@
  if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -95404,102 +42308,12 @@
+@@ -95554,102 +42406,12 @@
  
  
  
@@ -100060,7 +100489,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -95508,102 +42322,12 @@
+@@ -95658,102 +42420,12 @@
  done
  
  
@@ -100167,7 +100596,7 @@
  _ACEOF
  
  fi
-@@ -95612,153 +42336,14 @@
+@@ -95762,153 +42434,14 @@
  
  #################################################
  # these tests are taken from the GNU fileutils package
@@ -100327,7 +100756,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -95768,65 +42353,16 @@
+@@ -95918,65 +42451,16 @@
  done
  
  
@@ -100398,7 +100827,7 @@
  _ACEOF
  
  fi
-@@ -95839,19 +42375,15 @@
+@@ -95989,19 +42473,15 @@
  # Test for statvfs64.
  if test $space = no; then
    # SVR4
@@ -100422,7 +100851,7 @@
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -95865,51 +42397,22 @@
+@@ -96015,51 +42495,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -100480,7 +100909,7 @@
  
    fi
  fi
-@@ -95922,16 +42425,12 @@
+@@ -96072,16 +42523,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -100500,7 +100929,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -95943,64 +42442,33 @@
+@@ -96093,64 +42540,33 @@
    return 0;
  }
  _ACEOF
@@ -100574,7 +101003,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -96012,59 +42480,32 @@
+@@ -96162,59 +42578,32 @@
    return 0;
  }
  _ACEOF
@@ -100642,7 +101071,7 @@
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -96077,71 +42518,38 @@
+@@ -96227,71 +42616,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -100724,7 +101153,7 @@
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -96160,71 +42568,38 @@
+@@ -96310,71 +42666,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -100806,7 +101235,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -96234,71 +42609,38 @@
+@@ -96384,71 +42707,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -100888,7 +101317,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -96314,71 +42656,38 @@
+@@ -96464,71 +42754,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -100970,7 +101399,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -96398,201 +42707,33 @@
+@@ -96548,201 +42805,33 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -101195,7 +101624,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -96601,19 +42742,15 @@
+@@ -96751,19 +42840,15 @@
  
  done
  
@@ -101218,7 +101647,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96631,46 +42768,15 @@
+@@ -96781,46 +42866,15 @@
    return 0;
  }
  _ACEOF
@@ -101269,7 +101698,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96688,65 +42794,32 @@
+@@ -96838,65 +42892,32 @@
    return 0;
  }
  _ACEOF
@@ -101343,7 +101772,7 @@
  /* end confdefs.h.  */
  /* Define flistxattr to an innocuous variant, in case <limits.h> declares flistxattr.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -96787,50 +42860,24 @@
+@@ -96937,50 +42958,24 @@
    return 0;
  }
  _ACEOF
@@ -101400,7 +101829,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  XATTR_LIBS = ${XATTR_LIBS}
  XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -96840,18 +42887,14 @@
+@@ -96990,18 +42985,14 @@
  
  
  if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -101422,7 +101851,7 @@
  /* end confdefs.h.  */
  
  	 	#include <sys/types.h>
-@@ -96874,48 +42917,23 @@
+@@ -97024,48 +43015,23 @@
    return 0;
  }
  _ACEOF
@@ -101476,7 +101905,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -96927,20 +42945,16 @@
+@@ -97077,20 +43043,16 @@
  fi
  
  
@@ -101501,7 +101930,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/capability.h>
-@@ -96955,117 +42969,55 @@
+@@ -97105,117 +43067,55 @@
  }
  
  _ACEOF
@@ -101635,7 +102064,7 @@
  
  fi
  
-@@ -97073,7 +43025,7 @@
+@@ -97223,7 +43123,7 @@
  INCLUDED_POPT=auto
  
  # Check whether --with-included-popt was given.
@@ -101644,7 +102073,7 @@
    withval=$with_included_popt;  INCLUDED_POPT=$withval
  fi
  
-@@ -97082,169 +43034,26 @@
+@@ -97232,169 +43132,26 @@
  
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -101822,7 +102251,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -97262,43 +43071,18 @@
+@@ -97412,43 +43169,18 @@
    return 0;
  }
  _ACEOF
@@ -101872,7 +102301,7 @@
     POPT_LIBS="-lpopt"
  fi
  
-@@ -97310,9 +43094,9 @@
+@@ -97460,9 +43192,9 @@
  	fi
  fi
  
@@ -101884,7 +102313,7 @@
  $as_echo "$INCLUDED_POPT" >&6; }
  if test x"$INCLUDED_POPT" != x"no"; then
  			poptdir=""
-@@ -97326,156 +43110,16 @@
+@@ -97476,156 +43208,16 @@
  		fi
  	done
          if test x"$poptdir" = "x"; then
@@ -102048,7 +102477,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -97514,12 +43158,10 @@
+@@ -97664,12 +43256,10 @@
  LOOK_DIRS="/usr /usr/local /sw"
  
  # Check whether --with-libiconv was given.
@@ -102063,7 +102492,7 @@
    else
       if test "$withval" != "yes" ; then
  
-@@ -97531,26 +43173,20 @@
+@@ -97681,26 +43271,20 @@
  	LIBS=-liconv
  
  
@@ -102098,7 +102527,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97563,33 +43199,10 @@
+@@ -97713,33 +43297,10 @@
  }
  
  _ACEOF
@@ -102135,7 +102564,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97597,29 +43210,17 @@
+@@ -97747,29 +43308,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102170,7 +102599,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97632,33 +43233,10 @@
+@@ -97782,33 +43331,10 @@
  }
  
  _ACEOF
@@ -102207,7 +102636,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97666,28 +43244,17 @@
+@@ -97816,28 +43342,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102242,7 +102671,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97700,33 +43267,10 @@
+@@ -97850,33 +43365,10 @@
  }
  
  _ACEOF
@@ -102279,7 +102708,7 @@
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97734,31 +43278,22 @@
+@@ -97884,31 +43376,22 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102317,7 +102746,7 @@
  	CPPFLAGS="$save_CPPFLAGS"
  	LDFLAGS="$save_LDFLAGS"
  	LIBS="$save_LIBS"
-@@ -97771,17 +43306,13 @@
+@@ -97921,17 +43404,13 @@
  
  if test x$ICONV_FOUND = xno; then
  
@@ -102339,7 +102768,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97794,49 +43325,20 @@
+@@ -97944,49 +43423,20 @@
  }
  
  _ACEOF
@@ -102395,7 +102824,7 @@
  fi
  
  for i in $LOOK_DIRS ; do
-@@ -97853,24 +43355,20 @@
+@@ -98003,24 +43453,20 @@
  	LIBS=-liconv
  
  
@@ -102427,7 +102856,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -97883,33 +43381,10 @@
+@@ -98033,33 +43479,10 @@
  }
  
  _ACEOF
@@ -102464,7 +102893,7 @@
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97917,27 +43392,17 @@
+@@ -98067,27 +43490,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102496,7 +102925,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -97950,33 +43415,10 @@
+@@ -98100,33 +43513,10 @@
  }
  
  _ACEOF
@@ -102533,7 +102962,7 @@
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97984,26 +43426,17 @@
+@@ -98134,26 +43524,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -102565,7 +102994,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -98015,304 +43448,92 @@
+@@ -98165,304 +43546,92 @@
     return 0;
  }
  
@@ -102937,7 +103366,7 @@
  _ACEOF
  
  fi
-@@ -98391,151 +43612,12 @@
+@@ -98541,151 +43710,12 @@
  
  
  
@@ -103093,7 +103522,7 @@
  _ACEOF
  
  fi
-@@ -98545,23 +43627,17 @@
+@@ -98695,23 +43725,17 @@
  
  
  
@@ -103120,7 +103549,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -98579,54 +43655,28 @@
+@@ -98729,54 +43753,28 @@
    return 0;
  }
  _ACEOF
@@ -103182,7 +103611,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -98642,18 +43692,13 @@
+@@ -98792,18 +43790,13 @@
  
  fi
  
@@ -103204,7 +103633,7 @@
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -98671,40 +43716,19 @@
+@@ -98821,40 +43814,19 @@
    return 0;
  }
  _ACEOF
@@ -103247,7 +103676,7 @@
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -98763,9 +43787,9 @@
+@@ -98913,9 +43885,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
@@ -103259,7 +103688,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -98778,14 +43802,14 @@
+@@ -98928,14 +43900,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -103277,7 +103706,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98794,10 +43818,10 @@
+@@ -98944,10 +43916,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -103290,7 +103719,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -98813,52 +43837,27 @@
+@@ -98963,52 +43935,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103350,7 +103779,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTALLOC_ENABLE = YES
-@@ -98866,22 +43865,16 @@
+@@ -99016,22 +43963,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTALLOC\"} = \"YES\";"
  
@@ -103377,7 +103806,7 @@
  				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'`"
-@@ -98942,7 +43935,7 @@
+@@ -99092,7 +44033,7 @@
  				ac_cv_LIBTALLOC_found=yes
  
  			else
@@ -103386,7 +103815,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.1'
  				ac_cv_LIBTALLOC_found=no
-@@ -98976,9 +43969,9 @@
+@@ -99126,9 +44067,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
@@ -103398,7 +103827,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -98991,14 +43984,14 @@
+@@ -99141,14 +44082,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -103416,7 +103845,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99007,10 +44000,10 @@
+@@ -99157,10 +44098,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -103429,7 +103858,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -99026,52 +44019,27 @@
+@@ -99176,52 +44117,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103489,7 +103918,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTDB_ENABLE = YES
-@@ -99079,22 +44047,16 @@
+@@ -99229,22 +44145,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTDB\"} = \"YES\";"
  
@@ -103516,7 +103945,7 @@
  				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'`"
-@@ -99155,7 +44117,7 @@
+@@ -99305,7 +44215,7 @@
  				ac_cv_LIBTDB_found=yes
  
  			else
@@ -103525,7 +103954,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.2.1'
  				ac_cv_LIBTDB_found=no
-@@ -99180,9 +44142,7 @@
+@@ -99330,9 +44240,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -103536,7 +103965,7 @@
  fi
  TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
  TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -99195,104 +44155,12 @@
+@@ -99345,104 +44253,12 @@
  TDB_CFLAGS="-I$tdbdir/include"
  
  
@@ -103646,7 +104075,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -99300,151 +44168,12 @@
+@@ -99450,151 +44266,12 @@
  fi
  done
  
@@ -103803,7 +104232,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -99455,17 +44184,13 @@
+@@ -99605,17 +44282,13 @@
  
  
  
@@ -103824,7 +104253,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -99476,56 +44201,29 @@
+@@ -99626,56 +44299,29 @@
    return 0;
  }
  _ACEOF
@@ -103888,7 +104317,7 @@
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -99536,41 +44234,18 @@
+@@ -99686,41 +44332,18 @@
    return 0;
  }
  _ACEOF
@@ -103934,7 +104363,7 @@
  
   fi
  
-@@ -99601,9 +44276,9 @@
+@@ -99751,9 +44374,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
@@ -103946,7 +104375,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -99616,14 +44291,14 @@
+@@ -99766,14 +44389,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -103964,7 +104393,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99632,10 +44307,10 @@
+@@ -99782,10 +44405,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -103977,7 +104406,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -99651,52 +44326,27 @@
+@@ -99801,52 +44424,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104037,7 +104466,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTEVENT_ENABLE = YES
-@@ -99704,22 +44354,16 @@
+@@ -99854,22 +44452,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBTEVENT\"} = \"YES\";"
  
@@ -104064,7 +104493,7 @@
  				CFLAGS="$OLD_CFLAGS"
  
  				ac_cv_LIBTEVENT_libs_only_other="`$PKG_CONFIG --libs-only-other 'tevent = 0.9.8'` `$PKG_CONFIG --libs-only-L 'tevent = 0.9.8'`"
-@@ -99780,7 +44424,7 @@
+@@ -99930,7 +44522,7 @@
  				ac_cv_LIBTEVENT_found=yes
  
  			else
@@ -104073,7 +104502,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
  				ac_cv_LIBTEVENT_found=no
-@@ -99801,281 +44445,50 @@
+@@ -99951,281 +44543,50 @@
  
  if test x"$teventdir" = "x"; then
  	teventdir=""
@@ -104386,7 +104815,7 @@
  _ACEOF
  
  fi
-@@ -100084,9 +44497,7 @@
+@@ -100234,9 +44595,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"
  
@@ -104397,7 +104826,7 @@
  
  fi
  
-@@ -100142,9 +44553,9 @@
+@@ -100292,9 +44651,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
@@ -104409,7 +104838,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -100157,14 +44568,14 @@
+@@ -100307,14 +44666,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -104427,7 +104856,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100173,10 +44584,10 @@
+@@ -100323,10 +44682,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -104440,7 +104869,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -100192,52 +44603,27 @@
+@@ -100342,52 +44701,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104500,7 +104929,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBLDB_ENABLE = YES
-@@ -100245,22 +44631,16 @@
+@@ -100395,22 +44729,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"LIBLDB\"} = \"YES\";"
  
@@ -104527,7 +104956,7 @@
  				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'`"
-@@ -100321,7 +44701,7 @@
+@@ -100471,7 +44799,7 @@
  				ac_cv_LIBLDB_found=yes
  
  			else
@@ -104536,7 +104965,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.10'
  				ac_cv_LIBLDB_found=no
-@@ -100367,12 +44747,12 @@
+@@ -100517,12 +44845,12 @@
  
  SQLITE3_LIBS=""
  with_sqlite3_support=no
@@ -104551,7 +104980,7 @@
    withval=$with_sqlite3;  case "$withval" in
      yes|no|auto)
  	with_sqlite3_support=$withval
-@@ -100381,157 +44761,18 @@
+@@ -100531,157 +44859,18 @@
  fi
  
  
@@ -104715,7 +105144,7 @@
  _ACEOF
  
  fi
-@@ -100541,11 +44782,9 @@
+@@ -100691,11 +44880,9 @@
  
    if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
  	if test x"$with_sqlite3_support" = x"yes"; then
@@ -104729,7 +105158,7 @@
  $as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
  	fi
  
-@@ -100560,23 +44799,17 @@
+@@ -100710,23 +44897,17 @@
    # now see if we can find the sqlite3 libs in standard paths
  
  
@@ -104756,7 +105185,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -100594,54 +44827,28 @@
+@@ -100744,54 +44925,28 @@
    return 0;
  }
  _ACEOF
@@ -104818,7 +105247,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSQLITE3 1
  _ACEOF
-@@ -100657,21 +44864,16 @@
+@@ -100807,21 +44962,16 @@
  
  fi
  
@@ -104844,7 +105273,7 @@
  $as_echo "yes" >&6; }
      with_sqlite3_support=yes
  
-@@ -100683,11 +44885,9 @@
+@@ -100833,11 +44983,9 @@
  
    else
      if test x"$with_sqlite3_support" = x"yes"; then
@@ -104858,7 +105287,7 @@
  $as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
      fi
  
-@@ -100757,7 +44957,7 @@
+@@ -100907,7 +45055,7 @@
  
  use_gnutls=auto
  # Check whether --enable-gnutls was given.
@@ -104867,7 +105296,7 @@
    enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
          use_gnutls=no
      fi
-@@ -100771,9 +44971,9 @@
+@@ -100921,9 +45069,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
@@ -104879,7 +105308,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -100786,14 +44986,14 @@
+@@ -100936,14 +45084,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -104897,7 +105326,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100802,10 +45002,10 @@
+@@ -100952,10 +45100,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -104910,7 +105339,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -100821,52 +45021,27 @@
+@@ -100971,52 +45119,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104970,7 +105399,7 @@
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  GNUTLS_ENABLE = YES
-@@ -100874,22 +45049,16 @@
+@@ -101024,22 +45147,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
  \$enabled{\"GNUTLS\"} = \"YES\";"
  
@@ -104997,7 +105426,7 @@
  				CFLAGS="$OLD_CFLAGS"
  
  				ac_cv_GNUTLS_libs_only_other="`$PKG_CONFIG --libs-only-other 'gnutls >= 1.4.0'` `$PKG_CONFIG --libs-only-L 'gnutls >= 1.4.0'`"
-@@ -100950,7 +45119,7 @@
+@@ -101100,7 +45217,7 @@
  				ac_cv_GNUTLS_found=yes
  
  			else
@@ -105006,7 +105435,7 @@
  $as_echo "no" >&6; }
  				$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
  				ac_cv_GNUTLS_found=no
-@@ -100970,151 +45139,12 @@
+@@ -101120,151 +45237,12 @@
  fi
  
  if test x$use_gnutls = xauto; then
@@ -105163,7 +105592,7 @@
  _ACEOF
  
  fi
-@@ -101123,23 +45153,17 @@
+@@ -101273,23 +45251,17 @@
  
  
  
@@ -105190,7 +105619,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101157,580 +45181,116 @@
+@@ -101307,580 +45279,116 @@
    return 0;
  }
  _ACEOF
@@ -105850,7 +106279,7 @@
  _ACEOF
  
  fi
-@@ -101739,23 +45299,17 @@
+@@ -101889,23 +45397,17 @@
  
  
  
@@ -105877,7 +106306,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -101773,54 +45327,28 @@
+@@ -101923,54 +45425,28 @@
    return 0;
  }
  _ACEOF
@@ -105939,7 +106368,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGCRYPT 1
  _ACEOF
-@@ -101836,7 +45364,6 @@
+@@ -101986,7 +45462,6 @@
  
  fi
  
@@ -105947,7 +106376,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  GCRYPT_LIBS = $GCRYPT_LIBS
  GCRYPT_CFLAGS =
-@@ -101853,7 +45380,7 @@
+@@ -102003,7 +45478,7 @@
  
  use_netapi=auto
  # Check whether --enable-netapi was given.
@@ -105956,7 +106385,7 @@
    enableval=$enable_netapi; if test x$enable_netapi = xno; then
          use_netapi=no
      fi
-@@ -101875,151 +45402,12 @@
+@@ -102025,151 +45500,12 @@
  \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
  
  if test x$use_netapi != xno; then
@@ -106113,7 +106542,7 @@
  _ACEOF
  
  fi
-@@ -102028,23 +45416,17 @@
+@@ -102178,23 +45514,17 @@
  
  
  
@@ -106140,7 +106569,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102062,54 +45444,28 @@
+@@ -102212,54 +45542,28 @@
    return 0;
  }
  _ACEOF
@@ -106202,7 +106631,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -102126,24 +45482,17 @@
+@@ -102276,24 +45580,17 @@
  fi
  
  
@@ -106230,7 +106659,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102161,54 +45510,28 @@
+@@ -102311,54 +45608,28 @@
    return 0;
  }
  _ACEOF
@@ -106292,7 +106721,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -102225,24 +45548,17 @@
+@@ -102375,24 +45646,17 @@
  fi
  
  
@@ -106320,7 +106749,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102260,54 +45576,28 @@
+@@ -102410,54 +45674,28 @@
    return 0;
  }
  _ACEOF
@@ -106382,7 +106811,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -102324,24 +45614,17 @@
+@@ -102474,24 +45712,17 @@
  fi
  
  
@@ -106410,7 +106839,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102359,54 +45642,28 @@
+@@ -102509,54 +45740,28 @@
    return 0;
  }
  _ACEOF
@@ -106472,7 +106901,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -102423,24 +45680,17 @@
+@@ -102573,24 +45778,17 @@
  fi
  
  
@@ -106500,7 +106929,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102458,54 +45708,28 @@
+@@ -102608,54 +45806,28 @@
    return 0;
  }
  _ACEOF
@@ -106562,7 +106991,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNETAPI 1
  _ACEOF
-@@ -102520,12 +45744,9 @@
+@@ -102670,12 +45842,9 @@
  
  
  fi
@@ -106576,7 +107005,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102543,9 +45764,7 @@
+@@ -102693,9 +45862,7 @@
  
  	else
  		if test x$use_netapi != xauto; then
@@ -106587,7 +107016,7 @@
  		fi
  	fi
  
-@@ -102586,19 +45805,17 @@
+@@ -102736,19 +45903,17 @@
  
  #################################################
  # check for pthread support
@@ -106611,7 +107040,7 @@
  		fi
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102616,12 +45833,12 @@
+@@ -102766,12 +45931,12 @@
  
  	;;
  	*)
@@ -106626,7 +107055,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -102637,274 +45854,45 @@
+@@ -102787,274 +45952,45 @@
  
  
  
@@ -106914,7 +107343,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -102922,54 +45910,28 @@
+@@ -103072,54 +46008,28 @@
    return 0;
  }
  _ACEOF
@@ -106976,7 +107405,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSETPROCTITLE 1
  _ACEOF
-@@ -102985,15 +45947,14 @@
+@@ -103135,15 +46045,14 @@
  
  fi
  
@@ -106994,7 +107423,7 @@
  $as_echo "yes" >&6; }
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103003,22 +45964,20 @@
+@@ -103153,22 +46062,20 @@
  \$enabled{\"SETPROCTITLE\"} = \"YES\";"
  
  
@@ -107021,7 +107450,7 @@
  $as_echo "no" >&6; }
  
  fi
-@@ -103036,238 +45995,68 @@
+@@ -103186,238 +46093,68 @@
  
  
  
@@ -107290,7 +107719,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103285,46 +46074,15 @@
+@@ -103435,46 +46172,15 @@
    return 0;
  }
  _ACEOF
@@ -107341,7 +107770,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103342,65 +46100,32 @@
+@@ -103492,65 +46198,32 @@
    return 0;
  }
  _ACEOF
@@ -107415,7 +107844,7 @@
  /* end confdefs.h.  */
  /* Define blkid_get_cache to an innocuous variant, in case <limits.h> declares blkid_get_cache.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -103441,50 +46166,24 @@
+@@ -103591,50 +46264,24 @@
    return 0;
  }
  _ACEOF
@@ -107472,7 +107901,7 @@
  MAKE_SETTINGS="$MAKE_SETTINGS
  BLKID_LIBS = ${BLKID_LIBS}
  BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -103495,9 +46194,7 @@
+@@ -103645,9 +46292,7 @@
  
  if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
  
@@ -107483,7 +107912,7 @@
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103525,102 +46222,12 @@
+@@ -103675,102 +46320,12 @@
  
  fi
  
@@ -107590,7 +108019,7 @@
  _ACEOF
  
  fi
-@@ -103630,151 +46237,12 @@
+@@ -103780,151 +46335,12 @@
  ###############################
  # start SMB_EXT_LIB_PAM
  # check for security/pam_appl.h and -lpam
@@ -107746,7 +108175,7 @@
  _ACEOF
  
  fi
-@@ -103783,23 +46251,17 @@
+@@ -103933,23 +46349,17 @@
  
  
  
@@ -107773,7 +108202,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103817,54 +46279,28 @@
+@@ -103967,54 +46377,28 @@
    return 0;
  }
  _ACEOF
@@ -107835,7 +108264,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -103879,7 +46315,6 @@
+@@ -104029,7 +46413,6 @@
  
  
  fi
@@ -107843,7 +108272,7 @@
  if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103905,23 +46340,17 @@
+@@ -104055,23 +46438,17 @@
  # test for where we get crypt() from
  
  
@@ -107870,7 +108299,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -103939,54 +46368,28 @@
+@@ -104089,54 +46466,28 @@
    return 0;
  }
  _ACEOF
@@ -107932,7 +108361,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPT 1
  _ACEOF
-@@ -104002,7 +46405,6 @@
+@@ -104152,7 +46503,6 @@
  
  fi
  
@@ -107940,7 +108369,7 @@
  	MAKE_SETTINGS="$MAKE_SETTINGS
  CRYPT_ENABLE = YES
  "
-@@ -104019,102 +46421,12 @@
+@@ -104169,102 +46519,12 @@
  
  
  
@@ -108048,7 +108477,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -104123,151 +46435,12 @@
+@@ -104273,151 +46533,12 @@
  done
  
  
@@ -108204,7 +108633,7 @@
  _ACEOF
  
  fi
-@@ -104276,23 +46449,17 @@
+@@ -104426,23 +46547,17 @@
  
  
  
@@ -108231,7 +108660,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -104310,54 +46477,28 @@
+@@ -104460,54 +46575,28 @@
    return 0;
  }
  _ACEOF
@@ -108293,7 +108722,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSASL2 1
  _ACEOF
-@@ -104373,7 +46514,6 @@
+@@ -104523,7 +46612,6 @@
  
  fi
  
@@ -108301,7 +108730,7 @@
  if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -104419,312 +46559,88 @@
+@@ -104569,312 +46657,88 @@
              ac_new_flags="$ac_new_flags$s$i";
          else
              ac_new_flags="$ac_new_flags$s$l $i";
@@ -108671,7 +109100,7 @@
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -104735,41 +46651,18 @@
+@@ -104885,41 +46749,18 @@
    return 0;
  }
  _ACEOF
@@ -108717,7 +109146,7 @@
  
   fi
  
-@@ -104813,17 +46706,13 @@
+@@ -104963,17 +46804,13 @@
  fi
  
  
@@ -108738,7 +109167,7 @@
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -104834,56 +46723,29 @@
+@@ -104984,56 +46821,29 @@
    return 0;
  }
  _ACEOF
@@ -108802,7 +109231,7 @@
  /* end confdefs.h.  */
  #include <signal.h>
  int
-@@ -104894,41 +46756,18 @@
+@@ -105044,41 +46854,18 @@
    return 0;
  }
  _ACEOF
@@ -108848,7 +109277,7 @@
  
   fi
  
-@@ -104952,151 +46791,12 @@
+@@ -105102,151 +46889,12 @@
  
  fi
  
@@ -109005,7 +109434,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -105410,151 +47110,12 @@
+@@ -105560,151 +47208,12 @@
  
  
  
@@ -109161,7 +109590,7 @@
  _ACEOF
  
  fi
-@@ -105564,23 +47125,17 @@
+@@ -105714,23 +47223,17 @@
  
  
  
@@ -109188,7 +109617,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -105598,54 +47153,28 @@
+@@ -105748,54 +47251,28 @@
    return 0;
  }
  _ACEOF
@@ -109250,7 +109679,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -105661,18 +47190,13 @@
+@@ -105811,18 +47288,13 @@
  
  fi
  
@@ -109272,7 +109701,7 @@
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -105690,40 +47214,19 @@
+@@ -105840,40 +47312,19 @@
    return 0;
  }
  _ACEOF
@@ -109315,7 +109744,7 @@
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -105745,7 +47248,7 @@
+@@ -105895,7 +47346,7 @@
  
  
  # Check whether --enable-dmalloc was given.
@@ -109324,7 +109753,7 @@
    enableval=$enable_dmalloc;
  fi
  
-@@ -105753,14 +47256,10 @@
+@@ -105903,14 +47354,10 @@
  if test "x$enable_dmalloc" = xyes
  then
  
@@ -109341,7 +109770,7 @@
  
  	LIBS="$LIBS -ldmalloc"
  fi
-@@ -105858,87 +47357,54 @@
+@@ -106008,87 +47455,54 @@
  #################################################
  # Display summary of libraries detected
  
@@ -109445,7 +109874,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
-@@ -105997,13 +47463,13 @@
+@@ -106147,13 +47561,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -109461,7 +109890,7 @@
        esac ;;
      esac
    done
-@@ -106011,8 +47477,8 @@
+@@ -106161,8 +47575,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -109472,7 +109901,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -106035,11 +47501,11 @@
+@@ -106185,11 +47599,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" &&
@@ -109486,7 +109915,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -106059,8 +47525,8 @@
+@@ -106209,8 +47623,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.
@@ -109497,7 +109926,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -106084,9 +47550,10 @@
+@@ -106234,9 +47648,10 @@
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -109510,7 +109939,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -106096,17 +47563,18 @@
+@@ -106246,17 +47661,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -109536,7 +109965,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -106114,23 +47582,15 @@
+@@ -106264,23 +47680,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -109565,7 +109994,7 @@
  as_nl='
  '
  export as_nl
-@@ -106138,7 +47598,13 @@
+@@ -106288,7 +47696,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
@@ -109580,7 +110009,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -106149,7 +47615,7 @@
+@@ -106299,7 +47713,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -109589,7 +110018,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -106172,13 +47638,6 @@
+@@ -106322,13 +47736,6 @@
    }
  fi
  
@@ -109603,7 +110032,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -106188,15 +47647,15 @@
+@@ -106338,15 +47745,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -109622,7 +110051,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -106208,12 +47667,16 @@
+@@ -106358,12 +47765,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -109643,7 +110072,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -106225,7 +47688,89 @@
+@@ -106375,7 +47786,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -109734,7 +110163,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -106239,8 +47784,12 @@
+@@ -106389,8 +47882,12 @@
    as_basename=false
  fi
  
@@ -109748,7 +110177,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -106260,76 +47809,25 @@
+@@ -106410,76 +47907,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -109836,7 +110265,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -106358,8 +47856,56 @@
+@@ -106508,8 +47954,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -109894,7 +110323,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -106378,10 +47924,10 @@
+@@ -106528,10 +48022,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -109907,7 +110336,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -106396,13 +47942,19 @@
+@@ -106546,13 +48040,19 @@
  
  
  exec 6>&1
@@ -109929,7 +110358,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -106434,13 +47986,15 @@
+@@ -106584,13 +48084,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -109948,7 +110377,7 @@
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -106459,16 +48013,17 @@
+@@ -106609,16 +48111,17 @@
  Configuration commands:
  $config_commands
  
@@ -109970,7 +110399,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -106503,6 +48058,8 @@
+@@ -106653,6 +48156,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -109979,7 +110408,7 @@
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -106510,20 +48067,19 @@
+@@ -106660,20 +48165,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -110004,7 +110433,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -106531,11 +48087,10 @@
+@@ -106681,11 +48185,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -110019,7 +110448,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -106628,9 +48183,7 @@
+@@ -106778,9 +48281,7 @@
      "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
      "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
  
@@ -110030,7 +110459,7 @@
    esac
  done
  
-@@ -106657,7 +48210,7 @@
+@@ -106807,7 +48308,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -110039,7 +110468,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -106668,11 +48221,7 @@
+@@ -106818,11 +48319,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -110052,7 +110481,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -106680,10 +48229,16 @@
+@@ -106830,10 +48327,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -110072,7 +110501,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -106697,24 +48252,18 @@
+@@ -106847,24 +48350,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -110100,7 +110529,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -106736,7 +48285,7 @@
+@@ -106886,7 +48383,7 @@
  t delim
  :nl
  h
@@ -110109,7 +110538,7 @@
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -106750,7 +48299,7 @@
+@@ -106900,7 +48397,7 @@
  t nl
  :delim
  h
@@ -110118,7 +110547,7 @@
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -106803,9 +48352,7 @@
+@@ -106953,9 +48450,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -110129,7 +110558,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -106846,9 +48393,7 @@
+@@ -106996,9 +48491,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -110140,7 +110569,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -106933,9 +48478,7 @@
+@@ -107083,9 +48576,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -110151,7 +110580,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -106948,9 +48491,7 @@
+@@ -107098,9 +48589,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -110162,7 +110591,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -106978,12 +48519,10 @@
+@@ -107128,12 +48617,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -110177,7 +110606,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -106994,7 +48533,7 @@
+@@ -107144,7 +48631,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -110186,7 +110615,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -107007,9 +48546,7 @@
+@@ -107157,9 +48644,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -110197,7 +110626,7 @@
      esac
      ;;
    esac
-@@ -107037,47 +48574,7 @@
+@@ -107187,47 +48672,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -110246,7 +110675,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -107129,7 +48626,6 @@
+@@ -107279,7 +48724,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=
@@ -110254,7 +110683,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -107139,12 +48635,11 @@
+@@ -107289,12 +48733,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -110269,7 +110698,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
-@@ -107154,7 +48649,7 @@
+@@ -107304,7 +48747,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -110278,7 +110707,7 @@
  esac
  _ACEOF
  
-@@ -107182,14 +48677,12 @@
+@@ -107332,14 +48775,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -110295,7 +110724,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;}
-@@ -107199,9 +48692,7 @@
+@@ -107349,9 +48790,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -110306,7 +110735,7 @@
   ;;
    :H)
    #
-@@ -107212,29 +48703,23 @@
+@@ -107362,29 +48801,23 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -110341,7 +110770,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -107260,15 +48745,12 @@
+@@ -107410,15 +48843,12 @@
  done # for ac_tag
  
  
@@ -110359,7 +110788,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -107289,10 +48771,10 @@
+@@ -107439,10 +48869,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.
@@ -110372,7 +110801,7 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-@@ -107303,8 +48785,8 @@
+@@ -107453,8 +48883,8 @@
  # Print very concise instructions on building/use
  if test "x$enable_dmalloc" = xyes
  then





More information about the Pkg-samba-maint mailing list