[Pkg-samba-maint] r3022 - trunk/samba/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Tue Sep 8 04:39:47 UTC 2009
Author: vorlon
Date: 2009-09-08 04:39:45 +0000 (Tue, 08 Sep 2009)
New Revision: 3022
Modified:
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/external-talloc-support.patch
Log:
really fix the libtalloc dep - don't built static libtalloc either here.
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-09-08 02:54:00 UTC (rev 3021)
+++ trunk/samba/debian/patches/autoconf.patch 2009-09-08 04:39:45 UTC (rev 3022)
@@ -6996,7 +6996,7 @@
_ACEOF
-@@ -7467,717 +6323,429 @@
+@@ -7467,27254 +6323,429 @@
# 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.
@@ -7569,8 +7569,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
-+fi
-
+-
- ;
- return 0;
-}
@@ -7607,7 +7606,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -7631,148 +7630,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-+echo "LIBREPLACE_CC_CHECKS: END"
-+
-+
-+
-+# Check whether --enable-external_libtalloc was given.
-+if test "${enable_external_libtalloc+set}" = set; then :
-+ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ enable_external_libtalloc=auto
-+fi
-
+-
- 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`
-+
-+if test "x$enable_external_libtalloc" != xno
-+then
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&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 -z "$ac_cv_path_PKG_CONFIG"; then
-+ 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
-+{ $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_ac_pt_PKG_CONFIG+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
+- done
+-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
-
+-
- ac_lo= ac_hi=
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ 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
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
-+else
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
-+ PKG_CONFIG=""
-+ fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -7789,8 +7670,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-+fi
-
+-
- ;
- return 0;
-}
@@ -7804,18 +7684,7 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
-+$as_echo_n "checking for TALLOC... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_CFLAGS"; then
-+ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -7825,70 +7694,13 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_LIBS"; then
-+ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
+-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
- fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ else
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$TALLOC_PKG_ERRORS" >&5
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-+
-+elif test $pkg_failed = untried; then
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -7905,7 +7717,7 @@
- ac_cv_sizeof_long=0
- fi ;;
-esac
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -7920,14 +7732,7 @@
-int
-main ()
-{
-+ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
-+ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ enable_external_libtalloc=yes
-+fi
-+fi
-
+-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -7948,14 +7753,7 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-+if test "x$enable_external_libtalloc" = xno
-+then
-+ tallocdir=""
-+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
-+for d in $tallocpaths; do
-+ if test -f "$srcdir/$d/talloc.c"; then
-+ tallocdir="$d"
-
+-
- ;
- return 0;
-}
@@ -7983,86 +7781,48 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
-+ break;
-+ fi
-+done
-+if test x"$tallocdir" = "x"; then
-+ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
-+fi
-+TALLOC_OBJ="talloc.o"
-+
-+
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
-+
-+
-+TALLOC_LIBS=""
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-
+-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+else
-+ if test "$ac_cv_type_size_t" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
- else
+- else
- ac_cv_sizeof_long=0
-+ ac_cv_sizeof_size_t=0
- fi
- fi
+- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
- cat >>confdefs.h <<_ACEOF
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
- _ACEOF
-
-
-@@ -8185,30229 +6753,1922 @@
- # 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.
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -8114,8 +7874,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
-
+-
- ;
- return 0;
-}
@@ -8139,36 +7898,24 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if test "$ac_cv_type_void_p" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void *)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_void_p=0
-+ fi
-+fi
-
+-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-
+-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
@@ -8181,7 +7928,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -8208,9 +7955,7 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -8220,7 +7965,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -8247,61 +7992,27 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+
-+if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
-+$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical at samba.org>" >&5
-+$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
-+$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
-+$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-+ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-+ NO_LIBTALLOC='#'
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+LIBTALLOC_OBJ0=""
-+for obj in ${TALLOC_OBJ}; do
-+ LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
-+done
-+
-+
-+
-+
-+
-+
-+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
+-
-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
@@ -8318,30 +8029,11 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
-
+-
- ;
- return 0;
-}
-+
-+
-+
-+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
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8364,12 +8056,12 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
@@ -8420,17 +8112,11 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
+-
- ;
- return 0;
-}
-+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
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8458,7 +8144,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
@@ -8471,38 +8157,23 @@
- else
- ac_cv_sizeof_long_long=0
- fi
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-+done
-+
-+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
-+
- fi
+-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
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
-
-+LIBS="${LIBS} ${TEVENT_LIBS}"
-
-+# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
-+# but currently this fails: things have to get merged from s4.
-+tdbdir="../lib/tdb"
-
+-
+-
+-
-{ $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
@@ -8581,53 +8252,32 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
-
+-
- 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
-+LIBTDB_OBJ0=""
-+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
-+ common/traverse.o common/freelist.o common/freelistcheck.o \
-+ common/io.o common/lock.o common/open.o;
-+do
-+ LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
-+done
-
-
+-
+-
-fi
-+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
-$as_echo "$ac_cv_type_uint_t" >&6; }
-if test "x$ac_cv_type_uint_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint_t unsigned int
-_ACEOF
-
+-
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
-$as_echo_n "checking for int8_t... " >&6; }
-if test "${ac_cv_type_int8_t+set}" = set; then
@@ -8706,18 +8356,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
@@ -8725,13 +8375,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
@@ -8810,18 +8460,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
@@ -8829,13 +8479,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
@@ -8914,18 +8564,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_int16_t=yes
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+-
+-
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
@@ -8933,13 +8583,13 @@
-if test "x$ac_cv_type_int16_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define int16_t short
-_ACEOF
-
+-
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
-$as_echo_n "checking for uint16_t... " >&6; }
-if test "${ac_cv_type_uint16_t+set}" = set; then
@@ -9018,18 +8668,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_uint16_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_uint16_t" >&5
@@ -9037,14 +8687,14 @@
-if test "x$ac_cv_type_uint16_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint16_t unsigned short
-_ACEOF
-
+-
-fi
-
-
+-
+-
-if test $ac_cv_sizeof_int -eq 4 ; then
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
@@ -9124,67 +8774,32 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_int32_t=yes
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-+# 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
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+ enableval=$enable_socket_wrapper;
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
-$as_echo "$ac_cv_type_int32_t" >&6; }
-if test "x$ac_cv_type_int32_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define int32_t int
-_ACEOF
-
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_socket_wrapper=yes
- fi
-
+-
+-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
@@ -9263,48 +8878,32 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if eval "test x$enable_socket_wrapper = xyes"; then
-+
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-+
-+ DEFAULT_TEST_OPTIONS=--socket-wrapper
-+ HAVE_SOCKET_WRAPPER=yes
-
+-
- ac_cv_type_uint32_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_uint32_t" >&5
-$as_echo "$ac_cv_type_uint32_t" >&6; }
-if test "x$ac_cv_type_uint32_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint32_t unsigned int
-_ACEOF
-
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_nss_wrapper=yes
- fi
-
+-
+-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; }
@@ -9384,25 +8983,18 @@
-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
-
+-
- 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
@@ -9410,13 +9002,13 @@
-if test "x$ac_cv_type_int32_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define int32_t long
-_ACEOF
-
+-
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
-$as_echo_n "checking for uint32_t... " >&6; }
-if test "${ac_cv_type_uint32_t+set}" = set; then
@@ -9495,30 +9087,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
@@ -9526,46 +9106,24 @@
-if test "x$ac_cv_type_uint32_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint32_t unsigned long
-_ACEOF
-
+-
-fi
-
-+# 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
+-
+-else
-{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE no 32-bit type found" >&5
-$as_echo "$as_me: error: LIBREPLACE no 32-bit type found" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
-$as_echo_n "checking for int64_t... " >&6; }
-if test "${ac_cv_type_int64_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+
-+ old_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
+-else
- ac_cv_type_int64_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9606,8 +9164,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9617,12 +9174,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9642,38 +9194,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_int64_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_int64_t" >&5
@@ -9681,38 +9216,18 @@
-if test "x$ac_cv_type_int64_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 int64_t long 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 uint64_t" >&5
-$as_echo_n "checking for uint64_t... " >&6; }
-if test "${ac_cv_type_uint64_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ old_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_uint64_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9753,8 +9268,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9764,12 +9278,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9789,121 +9298,41 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ samba_cv_HAVE_Werror_implicit_function_declaration=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-+
-
+-
- ac_cv_type_uint64_t=yes
- 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
-
+-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
-+ # 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
-
-+# Check whether --enable-dmalloc was given.
-+if test "${enable_dmalloc+set}" = set; then :
-+ enableval=$enable_dmalloc;
- fi
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test "x$enable_dmalloc" = xyes
-+then
-+
-+$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
-+
-+
-+$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
-+
-+ LIBS="$LIBS -ldmalloc"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
-$as_echo "$ac_cv_type_uint64_t" >&6; }
-if test "x$ac_cv_type_uint64_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint64_t unsigned long long
-_ACEOF
-+#################################################
-+# check for a shared memory profiling support
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
-+$as_echo_n "checking whether to use profiling... " >&6; }
-+
-+# Check whether --with-profiling-data was given.
-+if test "${with_profiling_data+set}" = set; then :
-+ withval=$with_profiling_data; case "$withval" in
-+ yes)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
-+
-+ samba_cv_WITH_PROFILE=yes
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ samba_cv_WITH_PROFILE=no
-+ ;;
-+ esac
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- 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
-+merged_build_possible=yes
-+
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+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. */
@@ -9974,51 +9403,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+ if test -n "$AWK"; then
-+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_AWK="$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
+-
- ac_cv_type_size_t=yes
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ 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_size_t" >&5
@@ -10026,25 +9425,18 @@
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
+-
-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
-+for ac_prog in gmake make
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_ssize_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -10101,28 +9493,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ 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
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -10136,64 +9507,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+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
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ssize_t=yes
-+ { $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
-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
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
- :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
-+$as_echo "$samba_cv_gnu_make" >&6; }
-+if test x$samba_cv_gnu_make = xyes; then
-+ true
- else
-+ merged_build_possible=no
-+fi
-
+-else
+-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
+-
-fi
-+# Check for perl
-
-
+-
+-
-# 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]];'.
@@ -34280,12 +33623,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
--
+ fi
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -34327,7 +33670,8 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
++echo "LIBREPLACE_CC_CHECKS: END"
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -34335,14 +33679,22 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
+
-fi
--
+
-done
--
--
--
--
++# Check whether --enable-external_libtalloc was given.
++if test "${enable_external_libtalloc+set}" = set; then :
++ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
++else
++ enable_external_libtalloc=auto
++fi
+
+
++if test "x$enable_external_libtalloc" != xno
++then
+
+
-for ac_header in sys/cdefs.h glob.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34350,13 +33702,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
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $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; }
@@ -34374,7 +33733,28 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
@@ -34388,17 +33768,24 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
--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
-{ $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; }
@@ -34428,13 +33815,51 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ 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
++{ $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_ac_pt_PKG_CONFIG+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ac_header_preproc=no
--fi
--
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
@@ -34468,36 +33893,62 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
--esac
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ 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
-{ $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
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
+
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
--fi
--
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
++ PKG_CONFIG=""
++ fi
+
+ fi
+
-done
-
-
-# For experimental utmp support (lastlog on some BSD-like systems)
-
-
--
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
++$as_echo_n "checking for TALLOC... " >&6; }
+
-for ac_header in utmp.h utmpx.h lastlog.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34533,7 +33984,14 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TALLOC_CFLAGS"; then
++ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -34543,12 +34001,16 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
--fi
++ pkg_failed=yes
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -34583,12 +34045,14 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++ fi
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
++ pkg_failed=untried
+ fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -34628,7 +34092,18 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TALLOC_LIBS"; then
++ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -34636,7 +34111,8 @@
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
--fi
++ pkg_failed=yes
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
@@ -34644,11 +34120,14 @@
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
--fi
--
++ fi
++else
++ pkg_failed=untried
+ fi
+
-done
-
--
+
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -34672,7 +34151,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -34709,7 +34188,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
--
++if test $pkg_failed = yes; then
+
- ;
- return 0;
-}
@@ -34733,7 +34213,9 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
--else
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -34743,8 +34225,16 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
++ _pkg_short_errors_supported=no
+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
++ else
++ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$TALLOC_PKG_ERRORS" >&5
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
@@ -34763,7 +34253,14 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
-test_array [0] = 0
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ if x$enable_external_libtalloc = xyes; then
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
+
- ;
- return 0;
-}
@@ -34800,7 +34297,13 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
--
++elif test $pkg_failed = untried; then
++ if x$enable_external_libtalloc = xyes; then
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
+
- ;
- return 0;
-}
@@ -34824,7 +34327,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -34834,7 +34337,12 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
++ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
++ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ enable_external_libtalloc=yes
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
@@ -34843,11 +34351,25 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
++if test "x$enable_external_libtalloc" = xno
++then
++ tallocdir=""
++tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
++for d in $tallocpaths; do
++ if test -f "$srcdir/$d/talloc.c"; then
++ tallocdir="$d"
++
++ break;
++ fi
++done
++if test x"$tallocdir" = "x"; then
++ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
+ fi
++TALLOC_OBJ="talloc.o"
+
-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
@@ -34864,7 +34386,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -34891,10 +34413,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++TALLOC_CFLAGS="-I$srcdir/$tallocdir"
+
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -34926,7 +34449,8 @@
-int
-main ()
-{
--
++TALLOC_LIBS=""
+
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -34947,7 +34471,7 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
--
+
- ;
- return 0;
-}
@@ -34975,48 +34499,71 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
--else
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
++$as_echo_n "checking size of size_t... " >&6; }
++if test "${ac_cv_sizeof_size_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
+
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++else
++ if test "$ac_cv_type_size_t" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-- else
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (size_t)
++See \`config.log' for more details." "$LINENO" 5; }; }
+ else
- ac_cv_sizeof_int=0
-- fi
--fi
++ ac_cv_sizeof_size_t=0
+ fi
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
--fi
++
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
++$as_echo "$ac_cv_sizeof_size_t" >&6; }
+
+
+
+ cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
--_ACEOF
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+
+
+@@ -34722,3692 +6753,1920 @@
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if test "${ac_cv_sizeof_void_p+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -35068,7 +34615,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
+
- ;
- return 0;
-}
@@ -35092,24 +34640,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if test "$ac_cv_type_void_p" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (void *)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_void_p=0
++ fi
++fi
+
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
++$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
-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
@@ -35122,7 +34682,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35149,7 +34709,9 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -35159,7 +34721,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35186,7 +34748,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=
@@ -35194,19 +34756,52 @@
- 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
--
++if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
++$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical at samba.org>" >&5
++$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
++$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
++$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
++ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
++fi
+
- ac_lo= ac_hi=
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
++LIBTALLOC_OBJ0=""
++for obj in ${TALLOC_OBJ}; do
++ LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
++done
++
++
++
++
++
++
++if test x"$teventdir" = "x"; then
++ teventdir=""
++ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++ for d in $teventpaths; do
++ if test -f "$d/tevent.c"; then
++ teventdir="$d"
++ break;
++ fi
++ done
++ if test x"$teventdir" = "x"; then
++ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++ fi
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -35223,11 +34818,30 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
--
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
+
- ;
- 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
@@ -35250,12 +34864,12 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
+ done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
@@ -35306,11 +34920,17 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
--
+
- ;
- return 0;
-}
--_ACEOF
++for ac_func in epoll_create
++do :
++ ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
++if test "x$ac_cv_func_epoll_create" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_EPOLL_CREATE 1
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -35338,7 +34958,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
@@ -35354,19 +34974,31 @@
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-rm -f conftest.val
--fi
++done
++
++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
++
+ 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
--
--
++LIBTEVENT_OBJ0=""
++for obj in ${TEVENT_OBJ}; do
++ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
++done
+
++LIBS="${LIBS} ${TEVENT_LIBS}"
+
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -35390,7 +35022,10 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
-test_array [0] = 0
--
++# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
++# but currently this fails: things have to get merged from s4.
++tdbdir="../lib/tdb"
+
- ;
- return 0;
-}
@@ -35427,7 +35062,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
--
++TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
+
- ;
- return 0;
-}
@@ -35454,21 +35090,44 @@
-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
--
++LIBTDB_OBJ0=""
++for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
++ common/traverse.o common/freelist.o common/freelistcheck.o \
++ common/io.o common/lock.o common/open.o;
++do
++ LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
++done
++
++
++SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
++
++SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
++
++## cleanup the $(srcdir) in the Makefile if we are outside of the tree
++if test "x${srcdir-.}" != "x."; then
++ SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -35481,7 +35140,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35518,7 +35177,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35545,27 +35204,108 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# compile with optimization and without debugging by default, but
++# allow people to set their own preference.
++# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
++# if it has no value. This prevent *very* large debug binaries from occurring
++# by default.
++if test "x$debug" = "xyes" ; then
++ CFLAGS="${CFLAGS} -g"
++fi
++if test "x$CFLAGS" = x; then
++ CFLAGS="-O"
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++ enableval=$enable_socket_wrapper;
++fi
+
- ac_lo= ac_hi=
--fi
--
++
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_socket_wrapper=yes
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
++if eval "test x$enable_socket_wrapper = xyes"; then
++
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
++
++ DEFAULT_TEST_OPTIONS=--socket-wrapper
++ HAVE_SOCKET_WRAPPER=yes
++
++ # this is only used for samba3
++ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
+ 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
@@ -35582,7 +35322,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35609,10 +35349,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
++
++
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++ enableval=$enable_nss_wrapper;
++fi
++
++
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_nss_wrapper=yes
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -35644,7 +35396,8 @@
-int
-main ()
-{
--
++if eval "test x$enable_nss_wrapper = xyes"; then
+
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -35665,7 +35418,8 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
--
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
+
- ;
- return 0;
-}
@@ -35697,7 +35451,8 @@
- $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
--
++ HAVE_NSS_WRAPPER=yes
+
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -35715,17 +35470,19 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
--fi
++ # this is only used for samba3
++ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
+ 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
--
--
+
+
-# 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]];'.
@@ -35749,7 +35506,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35786,7 +35543,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35813,21 +35570,49 @@
-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_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
++
++
++
++
++
++
++# 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 "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -35840,7 +35625,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -35870,18 +35655,35 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ old_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 ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
--_ACEOF
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -35901,7 +35703,9 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
--else
++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
-
@@ -35911,20 +35715,35 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--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
- done
-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_lo= ac_hi=
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+
-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
@@ -35941,7 +35760,10 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
--
++ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++ fi
+
- ;
- return 0;
-}
@@ -35965,13 +35787,18 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
--else
++ #-Werror-implicit-function-declaration
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
++$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
++if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $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
@@ -35988,13 +35815,25 @@
- ac_cv_sizeof_short=0
- fi ;;
-esac
--else
++ old_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
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
@@ -36024,11 +35863,15 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
--
+
- ;
- return 0;
-}
--_ACEOF
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -36052,11 +35895,29 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ samba_cv_HAVE_Werror_implicit_function_declaration=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
++
+
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -36069,23 +35930,46 @@
- else
- ac_cv_sizeof_short=0
- fi
--fi
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++{ $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
++
++ # 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
-rm -f conftest.val
--fi
++
++# Check whether --enable-dmalloc was given.
++if test "${enable_dmalloc+set}" = set; then :
++ enableval=$enable_dmalloc;
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
--
--
--
+
+
++if test "x$enable_dmalloc" = xyes
++then
+
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
--
--
--
++$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
+
+
++$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
+
-{ $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
@@ -36097,7 +35981,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ LIBS="$LIBS -ldmalloc"
++fi
+
-int
-main ()
-{
@@ -36125,7 +36011,11 @@
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
--
++#################################################
++# 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; }
+
- *t++ = 0;
- if (s) return 0;
- }
@@ -36150,7 +36040,13 @@
- }
- return !cs[0] && !zero.x;
-#endif
--
++# 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; }
+
- ;
- return 0;
-}
@@ -36174,30 +36070,50 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
--else
++$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
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
- ac_cv_c_const=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
--
+
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
--
++merged_build_possible=yes
+
-fi
--
+
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-- $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_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
@@ -36232,22 +36148,50 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
--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
-
--
--fi
--
++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
+
+ 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
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
--done
--
++
++ test -n "$AWK" && break
+ done
+
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
--
--
++# Check for GNU make
+
+
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
@@ -36262,13 +36206,22 @@
-_ACEOF
- ;;
-esac
--
--
+
+
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-- $as_echo_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_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat >conftest.$ac_ext <<_ACEOF
@@ -36281,14 +36234,34 @@
- not a universal capable compiler
- #endif
- typedef int dummy;
--
++ case $MAKE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36301,20 +36274,27 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
+-
- # Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
--else
++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
-
-
--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
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
@@ -36335,7 +36315,7 @@
- && LITTLE_ENDIAN)
- bogus endian macros
- #endif
--
+
- ;
- return 0;
-}
@@ -36367,6 +36347,8 @@
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
++ test -n "$MAKE" && break
++done
-int
-main ()
@@ -36398,60 +36380,38 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-+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 "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
++$as_echo_n "checking whether we have GNU make... " >&6; }
++if test "${samba_cv_gnu_make+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ case $PERL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
-+for as_dir in $as_dummy
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
- ac_cv_c_bigendian=no
-+ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+ ;;
-+esac
++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
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
++$as_echo "$samba_cv_gnu_make" >&6; }
++if test x$samba_cv_gnu_make = xyes; then
++ true
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
++ merged_build_possible=no
++fi
+
+-fi
++# Check for perl
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
@@ -36463,14 +36423,14 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
--
+
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
- bogus endian macros
- #endif
--
+
- ;
- return 0;
-}
@@ -36501,7 +36461,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
--
+
-int
-main ()
-{
@@ -36532,8 +36492,10 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-+ ;;
-+ *)
++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
@@ -36549,7 +36511,8 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
++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=.
@@ -36564,6 +36527,7 @@
+IFS=$as_save_IFS
- ac_cv_c_bigendian=no
++ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
+ ;;
+esac
fi
@@ -36623,8 +36587,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36648,18 +36611,47 @@
- ac_cv_c_bigendian=unknown
- fi
- fi
--else
++ ;;
++ *)
++ # Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++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
-
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36671,11 +36663,8 @@
-int
-main ()
-{
-+ if test x"$debug" = x"yes";then
-+ PERL="$PERL -W"
-+ fi
-+ export PERL
-+ true
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+fi
- /* Are we little or big endian? From Harbison&Steele. */
@@ -36706,7 +36695,8 @@
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
@@ -36714,51 +36704,30 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
-+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
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if 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
-
+-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-
--
+
- fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
++if test 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
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ if test x"$debug" = x"yes";then
++ PERL="$PERL -W"
++ fi
++ export PERL
++ true
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -36789,14 +36758,12 @@
-{ $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
-+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
++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_ac_ct_AR+set}" = set; then :
++if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -36835,14 +36802,11 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_char_unsigned=no
-+ if test -n "$ac_ct_AR"; then
-+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++ if test -n "$AR"; then
++ ac_cv_prog_AR="$AR" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_c_char_unsigned=yes
--fi
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
@@ -36850,7 +36814,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_AR="ar"
++ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -36858,6 +36822,9 @@
+ done
+IFS=$as_save_IFS
+- ac_cv_c_char_unsigned=yes
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
@@ -36867,17 +36834,28 @@
-#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
--
--
+
+
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+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; }
++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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36887,10 +36865,7 @@
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
+-
-int
-main ()
-{
@@ -36904,15 +36879,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ 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
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36926,17 +36893,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_signal=int
-+ AR=$ac_ct_AR
-+ fi
++ if test -n "$ac_ct_AR"; then
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_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
--fi
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ AR="$ac_cv_prog_AR"
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
@@ -36944,16 +36924,31 @@
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
+-
++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
-
-{ $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
+- $as_echo_n "(cached) " >&6
++ 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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36962,118 +36957,40 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
--
++ AR="$ac_cv_prog_AR"
++fi
+
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then
- ac_cv_type_uid_t=yes
++
++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
+- ac_cv_type_uid_t=no
+ # 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
-- ac_cv_type_uid_t=no
--fi
++else
++ ac_cv_prog_gnu_ld=no
+ fi
-rm -f conftest*
-
-+ ac_cv_prog_gnu_ld=no
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
--
--cat >>confdefs.h <<\_ACEOF
--#define uid_t int
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define gid_t int
--_ACEOF
--
- fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
+$as_echo "$ac_cv_prog_gnu_ld" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
--$as_echo_n "checking for mode_t... " >&6; }
--if test "${ac_cv_type_mode_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_type_mode_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+-cat >>confdefs.h <<\_ACEOF
+-#define uid_t int
-_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (mode_t))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((mode_t)))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_mode_t=yes
++
+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
@@ -37111,44 +37028,30 @@
+ ac_cv_gnu_ld_version_script=yes
+ fi
+ fi
- 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
+-cat >>confdefs.h <<\_ACEOF
+-#define gid_t int
+-_ACEOF
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
--$as_echo "$ac_cv_type_mode_t" >&6; }
--if test "x$ac_cv_type_mode_t" = x""yes; then
-- :
+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
--
--cat >>confdefs.h <<_ACEOF
--#define mode_t int
--_ACEOF
--
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
fi
-
--{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
--$as_echo_n "checking for off_t... " >&6; }
--if test "${ac_cv_type_off_t+set}" = set; then
+-{ $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
-- ac_cv_type_off_t=no
+- ac_cv_type_mode_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -37161,7 +37064,7 @@
int
main ()
{
--if (sizeof (off_t))
+-if (sizeof (mode_t))
- return 0;
+
;
@@ -37205,7 +37108,7 @@
-int
-main ()
-{
--if (sizeof ((off_t)))
+-if (sizeof ((mode_t)))
- return 0;
- ;
- return 0;
@@ -37240,7 +37143,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_off_t=yes
+- ac_cv_type_mode_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -37253,24 +37156,24 @@
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--$as_echo "$ac_cv_type_off_t" >&6; }
--if test "x$ac_cv_type_off_t" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+-$as_echo "$ac_cv_type_mode_t" >&6; }
+-if test "x$ac_cv_type_mode_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
--#define off_t long int
+-#define mode_t int
-_ACEOF
-
-fi
-
--{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
--$as_echo_n "checking for size_t... " >&6; }
--if test "${ac_cv_type_size_t+set}" = set; then
+-{ $as_echo "$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
- $as_echo_n "(cached) " >&6
-else
-- ac_cv_type_size_t=no
+- ac_cv_type_off_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -37281,7 +37184,7 @@
-int
-main ()
-{
--if (sizeof (size_t))
+-if (sizeof (off_t))
- return 0;
- ;
- return 0;
@@ -37326,7 +37229,7 @@
-int
-main ()
-{
--if (sizeof ((size_t)))
+-if (sizeof ((off_t)))
- return 0;
- ;
- return 0;
@@ -37384,7 +37287,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_size_t=yes
+- ac_cv_type_off_t=yes
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
+rm -f core conftest*
@@ -37406,31 +37309,31 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--$as_echo "$ac_cv_type_size_t" >&6; }
--if test "x$ac_cv_type_size_t" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-$as_echo "$ac_cv_type_off_t" >&6; }
+-if test "x$ac_cv_type_off_t" = x""yes; then
- :
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
+ BROKEN_CC=
else
-
-cat >>confdefs.h <<_ACEOF
--#define size_t unsigned int
+-#define off_t long int
-_ACEOF
-
+ BROKEN_CC=#
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 "$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
-- ac_cv_type_pid_t=no
+- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -37441,7 +37344,7 @@
-int
-main ()
-{
--if (sizeof (pid_t))
+-if (sizeof (size_t))
- return 0;
- ;
- return 0;
@@ -37470,37 +37373,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Werror";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
--if (sizeof ((pid_t)))
+-if (sizeof ((size_t)))
- return 0;
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37520,24 +37403,56 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_type_size_t=yes
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="-Werror";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror=cross
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_pid_t=yes
++ 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
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+- :
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
+
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+-_ACEOF
+ CFLAGS="$old_CFLAGS";
+ old_CFLAGS="";
+ export CFLAGS;
@@ -37549,24 +37464,98 @@
+ export LDFLAGS;
fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
+-if test "${ac_cv_type_pid_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
+$as_echo "$samba_cv_HAVE_Werror" >&6; }
+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
+ Werror_FLAGS="-Werror"
-+else
+ else
+- ac_cv_type_pid_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (pid_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof ((pid_t)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+{ $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
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_cv_type_pid_t=yes
-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
-- :
-+
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ old_CFLAGS="$CFLAGS";
+ CFLAGS="-w2";
+ export CFLAGS;
@@ -37579,30 +37568,36 @@
+ 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. */
--cat >>confdefs.h <<_ACEOF
--#define pid_t int
+ int main(void)
+ {
+ return 0;
+ }
- _ACEOF
--
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ samba_cv_HAVE_w2=yes
+else
+ samba_cv_HAVE_w2=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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-$as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
+- :
+-else
--{ $as_echo "$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
+-cat >>confdefs.h <<_ACEOF
+-#define pid_t int
+-_ACEOF
+ CFLAGS="$old_CFLAGS";
+ old_CFLAGS="";
+ export CFLAGS;
@@ -37612,8 +37607,13 @@
+ LDFLAGS="$old_LDFLAGS";
+ old_LDFLAGS="";
+ export LDFLAGS;
-+
-+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
@@ -38688,12 +38688,13 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
-_ACEOF
--
--fi
+ CPPFLAGS="$old_CPPFLAGS"
+ if test x$SINIX_LFS_SUPPORT = xyes ; then
+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
-#############################################
-# check for fd passing struct via msg_control
-{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_control" >&5
@@ -38701,14 +38702,6 @@
-if test "${samba_cv_msghdr_msg_control+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
+ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
+ LIBS="`getconf LFS64_LIBS` $LIBS"
@@ -38718,18 +38711,55 @@
+ fi
+ ;;
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++
++
++$as_echo "#define _GNU_SOURCE 1" >>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>
--#include <stdlib.h>
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
+ #include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-int
-main ()
-{
-+# Systems with LFS support.
-+#
-+ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++main() {
++#if _LFS64_LARGEFILE == 1
++ struct utsname uts;
++ char *release;
++ int major, minor;
- struct msghdr msg;
- union {
@@ -38738,12 +38768,35 @@
- } control_un;
- msg.msg_control = control_un.control;
- msg.msg_controllen = sizeof(control_un.control);
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++ /* Ensure this is glibc 2.2 or higher */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++ int libc_major = __GLIBC__;
++ int libc_minor = __GLIBC_MINOR__;
++
++ if (libc_major < 2)
++ exit(1);
++ if (libc_minor < 2)
++ exit(1);
++#endif
++
++ /* Ensure this is kernel 2.4 or higher */
++
++ uname(&uts);
++ release = strdup(uts.release);
++ major = atoi(strsep(&release, "."));
++ minor = atoi(strsep(&release, "."));
- ;
- return 0;
--}
--_ACEOF
++ if (major > 2 || (major == 2 && minor > 3))
++ exit(0);
++ exit(1);
++#else
++ exit(1);
++#endif
+ }
++
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38763,27 +38816,32 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_control=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ LINUX_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- samba_cv_msghdr_msg_control=no
--fi
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
++ LINUX_LFS_SUPPORT=no
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
-$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_CONTROL 1
-_ACEOF
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-fi
-+ ;;
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$LINUX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-#############################################
-# check for fd passing struct via msg_acctrights
@@ -38791,75 +38849,35 @@
-$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
-+# 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
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <sys/types.h>
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
- #include <stdlib.h>
+-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-int
-main ()
-{
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+ struct utsname uts;
-+ char *release;
-+ int major, minor;
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
-+ /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+ int libc_major = __GLIBC__;
-+ int libc_minor = __GLIBC_MINOR__;
- ;
- return 0;
-+ if (libc_major < 2)
-+ exit(1);
-+ if (libc_minor < 2)
-+ exit(1);
-+#endif
-+
-+ /* Ensure this is kernel 2.4 or higher */
-+
-+ uname(&uts);
-+ release = strdup(uts.release);
-+ major = atoi(strsep(&release, "."));
-+ minor = atoi(strsep(&release, "."));
-+
-+ if (major > 2 || (major == 2 && minor > 3))
-+ exit(0);
-+ exit(1);
-+#else
-+ exit(1);
-+#endif
- }
-+
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38879,53 +38897,39 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_acctrights=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ LINUX_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ LINUX_LFS_SUPPORT=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$LINUX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+
-+
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- samba_cv_msghdr_msg_acctrights=no
-fi
-
--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; }
--if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
--_ACEOF
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
+ ;;
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
+-$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
+-if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
+#
+# MacOS X is the *only* system that uses compose character in utf8. This
+# is so horribly broken....
+#
+ *darwin*)
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
+-_ACEOF
+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
+-fi
+
++# Add a system specific charset module.
++ default_shared_modules="$default_shared_modules charset_macosxfs"
+
-for ac_func in dirfd
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38933,10 +38937,6 @@
-$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
-+
-+# 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
@@ -39242,12 +39242,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
+-fi
+-
+-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
--
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
@@ -39666,7 +39666,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -38442,364 +8703,60 @@
+@@ -38442,213 +8701,160 @@
return 0;
}
_ACEOF
@@ -39698,48 +39698,128 @@
- $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
--
++ ac_cv_func_memcmp_working=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
++$as_echo "$ac_cv_func_memcmp_working" >&6; }
++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
++ *" memcmp.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
++ ;;
++esac
++
++
++
++for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++
++for ac_header in stdbool.h stdint.h sys/select.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in 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
+
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-+ ac_cv_func_memcmp_working=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++
++done
++
++
++ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdint_h" = x""yes; then :
++ ac_config_commands="$ac_config_commands rm-stdint.h"
++
++else
++ ac_config_commands="$ac_config_commands mk-stdint.h"
++
++
fi
--
+
++
++ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdbool_h" = x""yes; then :
++ ac_config_commands="$ac_config_commands rm-stdbool.h"
++
++else
++ ac_config_commands="$ac_config_commands mk-stdbool.h"
++
++
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 "* ) ;;
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
+-$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
--
--
--
+
+
+
-###############################################
-# Readline included by default unless explicitly asked not to
-test "${with_readline+set}" != "set" && with_readline=yes
--
+
-# test for where we get readline() from
-{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
-$as_echo_n "checking whether to use readline... " >&6; }
--
++ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
++$ac_includes_default
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
+
-# 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; }
--
--
--
--
++"
++if test "x$ac_cv_type_bool" = x""yes; then :
+
++$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+
++fi
+
+
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39763,7 +39843,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--$ac_includes_default
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
+ $ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -39788,14 +39869,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
++
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39804,9 +39893,20 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_MMAP=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++#include "$libreplacedir/test/shared_mmap.c"
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39825,17 +39925,28 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_MMAP=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ libreplace_cv_HAVE_MMAP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
- ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -39872,25 +39983,31 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++
++for ac_header in sys/syslog.h syslog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -38657,149 +8863,40 @@
+
+ done
+
-
--fi
--
--done
--
--
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39916,7 +40033,15 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++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
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39939,14 +40064,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+esac
- ac_header_compiler=no
--fi
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++done
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -39958,14 +40083,14 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
++for ac_header in stdarg.h vararg.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -39991,12 +40116,11 @@
- ac_header_preproc=no
fi
-+done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -40038,24 +40162,13 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+for ac_header in stdbool.h stdint.h sys/select.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
++done
- 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_header in setjmp.h utime.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"
@@ -40064,15 +40177,22 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38809,1360 +8766,698 @@
+@@ -38808,626 +8905,234 @@
+
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
-+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdint_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdint.h"
++fi
--
++done
+
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40098,7 +40218,16 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40118,19 +40247,18 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_config_commands="$ac_config_commands mk-stdint.h"
-+
- ac_header_compiler=no
fi
++done
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40141,7 +40269,15 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40160,23 +40296,26 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+
-+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
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_config_commands="$ac_config_commands mk-stdbool.h"
-+
- ac_header_preproc=no
fi
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40214,39 +40353,54 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++done
+
-+
-+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
++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
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++done
++
++for ac_func in isatty chown lchown link readlink symlink realpath
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
- for termlib in ncurses curses termcap terminfo termlib tinfo; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++done
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
++$as_echo_n "checking for setresuid declaration... " >&6; }
++if test "${ac_cv_have_setresuid_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -40261,20 +40415,20 @@
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
- #endif
+-#endif
-char tgetent ();
--int
--main ()
--{
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
+ int
+ main ()
+ {
-return tgetent ();
-- ;
-- return 0;
--}
--_ACEOF
++int i = (int)setresuid
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -40297,22 +40451,21 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=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
-
+-
- eval "$as_ac_Lib=no"
-fi
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
-+
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
++ ac_cv_have_setresuid_decl=no
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -40321,16 +40474,24 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- TERMLIBS="-l${termlib}"; break
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $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
- 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 "$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 :
++ 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
@@ -40349,19 +40510,17 @@
-extern "C"
-#endif
-char rl_callback_handler_install ();
--int
--main ()
--{
--return rl_callback_handler_install ();
-- ;
-- return 0;
--}
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_MMAP=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include "$libreplacedir/test/shared_mmap.c"
++#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"
@@ -40385,69 +40544,43 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_callback_handler_install=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_cv_lib_readline_rl_callback_handler_install=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
-+
-+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
- fi
+-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
- TERMLIBS="-lreadline $TERMLIBS"
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-+
-+for ac_header in sys/syslog.h syslog.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
+-_ACEOF
+-
- break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresgid_decl=yes
+ else
- TERMLIBS=
++ ac_cv_have_setresgid_decl=no
fi
-
-+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
-+
+-
++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
- done
-
+-done
+-
- ;;
- no)
- { $as_echo "$as_me:$LINENO: result: no" >&5
@@ -40456,41 +40589,21 @@
- *)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-+for ac_header in stdarg.h vararg.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
+-
- # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
- # alternate readline path
- _ldflags=${LDFLAGS}
- _cppflags=${CPPFLAGS}
-+fi
-
+-
- # Add additional search path
- LDFLAGS="-L$with_readline/lib $LDFLAGS"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+done
+-
++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.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"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
++ fi
-+fi
-+done
-
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40498,13 +40611,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
++$as_echo_n "checking for errno declaration... " >&6; }
++if test "${ac_cv_have_errno_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`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; }
@@ -40513,15 +40629,19 @@
-_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>
-+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
++#include <errno.h>
++int
++main ()
++{
++int i = (int)errno
++ ;
++ return 0;
++}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40542,17 +40662,23 @@
- 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_have_errno_decl=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
++ ac_cv_have_errno_decl=no
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; }
-+done
++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
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40564,16 +40690,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+
-+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
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40595,23 +40712,15 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
- ac_header_preproc=no
- fi
-+done
+-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; }
-+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
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40646,60 +40755,31 @@
-{ $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 secure mkstemp" >&5
++$as_echo_n "checking for secure mkstemp... " >&6; }
++if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- 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 waitpid strlcpy strlcat initgroups memmove strdup
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
- fi
+-
+-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 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
+- 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
+-
+-fi
- fi
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
- done
-
-
+-done
+-
+-
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40707,15 +40787,14 @@
- { $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 setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
-fi
-ac_res=`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 "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
@@ -40725,18 +40804,23 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresuid
-+ ;
-+ return 0;
++main() {
++ struct stat st;
++ char tpl[20]="/tmp/test.XXXXXX";
++ int fd = mkstemp(tpl);
++ if (fd == -1) exit(1);
++ unlink(tpl);
++ if (fstat(fd, &st) != 0) exit(1);
++ if ((st.st_mode & 0777) != 0600) exit(1);
++ exit(0);
+}
_ACEOF
-rm -f conftest.$ac_objext
@@ -40758,24 +40842,20 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresuid_decl=yes
++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_header_compiler=no
-+ ac_cv_have_setresuid_decl=no
++ libreplace_cv_HAVE_SECURE_MKSTEMP=no
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_have_setresuid_decl" >&5
-+$as_echo "$ac_cv_have_setresuid_decl" >&6; }
-+ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40808,16 +40888,16 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
-
+-
- ac_header_preproc=no
--fi
-+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-rm -f conftest.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: )
@@ -40851,54 +40931,56 @@
-{ $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 setresgid declaration" >&5
-+$as_echo_n "checking for setresgid declaration... " >&6; }
-+if test "${ac_cv_have_setresgid_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- 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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
++
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
--fi
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresgid
-+ ;
-+ return 0;
-+}
++
++for ac_header in stdio.h strings.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
--
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresgid_decl=yes
+@@ -39436,1086 +9141,564 @@
+
+ done
+
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++ ac_have_decl=1
+else
-+ ac_cv_have_setresgid_decl=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_have_decl=0
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
-+$as_echo "$ac_cv_have_setresgid_decl" >&6; }
-+ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
--done
--
-+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
++fi
-+ fi
-
-
+-
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40906,37 +40988,53 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
-+$as_echo_n "checking for errno declaration... " >&6; }
-+if test "${ac_cv_have_errno_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
--fi
+- $as_echo_n "(cached) " >&6
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VSNPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_ASPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
++ ac_have_decl=1
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+#include <errno.h>
-+int
-+main ()
-+{
-+int i = (int)errno
-+ ;
-+ return 0;
-+}
++
++for ac_func in snprintf vsnprintf asprintf vasprintf
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40957,23 +41055,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_errno_decl=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-+ ac_cv_have_errno_decl=no
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++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; }
-+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
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40983,9 +41075,52 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
++$as_echo_n "checking for C99 vsnprintf... " >&6; }
++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++
++#include <sys/types.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <stdlib.h>
++void foo(const char *format, ...) {
++ va_list ap;
++ int len;
++ char buf[20];
++ long long l = 1234567890;
++ l *= 100;
++
++ va_start(ap, format);
++ len = vsnprintf(buf, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(1);
++
++ va_start(ap, format);
++ len = vsnprintf(0, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(2);
++
++ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
++
++ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
++ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
++ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
++ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
++
++ exit(0);
++}
++main() { foo("hello"); }
++
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41004,18 +41139,27 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
++ libreplace_cv_HAVE_C99_VSNPRINTF=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
- ac_header_preproc=no
--fi
-+ fi
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -41050,81 +41194,32 @@
-{ $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 secure mkstemp" >&5
-+$as_echo_n "checking for secure mkstemp... " >&6; }
-+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+main() {
-+ struct stat st;
-+ char tpl[20]="/tmp/test.XXXXXX";
-+ int fd = mkstemp(tpl);
-+ if (fd == -1) exit(1);
-+ unlink(tpl);
-+ if (fstat(fd, &st) != 0) exit(1);
-+ if ((st.st_mode & 0777) != 0600) exit(1);
-+ exit(0);
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
-+else
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=no
fi
-ac_res=`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_SECURE_MKSTEMP" >&5
-+$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
-+if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
-+
-+$as_echo "#define HAVE_SECURE_MKSTEMP 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 stdio.h strings.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
- for termlib in ncurses curses termcap terminfo termlib; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_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
-+fi
-+
-+done
-+
-+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
-+ ac_have_decl=1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
++$as_echo_n "checking for va_copy... " >&6; }
++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib} $LIBS"
@@ -41134,8 +41229,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ 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
@@ -41144,15 +41237,18 @@
-extern "C"
-#endif
-char tgetent ();
--int
--main ()
--{
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++va_list ap1,ap2;
+ int
+ main ()
+ {
-return tgetent ();
-- ;
-- return 0;
--}
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
++va_copy(ap1,ap2);
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -41176,22 +41272,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+ ac_have_decl=1
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE_VA_COPY=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-+ ac_have_decl=0
++ libreplace_cv_HAVE_VA_COPY=no
fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -41200,38 +41297,29 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- TERMLIBS="-l${termlib}"; break
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
++
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
++
fi
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ASPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+ ac_have_decl=1
++if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
++$as_echo_n "checking for __va_copy... " >&6; }
++if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $TERMLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VASPRINTF $ac_have_decl
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -41243,21 +41331,18 @@
-extern "C"
-#endif
-char rl_callback_handler_install ();
--int
--main ()
--{
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++va_list ap1,ap2;
+ int
+ main ()
+ {
-return rl_callback_handler_install ();
-- ;
-- return 0;
--}
-+for ac_func in snprintf vsnprintf asprintf vasprintf
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++__va_copy(ap1,ap2);
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -41281,19 +41366,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_callback_handler_install=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE___VA_COPY=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_lib_readline_rl_callback_handler_install=no
++ libreplace_cv_HAVE___VA_COPY=no
fi
-+done
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
@@ -41301,93 +41390,46 @@
- TERMCPPFLAGS="-I$with_readline/include"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
- TERMLIBS="-lreadline $TERMLIBS"
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-+{ $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
++{ $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
- break
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=cross
- else
+-else
- TERMLIBS= CPPFLAGS=$_cppflags
-fi
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
--fi
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) {
-+ va_list ap;
-+ int len;
-+ char buf[20];
-+ long long l = 1234567890;
-+ l *= 100;
-
+ fi
+-
-done
-+ va_start(ap, format);
-+ len = vsnprintf(buf, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(1);
-
-+ va_start(ap, format);
-+ len = vsnprintf(0, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(2);
-
+-
+-
- LDFLAGS=$_ldflags
- ;;
- esac
-+ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
-+
-+ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
-+ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
-+ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
-+ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
-+
-+ exit(0);
-+}
-+main() { foo("hello"); }
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=yes
- else
+-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-+ libreplace_cv_HAVE_C99_VSNPRINTF=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
-+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-+$as_echo "#define HAVE_C99_VSNPRINTF 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 va_copy" >&5
-+$as_echo_n "checking for va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -41408,13 +41450,12 @@
-char rl_completion_matches ();
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <stdio.h>
int
main ()
{
-return rl_completion_matches ();
-+va_copy(ap1,ap2);
++printf("%s\n", __FUNCTION__);
;
return 0;
}
@@ -41441,46 +41482,45 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_completion_matches=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_VA_COPY=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
-
- ac_cv_lib_readline_rl_completion_matches=no
-+ libreplace_cv_HAVE_VA_COPY=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++ libreplace_cv_HAVE_FUNCTION_MACRO=no
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_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_NEW_LIBREADLINE 1
-_ACEOF
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
-
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_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
+
-# 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
-+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 :
++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
@@ -41491,10 +41531,9 @@
-/* end confdefs.h. */
-#include <readline/readline.h>
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <stdio.h>
int
main ()
{
@@ -41502,7 +41541,7 @@
- (void) rl_event_hook;
-#endif
-
-+__va_copy(ap1,ap2);
++printf("%s\n", __func__);
;
return 0;
}
@@ -41526,49 +41565,65 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_rl_event_hook=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE___VA_COPY=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_func_MACRO=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_rl_event_hook=no
-+ libreplace_cv_HAVE___VA_COPY=no
++ libreplace_cv_HAVE_func_MACRO=no
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $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
+
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 1
-_ACEOF
--
--
++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
+
++ fi
++fi
+
-else
-- cat >>confdefs.h <<_ACEOF
++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 HAVE_DECL_RL_EVENT_HOOK 0
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
++fi
++
++done
++
++
++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
++
++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
fi
-+fi
--
+
-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
-$as_echo_n "checking for history_list in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_history_list+set}" = set; then
-+{ $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 "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
++$as_echo_n "checking for setenv declaration... " >&6; }
++if test "${ac_cv_have_setenv_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -41587,14 +41642,14 @@
-extern "C"
-#endif
-char history_list ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdio.h>
++#include <stdlib.h>
int
main ()
{
-return history_list ();
-+printf("%s\n", __FUNCTION__);
++int i = (int)setenv
;
return 0;
}
@@ -41622,45 +41677,56 @@
- }; then
- ac_cv_lib_readline_history_list=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_FUNCTION_MACRO=yes
++ ac_cv_have_setenv_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_history_list=no
--fi
++ ac_cv_have_setenv_decl=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+ libreplace_cv_HAVE_FUNCTION_MACRO=no
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
-$as_echo "$ac_cv_lib_readline_history_list" >&6; }
-if test "x$ac_cv_lib_readline_history_list" = x""yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HISTORY_LIST 1
--_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
++
++ fi
++
++for ac_func in setenv unsetenv
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++done
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
-###############################################
-# test for where we get yp_get_default_domain() from
-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
-+$as_echo_n "checking for __func__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
@@ -41680,12 +41746,12 @@
-char yp_get_default_domain ();
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdio.h>
++#include <unistd.h>
int
main ()
{
-return yp_get_default_domain ();
-+printf("%s\n", __func__);
++int i = (int)environ
;
return 0;
}
@@ -41720,40 +41786,38 @@
- }; then
- ac_cv_search_yp_get_default_domain=$ac_res
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_func_MACRO=yes
++ ac_cv_have_environ_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_func_MACRO=no
++ ac_cv_have_environ_decl=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
-+ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
++$as_echo "$ac_cv_have_environ_decl" >&6; }
++ if test x"$ac_cv_have_environ_decl" = x"yes"; then
-+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
++$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
-+ fi
- fi
+-fi
++ fi
++
++
++for ac_func in strnlen
++do :
++ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
++if test "x$ac_cv_func_strnlen" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STRNLEN 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- break
-+for ac_header in sys/param.h limits.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
fi
-+
done
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- :
@@ -41768,11 +41832,20 @@
-ac_res=$ac_cv_search_yp_get_default_domain
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
--fi
+ fi
++done
-+ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
-+if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
-for ac_func in yp_get_default_domain
-do
@@ -41787,25 +41860,33 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++# this test disabled as we don't actually need __VA_ARGS__ yet
++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
-+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
++#define eprintf(...) fprintf(stderr, __VA_ARGS__)
++eprintf("bla", "bar");
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
-#undef $ac_func
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
++
++fi
++rm -f conftest.err conftest.$ac_ext
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41820,20 +41901,27 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
-+$as_echo_n "checking for setenv declaration... " >&6; }
-+if test "${ac_cv_have_setenv_decl+set}" = set; then :
+
++{ $as_echo "$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
++
++#include <sys/types.h>
++#if STDC_HEADERS
+#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <signal.h>
int
main ()
{
-return $ac_func ();
-+int i = (int)setenv
++sig_atomic_t i = 0
;
return 0;
}
@@ -41861,13 +41949,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setenv_decl=yes
++ libreplace_cv_sig_atomic_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_have_setenv_decl=no
++ libreplace_cv_sig_atomic_t=no
fi
-
-rm -rf conftest.dSYM
@@ -41882,196 +41970,32 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
-+$as_echo "$ac_cv_have_setenv_decl" >&6; }
-+ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+for ac_func in setenv unsetenv
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -40171,101 +9466,56 @@
- done
-
-
--# Check if we have execl, if not we need to compile smbrun.
--
--for ac_func in execl
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
-+$as_echo_n "checking for environ declaration... " >&6; }
-+if test "${ac_cv_have_environ_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#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}: 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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
- int
- main ()
- {
--return $ac_func ();
-+int i = (int)environ
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_environ_decl=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ ac_cv_have_environ_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
-+$as_echo "$ac_cv_have_environ_decl" >&6; }
-+ if test x"$ac_cv_have_environ_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+for ac_func in strnlen
-+do :
-+ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-+if test "x$ac_cv_func_strnlen" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRNLEN 1
-+_ACEOF
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -40273,353 +9523,184 @@
- fi
- done
-
--if test x"$ac_cv_func_execl" = x"no"; then
-- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
-fi
+-done
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
-+# this test disabled as we don't actually need __VA_ARGS__ yet
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
-+eprintf("bla", "bar");
-
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-
-+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
-
+fi
-+rm -f conftest.err conftest.$ac_ext
+-# Check if we have execl, if not we need to compile smbrun.
--for ac_func in getcwd fchown chmod fchmod mknod mknod64
+-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 sig_atomic_t type" >&5
-+$as_echo_n "checking for sig_atomic_t type... " >&6; }
-+if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
$as_echo_n "(cached) " >&6
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -42092,9 +42016,10 @@
-#else
-# include <assert.h>
-#endif
++else
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
@@ -42109,18 +42034,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
++#include <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
#endif
-
-+#include <signal.h>
int
main ()
{
-return $ac_func ();
-+sig_atomic_t i = 0
++int fd = open("/dev/null", O_DIRECT);
;
return 0;
}
@@ -42148,13 +42071,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_sig_atomic_t=yes
++ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_sig_atomic_t=no
++ libreplace_cv_HAVE_OPEN_O_DIRECT=no
fi
-
-rm -rf conftest.dSYM
@@ -42172,25 +42095,33 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
-+$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
-+
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
- fi
+-fi
-done
++$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
+-if test x"$ac_cv_func_execl" = x"no"; then
+- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+ fi
--for ac_func in strtol
+
+-
+-
+-
+-
+-
+-for ac_func in getcwd fchown chmod fchmod mknod mknod64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
-+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
++$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++if test "${libreplace_cv_volatile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42213,11 +42144,9 @@
-#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. */
@@ -42230,16 +42159,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
- #endif
--
+-#endif
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
int
main ()
{
-return $ac_func ();
-+int fd = open("/dev/null", O_DIRECT);
++volatile int i = 0
;
return 0;
}
@@ -42267,13 +42196,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
++ libreplace_cv_volatile=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=no
++ libreplace_cv_volatile=no
fi
-
-rm -rf conftest.dSYM
@@ -42291,26 +42220,29 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
++$as_echo "$libreplace_cv_volatile" >&6; }
++if test x"$libreplace_cv_volatile" = x"yes"; then
-fi
-done
-+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
+fi
-
--for ac_func in strchr chflags
+-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 that the C compiler understands volatile" >&5
-+$as_echo_n "checking that the C compiler understands volatile... " >&6; }
-+if test "${libreplace_cv_volatile+set}" = set; then :
++# filesys
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42318,47 +42250,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+volatile int i = 0
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_volatile=yes
-+else
-+ libreplace_cv_volatile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
-
+-
-#undef $ac_func
-+fi
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -42372,17 +42282,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_hdr>
@@ -42453,11 +42352,9 @@
fi
-done
-
--
--
-
--for ac_func in getrlimit fsync fdatasync setpgid
+-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
@@ -42498,7 +42395,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40627,104 +9708,56 @@
+@@ -40523,103 +9706,56 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -42597,8 +42494,7 @@
-
-
--
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-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
@@ -42637,7 +42533,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40732,170 +9765,148 @@
+@@ -40627,167 +9763,148 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -42740,9 +42636,10 @@
_ACEOF
fi
-+
- done
+-done
++done
+
+for ac_header in sys/acl.h acl/libacl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -42758,21 +42655,7 @@
+done
-+# select
-+for ac_header in sys/select.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SELECT_H 1
-+_ACEOF
-
-+fi
-
-+done
-
-
--for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+-for ac_func in 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
@@ -42782,15 +42665,13 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# time
-+for ac_header in sys/time.h utime.h
++# select
++for ac_header in sys/select.h
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_SELECT_H 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -42798,21 +42679,21 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
++done
-#undef $ac_func
-+done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42827,6 +42708,21 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++# time
++for ac_header in sys/time.h utime.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
@@ -42908,7 +42804,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40904,530 +9915,311 @@
+@@ -40796,638 +9913,311 @@
done
@@ -42918,7 +42814,8 @@
-
-
-
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-
+-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
@@ -43014,13 +42911,13 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_header_sys_wait_h=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++ ac_cv_header_sys_wait_h=no
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -43058,7 +42955,7 @@
+done
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+-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
@@ -43085,13 +42982,13 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef $ac_func
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -43180,6 +43077,7 @@
-
-
-
+-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
@@ -43190,7 +43088,7 @@
+fi
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
+-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
@@ -43341,7 +43239,7 @@
+done
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43431,13 +43329,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_have_getpwent_r_decl=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_have_getpwent_r_decl=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43448,52 +43345,145 @@
- 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_getpwent_r_decl" >&5
+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
-+
+
+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
-+
+
+ fi
-+
+
+-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
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ $ac_includes_default
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ #include <unistd.h>
+ #include <pwd.h>
+
+ struct passwd *getpwent_r(struct passwd *src, char *buf, int 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. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+ }
-+
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-
--fi
--done
++
+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
+
-+else
-+
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
+-fi
+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-done
+-
+-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_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 :
@@ -43638,7 +43628,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -41436,446 +10228,210 @@
+@@ -41436,344 +10226,210 @@
done
@@ -43795,11 +43785,16 @@
-#endif
+ #include <unistd.h>
+ #include <grp.h>
-
--#undef $ac_func
++
+ struct group *getgrent_r(struct group *src, char *buf, int buflen)
+ {
+-#undef $ac_func
++ #ifndef HAVE_GETGRENT_R_DECL
++ #error missing getgrent_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. */
@@ -43813,11 +43808,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETGRENT_R_DECL
-+ #error missing getgrent_r prototype
-+ #endif
-+ return NULL;
-+
+ }
-int
@@ -43990,8 +43980,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
--fi
+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_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 \
@@ -44004,50 +43996,17 @@
-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_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
-
-
++
++
+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-
-
--for ac_func in syslog vsyslog timegm
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--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
++
++
+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. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++
++
+# locale
+for ac_header in ctype.h locale.h
+do :
@@ -44055,36 +44014,16 @@
+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
-
--#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;
--}
+
++
+# glob
+for ac_header in fnmatch.h
+do :
@@ -44093,49 +44032,12 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_FNMATCH_H 1
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-- eval "$as_ac_var=no"
fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+done
+
-+
+ done
+
+
+# shmem
+for ac_header in sys/ipc.h sys/mman.h sys/shm.h
+do :
@@ -44143,18 +44045,13 @@
+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
++fi
-+done
-
-
--for ac_func in setlocale nl_langinfo
+-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
@@ -44164,6 +44061,9 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
++done
++
++
+# terminal
+for ac_header in termios.h termio.h sys/termio.h
+do :
@@ -44186,16 +44086,16 @@
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+fi
++
++done
++
++
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-+
-+
-+
+save_LIBS="$LIBS"
+LIBS=""
@@ -44212,7 +44112,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41883,100 +10439,85 @@
+@@ -41781,101 +10437,85 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44330,7 +44230,8 @@
done
--for ac_func in nanosleep
+-
+-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
@@ -44369,7 +44270,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41984,899 +10525,611 @@
+@@ -41883,1000 +10523,611 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44480,55 +44381,72 @@
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- else
++else
+ libreplace_cv_shl=yes
-+fi
-+done
+ fi
+ done
+-for ac_func in nanosleep
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
+$as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; }
+if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS $LIBS"
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ $ac_includes_default
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ #include <dlfcn.h>
+-#undef $ac_func
+ void *dlopen(const char* filename, unsigned int flags)
+ {
-+ return 0;
-
-- { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
--$as_echo_n "checking for nanosleep in -lrt... " >&6; }
--if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ }
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
--char nanosleep ();
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++ return 0;
++
++ }
+
-int
-main ()
-{
--return nanosleep ();
+-return $ac_func ();
- ;
- return 0;
-}
@@ -44554,8 +44472,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_rt_nanosleep=yes;
-- ac_cv_lib_ext_rt=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
@@ -44564,24 +44481,13 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_lib_ext_rt_nanosleep=no;
-- ac_cv_lib_ext_rt=no
--fi
+- eval "$as_ac_var=no"
+ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
-
--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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
--$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
-- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_NANOSLEEP 1
--_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
+$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
+if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
@@ -44590,87 +44496,71 @@
+$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
-
--LIBS=$ac_check_lib_ext_save_LIBS
-
--if test $ac_cv_lib_ext_rt = yes; then
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+
+-else
+
+if test x"${libreplace_cv_dlfcn}" = x"yes";then
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+fi
-- case "$LIBS" in
-- *-lrt*)
-- ;;
-- *)
-- LIBS="-lrt $LIBS"
-- ;;
-- esac
+LIBDL="$LIBS"
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS $LIBS"
+LIBS="$save_LIBS"
+ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
+if test "x$ac_cv_func_getpass" = x""yes; then :
+ libreplace_cv_HAVE_GETPASS=yes
- fi
++fi
+ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
+if test "x$ac_cv_func_getpassphrase" = x""yes; then :
+ libreplace_cv_HAVE_GETPASSPHRASE=yes
- fi
--done
++fi
+if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
+- { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
+-$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
+$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
-
-
++
++
+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-
--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_n "(cached) " >&6
++
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
++else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
++$as_echo_n "checking whether getpass should be replaced... " >&6; }
++if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
-+$as_echo_n "checking whether getpass should be replaced... " >&6; }
-+if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
--#undef $ac_func
++
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -44678,21 +44568,15 @@
-#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 "confdefs.h"
+#define NO_CONFIG_H
+#include "$libreplacedir/getpass.c"
-
++
int
main ()
{
--return $ac_func ();
+-return nanosleep ();
+
;
return 0;
@@ -44719,7 +44603,8 @@
- 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_REPLACE_GETPASS=yes
else
@@ -44730,39 +44615,48 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CPPFLAGS="$SAVE_CPPFLAGS"
-- eval "$as_ac_var=no"
+- ac_cv_lib_ext_rt_nanosleep=no;
+- ac_cv_lib_ext_rt=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
-+
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
+
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_NANOSLEEP 1
-_ACEOF
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 whether strptime is available and works" >&5
+$as_echo_n "checking whether strptime is available and works... " >&6; }
+if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+- case "$LIBS" in
+- *-lrt*)
+- ;;
+- *)
+- LIBS="-lrt $LIBS"
+- ;;
+- esac
+ if test "$cross_compiling" = yes; then :
+ libreplace_cv_STRPTIME_OK="assuming not"
+else
@@ -44772,36 +44666,39 @@
+ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME
+ #include "$libreplacedir/test/strptime.c"
--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_n "(cached) " >&6
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_STRPTIME_OK=yes
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
++else
+ libreplace_cv_STRPTIME_OK=no
-+fi
+ fi
+-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-done
+
+
+fi
-+
-+
-+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
+$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
-+
+
+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
-+
+
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
+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_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44940,6 +44837,174 @@
done
+-
+-
+-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 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
+- 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_READDIR_NEEDED="assuming not"
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++#define 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. */
+-#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
++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>
+ int
+ main ()
+ {
+-return $ac_func ();
++int i = (int)dirfd
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_dirfd_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ ac_cv_have_dirfd_decl=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
++$as_echo "$ac_cv_have_dirfd_decl" >&6; }
++ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
++
++$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
++
++ fi
++
++
++#
++# try to replace with getdirentries() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdirentries
++do :
++ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
++if test "x$ac_cv_func_getdirentries" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDIRENTRIES 1
+ _ACEOF
+
+ fi
+ done
+
+-
-for ac_header in sys/mman.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44947,9 +45012,9 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken 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 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
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -44965,18 +45030,11 @@
-_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. */
-$ac_includes_default
-#include <$ac_header>
-+
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -44996,22 +45054,18 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_NEEDED=no
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-+ 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
++ $ac_includes_default
-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; }
++ #include <dirent.h>
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45023,17 +45077,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+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
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45055,14 +45099,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ long telldir(const DIR *dir)
++ {
- ac_header_preproc=no
- fi
-+done
+-fi
++ return 0;
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++ }
++
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -45097,10 +45149,7 @@
-{ $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 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
+- $as_echo_n "(cached) " >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
@@ -45108,66 +45157,41 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++
++ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <dirent.h>
-+int
-+main ()
-+{
-+int i = (int)dirfd
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_dirfd_decl=yes
-+else
-+ ac_cv_have_dirfd_decl=no
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
-+$as_echo "$ac_cv_have_dirfd_decl" >&6; }
-+ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+#
-+# try to replace with getdirentries() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdirentries
-+do :
-+ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
-+if test "x$ac_cv_func_getdirentries" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_GETDIRENTRIES 1
- _ACEOF
+-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--
- done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
++$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
++if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
+-done
+
-# setbuffer, shmget, shm_open are needed for smbtorture
--
--
++$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
+
+
-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 "$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 :
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
++$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
++if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -45194,7 +45218,7 @@
-#endif
+ #include <dirent.h>
+
-+ long telldir(const DIR *dir)
++ int seekdir(DIR *dir, long ofs)
+ {
-#undef $ac_func
@@ -45247,7 +45271,7 @@
- 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
@@ -45255,7 +45279,7 @@
- eval "$as_ac_var=no"
-fi
-+ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
++ 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 \
@@ -45275,12 +45299,12 @@
fi
-done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
-+$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
-+if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
++{ $as_echo "$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 :
-+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
++$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
-for ac_func in gettext dgettext
-do
@@ -45291,10 +45315,9 @@
+
+fi
+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
-+$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
-+if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
++{ $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
@@ -45302,6 +45325,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.
@@ -45312,20 +45342,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>
-+
-+ int seekdir(DIR *dir, long ofs)
-+ {
-#undef $ac_func
-+ return 0;
++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
@@ -45340,7 +45382,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ }
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-int
-main ()
@@ -45349,7 +45391,7 @@
- ;
- return 0;
-}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -45372,21 +45414,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} repdir_getdirentries.o"
++ libreplace_cv_READDIR_NEEDED=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -45395,24 +45435,28 @@
-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
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -45420,9 +45464,9 @@
- { $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'}
@@ -45451,7 +45495,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
@@ -45475,11 +45520,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
@@ -45488,10 +45533,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
@@ -45503,52 +45548,12 @@
-$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} 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>
-+
-+#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
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45567,29 +45572,20 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+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} 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
@@ -45625,19 +45621,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} 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
@@ -45645,14 +45628,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
@@ -45690,7 +45679,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -42885,105 +11138,25 @@
+@@ -42885,105 +11136,25 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -45806,7 +45795,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -42991,1042 +11164,719 @@
+@@ -42991,1042 +11162,653 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -45858,23 +45847,23 @@
+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 :
+ test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS"
-+
-+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
-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_CRYPT 1" >>confdefs.h
++
+else
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
fi
@@ -46580,20 +46569,20 @@
+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; }
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
-+fi
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR 1
++_ACEOF
+
++
+fi
+
++fi
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND 1
+cat >>confdefs.h <<_ACEOF
+#define $ac_tr_hdr 1
_ACEOF
@@ -46725,10 +46714,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
-fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
@@ -47187,82 +47176,150 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-
+-
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-+ libreplace_cv_HAVE_UNIXSOCKET=yes
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PTRACE 1
-+else
-+
+-_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
+
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+{ $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
+#define HAVE_CONNECT 1
- _ACEOF
++_ACEOF
+fi
+done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+if test x"$ac_cv_func_connect" = x"no"; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- LIBUNWIND_PTRACE=""
+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
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -44034,106 +11816,65 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char connect ();
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return $ac_func ();
+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
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_nsl_s_connect=yes;
+ ac_cv_lib_ext_nsl_s=yes
-+else
+ 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
@@ -47273,14 +47330,23 @@
-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_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
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CONNECT 1
-+_ACEOF
+ _ACEOF
-+fi
+ fi
+-done
+LIBS=$ac_check_lib_ext_save_LIBS
+if test $ac_cv_lib_ext_nsl_s = yes; then :
@@ -47304,13 +47370,13 @@
+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
-
--for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+-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 :
@@ -47342,7 +47408,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44034,106 +11884,65 @@
+@@ -44141,101 +11882,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47392,14 +47458,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_lib_ext_nsl_connect=no;
+ ac_cv_lib_ext_nsl=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
++ if test $ac_cv_lib_ext_nsl_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47411,22 +47484,13 @@
-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_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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CONNECT 1
- _ACEOF
-
- fi
--done
+LIBS=$ac_check_lib_ext_save_LIBS
+
+if test $ac_cv_lib_ext_nsl = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBNSL 1
-+_ACEOF
+ _ACEOF
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
@@ -47435,17 +47499,18 @@
+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-
-
-+fi
-
-
++
++
+ fi
+-done
++
++
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
--for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+-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
@@ -47482,7 +47547,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44141,101 +11950,65 @@
+@@ -44243,102 +11948,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47581,9 +47646,9 @@
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
-+
--for ac_func in __getcwd _getcwd
+
+-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
@@ -47621,7 +47686,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44243,102 +12016,88 @@
+@@ -44346,105 +12014,88 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47671,21 +47736,14 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_inet_connect=no;
+ ac_cv_lib_ext_inet=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_inet_connect" >&5
-+$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
-+ if test $ac_cv_lib_ext_inet_connect = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
-+_ACEOF
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47697,14 +47755,23 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_inet = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
++$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
++ if test $ac_cv_lib_ext_inet_connect = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_CONNECT 1
+ _ACEOF
+
+ fi
+-done
++LIBS=$ac_check_lib_ext_save_LIBS
+
++if test $ac_cv_lib_ext_inet = yes; then :
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBINET 1
+_ACEOF
-+
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-linet*)
+ ;;
@@ -47712,77 +47779,76 @@
+ LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
+
+
+fi
+ if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
+ test x"$ac_cv_lib_ext_nsl_connect" = x"yes" ||
+ test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
+ test x"$ac_cv_lib_ext_inet_connect" = x"yes"
+ then
-+
+
+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
-+
+
+ fi
+fi
-+
-+for ac_func in gethostbyname
-+do :
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
- _ACEOF
- fi
- done
-
-+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
+-for ac_func in _stat _lstat _fstat __stat __lstat __fstat
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in gethostbyname
++do :
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
++done
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
+
-#undef $ac_func
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
++$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44346,105 +12105,65 @@
+@@ -44452,107 +12103,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47867,7 +47933,7 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL_S 1
+_ACEOF
-+
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl_s*)
+ ;;
@@ -47884,13 +47950,13 @@
+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+
+-for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
+ { $as_echo "$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 :
@@ -47922,7 +47988,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44452,107 +12171,65 @@
+@@ -44560,105 +12169,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -48002,12 +48068,12 @@
fi
-done
+LIBS=$ac_check_lib_ext_save_LIBS
-
++
+if test $ac_cv_lib_ext_nsl = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
+_ACEOF
-
++
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -48025,7 +48091,7 @@
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-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
@@ -48062,7 +48128,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44560,105 +12237,87 @@
+@@ -44666,210 +12235,87 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -48141,13 +48207,47 @@
fi
-done
+-
+-
+-
+-
+-
+-
+LIBS=$ac_check_lib_ext_save_LIBS
+-for ac_func in getdents __getdents _lseek __lseek _read __read
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+if test $ac_cv_lib_ext_socket = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-#undef $ac_func
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lsocket*)
+ ;;
@@ -48156,74 +48256,134 @@
+ ;;
+ esac
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+ if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
+ then
+- eval "$as_ac_var=no"
+-fi
+$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++for ac_func in if_nametoindex
++do :
++ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_IF_NAMETOINDEX 1
+ _ACEOF
--for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
+ fi
+ done
+
++if test x"$ac_cv_func_if_nametoindex" = x"no"; then
+
+
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
+
+
+
+-for ac_func in 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_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
++$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
++if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in if_nametoindex
-+do :
-+ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-+if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_IF_NAMETOINDEX 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-+done
-+
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
-+
-+
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef $ac_func
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
-+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
-+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44666,2967 +12325,2216 @@
+@@ -44877,2756 +12323,2216 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -48270,29 +48430,45 @@
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_ipv6_if_nametoindex=yes;
+ ac_cv_lib_ext_ipv6=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_ipv6_if_nametoindex=no;
+ ac_cv_lib_ext_ipv6=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
+ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_IF_NAMETOINDEX 1
-+_ACEOF
-+
-+fi
+ _ACEOF
+
+ fi
+-done
+LIBS=$ac_check_lib_ext_save_LIBS
+
+if test $ac_cv_lib_ext_ipv6 = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBIPV6 1
+_ACEOF
-+
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lipv6*)
+ ;;
@@ -48300,52 +48476,95 @@
+ LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
+
+
+fi
+ if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
+ then
-+
+
+$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
-+
+
+ fi
+fi
-+
+
+# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
+old_LIBS=$LIBS
+LIBS="${LIBREPLACE_NETWORK_LIBS}"
+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
-+
+
+-for ac_func in _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_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+for ac_func in socketpair
+do :
+ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
+if test "x$ac_cv_func_socketpair" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKETPAIR 1
-+_ACEOF
-+
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* 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} socketpair.o"
+fi
+done
-+
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
+$as_echo_n "checking for broken inet_ntoa... " >&6; }
+if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_REPLACE_INET_NTOA=cross
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-- eval "$as_ac_var=no"
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
@@ -48357,10 +48576,36 @@
+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
+ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
+exit(1);}
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_REPLACE_INET_NTOA=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ libreplace_cv_REPLACE_INET_NTOA=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -48396,7 +48641,7 @@
done
+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+
+
+$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
@@ -48424,7 +48669,7 @@
+#define HAVE_INET_NTOP 1
+_ACEOF
--for ac_func in getdents __getdents _lseek __lseek _read __read
+-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
@@ -48599,7 +48844,7 @@
+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
@@ -48607,14 +48852,20 @@
+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
--for ac_func in getdirentries _write __write _fork __fork
++fi
+
+
+-for ac_func in pread _pread __pread pread64 _pread64 __pread64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -48624,23 +48875,17 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+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. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
-+$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
-+if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-#undef $ac_func
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -48711,12 +48956,26 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++ libreplace_cv_HAVE_GETIFADDRS=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
++
++$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ libreplace_cv_HAVE_GETIFADDRS=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48727,59 +48986,22 @@
- 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 _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
++
+##################
+# 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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=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
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
++/* end confdefs.h. */
++
+#define HAVE_IFACE_GETIFADDRS 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48790,7 +49012,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
@@ -48800,97 +49022,32 @@
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
+ fi
+-done
+{ $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} getifaddrs.o"
+fi
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+if test $iface = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
+$as_echo_n "checking for iface AIX... " >&6; }
+if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
--fi
++else
++
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_AIX=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end 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
+#define HAVE_IFACE_AIX 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48902,7 +49059,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_AIX=yes
+else
@@ -48912,8 +49069,7 @@
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- fi
--done
++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
@@ -48924,19 +49080,27 @@
+fi
+-for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+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
-
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+#define HAVE_IFACE_IFCONF 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48947,7 +49111,9 @@
+#include "$libreplacedir/getifaddrs.c"
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
+ _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
@@ -48956,34 +49122,23 @@
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
-
++
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-
++
+fi
+fi
-
--for ac_func in __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 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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFREQ=cross
@@ -49029,11 +49184,17 @@
+if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
-
--#undef $ac_func
++
+fi
+fi
+-#undef $ac_func
++{ $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
+
-/* 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. */
@@ -49047,12 +49208,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+{ $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
-+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
@@ -49150,11 +49305,7 @@
+echo "LIBREPLACE_NETWORK_CHECKS: END"
-+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 open64 _open64 __open64 creat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49164,56 +49315,32 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+LIBREPLACE_OBJS=""
-+for obj in ${LIBREPLACEOBJ}; do
-+ LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
-+done
-+
-+
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-+
-+
-+for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_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
++CPPFLAGS="${SAVE_CPPFLAGS}"
-/* 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
++LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++LIBREPLACE_OBJS=""
++for obj in ${LIBREPLACEOBJ}; do
++ LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
+done
-#undef $ac_func
-+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
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -49228,7 +49355,9 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-int
-main ()
@@ -49237,9 +49366,8 @@
- ;
- return 0;
-}
-+done
+
-+for ac_header in limits.h float.h pthread.h libintl.h
++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"
@@ -49275,25 +49403,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
--fi
-+fi
-+
-+done
-+
-+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
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49301,10 +49416,9 @@
-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/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h
++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"
@@ -49316,38 +49430,11 @@
_ACEOF
fi
-+
- done
+-done
-+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
-
+done
-+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"
-+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 pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+-for ac_func in prctl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49357,7 +49444,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++for ac_header in limits.h float.h pthread.h libintl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49387,12 +49474,14 @@
+done
-#undef $ac_func
-+for ac_header in sys/sysmacros.h
++for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.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
-/* Override any GCC internal prototype to avoid an error.
@@ -49419,7 +49508,7 @@
-}
+done
+
-+for ac_header in sys/syslog.h syslog.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
+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"
@@ -49470,7 +49559,7 @@
- if test "x$as_val" = x""yes; then
+done
+
-+for ac_header in langinfo.h locale.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"
@@ -49486,228 +49575,43 @@
+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_func in open64 _open64 __open64 creat64
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in netgroup.h
++for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netgroup_h" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETGROUP_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+fi
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
+-#ifdef HAVE_SYS_PRCTL_H
+-#include <sys/prctl.h>
-#endif
-+done
-
--#undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#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
-+for ac_header in rpcsvc/yp_prot.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
- #endif
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
-+"
-+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_RPCSVC_YP_PROT_H 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+done
-+
-+
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SYS_MODE_H 1
- _ACEOF
-
- fi
-+
- done
-
-
--for ac_func in prctl
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+for ac_header in CoreFoundation/CFStringEncodingConverter.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+else
-+ for ac_header in CFStringEncodingConverter.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
-+_ACEOF
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+fi
--#undef $ac_func
-+done
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+fi
-
-int
-main ()
-{
--return $ac_func ();
+-int i; i = prtcl(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
@@ -49716,113 +49620,41 @@
- (exit $ac_status); } && {
- test -z "$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
+- } && test -s conftest.$ac_objext; then
+done
-- eval "$as_ac_var=no"
--fi
-+CPPFLAGS="$old_CPPFLAGS"
-
--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
-+# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
-+# subdirectory of headers.
-+for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRCTL 1
++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"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- fi
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
- done
++done
++for ac_header in sys/sysmacros.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_SYSMACROS_H 1
++_ACEOF
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+#
-+# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-+# This causes configure to fail to detect it. Check for shadow separately on HPUX.
-+#
-+case "$host_os" in
-+ *hpux*)
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--
--#ifdef HAVE_SYS_PRCTL_H
--#include <sys/prctl.h>
--#endif
--
-+#include <shadow.h>
- int
- main ()
- {
--int i; i = prtcl(0);
-+struct spwd testme
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRCTL 1
--_ACEOF
--
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_shadow_h=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ ac_cv_header_shadow_h=no
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ if test x"$ac_cv_header_shadow_h" = x"yes"; then
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
+
-#
-#
-#
@@ -49840,11 +49672,19 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_header in sys/syslog.h syslog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#include <unistd.h>
-#include <sys/utsname.h>
-main() {
@@ -49852,7 +49692,8 @@
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- int libc_major = __GLIBC__;
- int libc_minor = __GLIBC_MINOR__;
--
++fi
+
- if (libc_major < 2)
- exit(1);
- if ((libc_major == 2) && (libc_minor <= 3))
@@ -49860,9 +49701,17 @@
-#endif
- exit(0);
-}
-+$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
++done
--_ACEOF
++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
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -49878,9 +49727,7 @@
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ fi
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
@@ -49892,13 +49739,6 @@
- $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
-+for ac_header in shadow.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
-+if test "x$ac_cv_header_shadow_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SHADOW_H 1
-+_ACEOF
-( exit $ac_status )
-linux_getgrouplist_ok=no
@@ -49913,14 +49753,12 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETGROUPLIST 1
-+for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.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
- fi
@@ -49938,38 +49776,36 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+done
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+for ac_header in syscall.h sys/syscall.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
++done
-#undef $ac_func
-+done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -49983,7 +49819,12 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
++for ac_header in rpcsvc/yp_prot.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
++#if HAVE_RPC_RPC_H
++#include <rpc/rpc.h>
+ #endif
-int
-main ()
@@ -49992,14 +49833,10 @@
- ;
- return 0;
-}
-+for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++"
++if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_RPCSVC_YP_PROT_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -50043,23 +49880,24 @@
- if test "x$as_val" = x""yes; then
+done
+
-+for ac_header in sys/ea.h sys/proplist.h
++
++## These fail to compile on IRIX so just check for their presence
++for ac_header in sys/mode.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/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_MODE_H 1
_ACEOF
fi
-done
--
+
- ;;
-esac
--
++done
+
-#
-# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
-#
@@ -50069,12 +49907,20 @@
-$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# Look for Darwin headers
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-Iinclude $CPPFLAGS"
++for ac_header in CoreFoundation/CFStringEncodingConverter.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+done
-
+-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
@@ -50087,15 +49933,7 @@
- ;
- return 0;
-}
-+for ac_header in sys/cdefs.h glob.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -50118,11 +49956,21 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_stat64=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ for ac_header in CFStringEncodingConverter.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
++_ACEOF
++
++fi
++done
+
fi
-rm -rf conftest.dSYM
@@ -50132,12 +49980,14 @@
-$as_echo "$ac_cv_func_stat64" >&6; }
- if test x$ac_cv_func_stat64 = xyes ; then
+done
++
++CPPFLAGS="$old_CPPFLAGS"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT64 1
-+
-+# For experimental utmp support (lastlog on some BSD-like systems)
-+for ac_header in utmp.h utmpx.h lastlog.h
++# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
++# subdirectory of headers.
++for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -50166,14 +50016,24 @@
-#endif
-#include <sys/stat.h>
--int
--main ()
--{
++#
++# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
++# This causes configure to fail to detect it. Check for shadow separately on HPUX.
++#
++case "$host_os" in
++ *hpux*)
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <shadow.h>
+ int
+ main ()
+ {
-struct stat64 st64; exit(lstat64(".",&st64));
-- ;
-- return 0;
--}
--_ACEOF
++struct spwd testme
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -50196,34 +50056,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_lstat64=yes
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-+$as_echo_n "checking size of int... " >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_shadow_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-
-+else
-+ if test "$ac_cv_type_int" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (int)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_int=0
-+ fi
-+fi
-
+-
+-
++ ac_cv_header_shadow_h=no
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ if test x"$ac_cv_header_shadow_h" = x"yes"; then
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -50233,27 +50076,37 @@
- if test x$ac_cv_func_lstat64 = xyes ; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LSTAT64 Whether lstat64() is available
--_ACEOF
++$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
++
++ fi
++ ;;
++esac
++for ac_header in shadow.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
++if test "x$ac_cv_header_shadow_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SHADOW_H 1
+ _ACEOF
- fi
--fi
+ fi
-if test x$ac_cv_func_fstat64 = xno ; then
- { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
-$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
++done
-int
-main ()
@@ -50262,7 +50115,15 @@
- ;
- return 0;
-}
--_ACEOF
++for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -50285,34 +50146,12 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_fstat64=yes
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+-
-+else
-+ if test "$ac_cv_type_long" = 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_set_status 77
-+as_fn_error "cannot compute sizeof (long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi
-+fi
-
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -50320,34 +50159,34 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
-$as_echo "$ac_cv_func_fstat64" >&6; }
- if test x$ac_cv_func_fstat64 = xyes ; then
++done
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSTAT64 1
--_ACEOF
++for ac_header in syscall.h sys/syscall.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
- fi
--fi
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
+ fi
-#################################################
-# Check whether struct stat has timestamps with sub-second resolution.
-#
++done
-samba_cv_stat_hires=no
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-+$as_echo_n "checking size of long long... " >&6; }
-+if test "${ac_cv_sizeof_long_long+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -50387,11 +50226,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -50405,7 +50251,20 @@
- ;
- return 0;
-}
--_ACEOF
++
++fi
++
++done
++
++for ac_header in sys/ea.h sys/proplist.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -50425,53 +50284,67 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_member_struct_stat_st_mtim_tv_nsec=no
-+ if test "$ac_cv_type_long_long" = 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_set_status 77
-+as_fn_error "cannot compute sizeof (long long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_long_long=0
-+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+-fi
++done
+
++
++for ac_header in sys/cdefs.h glob.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
++done
++
++
++# For experimental utmp support (lastlog on some BSD-like systems)
++for ac_header in utmp.h utmpx.h lastlog.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
-# Linux, Solaris
- samba_cv_stat_hires=yes
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
-$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
++done
++
++
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-+$as_echo_n "checking size of short... " >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
++$as_echo_n "checking size of int... " >&6; }
++if test "${ac_cv_sizeof_int+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -50510,10 +50383,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimensec=yes
--else
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
++ if test "$ac_cv_type_int" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
++fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -50531,7 +50415,15 @@
- ;
- return 0;
-}
--_ACEOF
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -50551,26 +50443,38 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimensec=yes
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+
- ac_cv_member_struct_stat_st_mtimensec=no
-+ if test "$ac_cv_type_short" = yes; then
++else
++ if test "$ac_cv_type_long" = 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_set_status 77
-+as_fn_error "cannot compute sizeof (short)
++as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+ else
-+ ac_cv_sizeof_short=0
++ ac_cv_sizeof_long=0
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-+$as_echo "$ac_cv_sizeof_short" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -50581,7 +50485,7 @@
cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
++#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
-# BSD, if defined _POSIX_SOURCE
@@ -50591,10 +50495,13 @@
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-+if test "${ac_cv_c_const+set}" = set; then :
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
++$as_echo_n "checking size of long long... " >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -50602,8 +50509,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -50634,9 +50540,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
--else
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ if test "$ac_cv_type_long_long" = 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_set_status 77
++as_fn_error "cannot compute sizeof (long long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_long_long=0
++ fi
++fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -50645,65 +50563,23 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
-return 0;
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset cs;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *pcpcc;
-+ char **ppc;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ pcpcc = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+- ;
+- return 0;
+-}
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
++$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
-+ *t++ = 0;
-+ if (s) return 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ if (!foo) return 0;
-+ }
-+ return !cs[0] && !zero.x;
-+#endif
+
- ;
- return 0;
- }
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -50724,43 +50600,62 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_const=yes
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
++$as_echo_n "checking size of short... " >&6; }
++if test "${ac_cv_sizeof_short+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
--fi
--
++else
++ if test "$ac_cv_type_short" = 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_set_status 77
++as_fn_error "cannot compute sizeof (short)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_c_const=no
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
++$as_echo "$ac_cv_sizeof_short" >&6; }
++
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
--cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
--_ACEOF
-+$as_echo "#define const /**/" >>confdefs.h
++#define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
-# BSD, if not defined _POSIX_SOURCE
- samba_cv_stat_hires=yes
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
-$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -50768,8 +50663,6 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
@@ -50805,11 +50698,6 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -50818,15 +50706,65 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
+ int
+ main ()
+ {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtime_n)
-return 0;
-- ;
-- return 0;
--}
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++ /* Ultrix mips cc rejects this. */
++ typedef int charset[2];
++ const charset cs;
++ /* SunOS 4.1.1 cc rejects this. */
++ char const *const *pcpcc;
++ char **ppc;
++ /* NEC SVR4.0.2 mips cc rejects this. */
++ struct point {int x, y;};
++ static struct point const zero = {0,0};
++ /* AIX XL C 1.02.0.0 rejects this.
++ It does not let you subtract one const X* pointer from another in
++ an arm of an if-expression whose if-part is not a constant
++ expression */
++ const char *g = "string";
++ pcpcc = &g + (g ? g-g : 0);
++ /* HPUX 7.0 cc rejects these. */
++ ++pcpcc;
++ ppc = (char**) pcpcc;
++ pcpcc = (char const *const *) ppc;
++ { /* SCO 3.2v4 cc rejects this. */
++ char *t;
++ char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++ *t++ = 0;
++ if (s) return 0;
++ }
++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
++ int x[] = {25, 17};
++ const int *foo = &x[0];
++ ++foo;
++ }
++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++ typedef const int *iptr;
++ iptr p = 0;
++ ++p;
++ }
++ { /* AIX XL C 1.02.0.0 rejects this saying
++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++ struct s { int j; const int *ap[3]; };
++ struct s *b; b->j = 5;
++ }
++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++ const int foo = 10;
++ if (!foo) return 0;
++ }
++ return !cs[0] && !zero.x;
++#endif
++
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -50847,30 +50785,61 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtime_n=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_const=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_mtime_n=no
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_inline=$ac_kw
++ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-+ test "$ac_cv_c_inline" != no && break
-+done
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
++if test $ac_cv_c_const = no; then
++
++$as_echo "#define const /**/" >>confdefs.h
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIME_N 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
+ _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_inline=$ac_kw
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ test "$ac_cv_c_inline" != no && break
++done
+
+-# AIX
+- samba_cv_stat_hires=yes
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
++
+case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
@@ -50882,14 +50851,10 @@
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
- _ACEOF
++_ACEOF
+ ;;
+esac
--# AIX
-- samba_cv_stat_hires=yes
--fi
--
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
-$as_echo_n "checking for struct stat.st_umtime... " >&6; }
-if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
@@ -51274,21 +51239,12 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- $ac_includes_default
- int
- main ()
- {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtime)
--return 0;
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
+
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
@@ -51298,7 +51254,20 @@
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
-+
+
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtime)
+-return 0;
;
return 0;
}
@@ -51482,12 +51451,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_birthtimensec=no
--fi
--
--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
+-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimensec" >&5
@@ -51898,12 +51867,12 @@
+ LDFLAGS=$ac_save_LDFLAGS
+ PRINT_LIBS=$ac_save_PRINT_LIBS
+ fi
-+
+
+ elif test x"$enable_cups" = x"yes"; then
+ as_fn_error "Cups support required but cups-config not located. Make sure cups-devel related files are installed." "$LINENO" 5
+ fi
+fi
-
++
+# Check whether --enable-iprint was given.
+if test "${enable_iprint+set}" = set; then :
+ enableval=$enable_iprint;
@@ -52241,16 +52210,15 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
@@ -52350,9 +52318,9 @@
fi
-done
-
+-
-
--
-for ac_func in putprpwnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52478,11 +52446,9 @@
- # putprpwnam was found in libc or existing $LIBS
+$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
-
++
+fi
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
+# and glibc has setresuid under linux but the function does
+# nothing until kernel 2.1.44! very dumb.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
@@ -52490,7 +52456,9 @@
+if test "${samba_cv_have_setresuid+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PUTPRPWNAM 1
+ if test "$cross_compiling" = yes; then :
+ samba_cv_have_setresuid=cross
+else
@@ -52507,12 +52475,12 @@
+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: $samba_cv_have_setresuid" >&5
+$as_echo "$samba_cv_have_setresuid" >&6; }
+if test x"$samba_cv_have_setresuid" = x"yes"; then
-
++
+$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
+fi
@@ -52783,7 +52751,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47634,100 +14542,41 @@
+@@ -47634,100 +14540,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52904,7 +52872,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47736,111 +14585,149 @@
+@@ -47736,111 +14583,149 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53125,7 +53093,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47848,100 +14735,67 @@
+@@ -47848,100 +14733,67 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53264,7 +53232,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47950,113 +14804,55 @@
+@@ -47950,113 +14802,55 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53405,7 +53373,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48064,100 +14860,42 @@
+@@ -48064,100 +14858,42 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53526,7 +53494,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48166,213 +14904,299 @@
+@@ -48166,213 +14902,299 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53626,12 +53594,12 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_EXECL 1
+_ACEOF
-+
-+fi
-+done
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
++fi
++done
++
+if test x"$ac_cv_func_execl" = x"no"; then
+ EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+fi
@@ -53900,7 +53868,7 @@
- # getspnam was found in libc or existing $LIBS
+fi
+done
-+
+
+for ac_func in syslog vsyslog timegm
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53911,11 +53879,11 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+fi
-+done
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
++fi
++done
++
+for ac_func in setlocale nl_langinfo
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53973,7 +53941,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48381,111 +15205,144 @@
+@@ -48381,111 +15203,144 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54144,17 +54112,17 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-
++
+fi
++done
+
-for ac_func in getspnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+done
-+
+# libexecinfo provides backtrace_symbols on FreeBSD
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
+$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
@@ -54188,7 +54156,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48493,100 +15350,66 @@
+@@ -48493,100 +15348,66 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54294,10 +54262,7 @@
- case " $LIBS " in
- *\ -lsec\ *)
+fi
-
-- # getspnam was not found and we already had libsec
-- # nothing to do here by default
-- true
++
+for ac_func in backtrace_symbols
+do :
+ ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
@@ -54306,15 +54271,18 @@
+#define HAVE_BACKTRACE_SYMBOLS 1
+_ACEOF
+- # getspnam was not found and we already had libsec
+- # nothing to do here by default
+- true
++fi
++done
+
- ;;
- *)
- # getspnam was not found, try adding libsec
- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
-$as_echo_n "checking for getspnam in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_getspnam+set}" = set; then
-+fi
-+done
-+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trace_back_stack in -lexc" >&5
+$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
+if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
@@ -54332,7 +54300,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48595,213 +15418,230 @@
+@@ -48595,213 +15416,230 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54398,12 +54366,12 @@
- LIBS="-lsec $LIBS"
+ LIBS="-lexc $LIBS"
-
++
+fi
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
-+
+# check for sysctlbyname for BSD systems
+for ac_func in sysctlbyname
+do :
@@ -54715,7 +54683,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48810,754 +15650,641 @@
+@@ -48810,754 +15648,641 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54770,13 +54738,18 @@
+ LIBUNWIND_PTRACE="-lunwind-ptrace";
+
+$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
+
+- ac_cv_lib_security_bigcrypt=no
+
-+
+else
+ LIBUNWIND_PTRACE=""
-+fi
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+
-+
+ LIBS=$save_LIBS
+
+else
@@ -54784,12 +54757,15 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ LIBS=$save_LIBS
-
-- ac_cv_lib_security_bigcrypt=no
++
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+
+
+- LIBS="-lsecurity $LIBS"
+# To use libunwind-ptrace, we also need to make some ptrace system calls.
+if test x"$LIBUNWIND_PTRACE" != x"" ; then
+ for ac_header in sys/ptrace.h
@@ -54800,25 +54776,17 @@
+#define HAVE_SYS_PTRACE_H 1
+_ACEOF
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
--if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
++fi
-- LIBS="-lsecurity $LIBS"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+done
-
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
+$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
++
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
@@ -54840,10 +54808,10 @@
+}
_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
-+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-
++
+$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
@@ -54857,12 +54825,12 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
-+
- # bigcrypt was not found in libsecurity
- # nothing to do here by default
- true
+
+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`
@@ -54872,7 +54840,7 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-
++
fi
+done
@@ -54900,7 +54868,7 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+
+
+fi
+done
@@ -54914,9 +54882,6 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+fi
-+done
-
-for ac_func in bigcrypt
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54927,6 +54892,9 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
++fi
++done
++
+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55077,7 +55045,7 @@
- # bigcrypt was found in libc or existing $LIBS
+fi
+done
-
++
+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55088,11 +55056,11 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+fi
+done
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+for ac_func in pread _pread __pread pread64 _pread64 __pread64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55226,14 +55194,9 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
-$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
-if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
--
-- LIBS="-lsec $LIBS"
--
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
--_ACEOF
+- LIBS="-lsec $LIBS"
+#
+#
+#
@@ -55248,7 +55211,7 @@
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+#include <unistd.h>
+#include <sys/utsname.h>
+main() {
@@ -55265,7 +55228,12 @@
+ exit(0);
+}
-+_ACEOF
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+ _ACEOF
+-
+-
+-
+if ac_fn_c_try_run "$LINENO"; then :
+ linux_getgrouplist_ok=yes
else
@@ -55342,9 +55310,9 @@
-#else
-# include <assert.h>
-#endif
--
--#undef $ac_func
+-#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. */
@@ -55406,12 +55374,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
+$as_echo "$ac_cv_func_stat64" >&6; }
+ if test x$ac_cv_func_stat64 = xyes ; then
-+
-+$as_echo "#define HAVE_STAT64 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++$as_echo "#define HAVE_STAT64 1" >>confdefs.h
++
+ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
@@ -55609,11 +55577,11 @@
- esac
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
-+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+_ACEOF
-
++
+# AIX
+ samba_cv_stat_hires=yes
fi
@@ -55738,16 +55706,16 @@
- # getprpwnam was found in libc or existing $LIBS
+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
-+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+_ACEOF
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETPRPWNAM 1
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
_ACEOF
@@ -55882,10 +55850,10 @@
fi
-done
+-
-
-
--
-for ac_func in strsignal
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55927,7 +55895,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49565,85 +16292,43 @@
+@@ -49565,85 +16290,43 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56033,7 +56001,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49652,108 +16337,44 @@
+@@ -49652,108 +16335,44 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56097,11 +56065,11 @@
+ ac_cv_lib_resolv__dn_expand=yes
else
- ac_cv_search_getproplist=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
+ ac_cv_lib_resolv__dn_expand=no
fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
-$as_echo "$ac_cv_search_getproplist" >&6; }
-ac_res=$ac_cv_search_getproplist
@@ -56164,7 +56132,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49761,103 +16382,80 @@
+@@ -49761,103 +16380,80 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56320,7 +56288,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49865,100 +16463,90 @@
+@@ -49865,100 +16461,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56484,7 +56452,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49966,82 +16554,90 @@
+@@ -49966,82 +16552,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56633,7 +56601,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -50050,109 +16646,90 @@
+@@ -50050,109 +16644,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56733,9 +56701,9 @@
fi
+done
-+
+
+ for ac_func in set_auth_parameters
+do :
+ ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
@@ -56745,12 +56713,12 @@
+_ACEOF
+
+ # set_auth_parameters was found in libc or existing $LIBS
-
-
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
+
++
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
+
-for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56802,7 +56770,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50160,105 +16737,92 @@
+@@ -50160,105 +16735,92 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56854,11 +56822,11 @@
-
- eval "$as_ac_var=no"
+ ac_cv_lib_sec_set_auth_parameters=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then :
@@ -56910,10 +56878,10 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_GETSPNAM 1
+_ACEOF
-
++
+ # getspnam was found in libc or existing $LIBS
+
-+
+
+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
@@ -56969,7 +56937,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50266,65 +16830,47 @@
+@@ -50266,65 +16828,47 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57065,7 +57033,7 @@
fi
done
-@@ -50332,39 +16878,43 @@
+@@ -50332,39 +16876,43 @@
@@ -57135,7 +57103,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50372,103 +16922,90 @@
+@@ -50372,103 +16920,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57242,12 +57210,12 @@
-fi
-done
+ # getspnam was found in libc or existing $LIBS
+
+
++$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
+
+
-+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
+
-
-
+else
+ # getspnam was not found, try adding libsec
@@ -57300,7 +57268,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50476,102 +17013,91 @@
+@@ -50476,102 +17011,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57465,7 +57433,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50579,103 +17105,90 @@
+@@ -50579,103 +17103,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57629,7 +57597,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50683,103 +17196,91 @@
+@@ -50683,103 +17194,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57794,7 +57762,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50787,107 +17288,90 @@
+@@ -50787,107 +17286,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57964,7 +57932,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50895,190 +17379,77 @@
+@@ -50895,190 +17377,77 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58015,13 +57983,13 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_lib_sec_getprpwnam=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++ ac_cv_lib_sec_getprpwnam=no
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -58193,7 +58161,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51086,62 +17457,66 @@
+@@ -51086,62 +17455,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58268,22 +58236,9 @@
+ac_res=$ac_cv_search_getproplist
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+ for ac_func in getproplist fgetproplist setproplist fsetproplist
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- eval "$as_ac_var=no"
fi
-+done
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -58296,7 +58251,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
++ for ac_func in getproplist fgetproplist setproplist fsetproplist
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -58305,10 +58260,23 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51149,39 +17524,27 @@
+@@ -51149,39 +17509,40 @@
fi
done
++ for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
+
+ for ac_func in sizeof_proplist_entry
+do :
+ ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
@@ -58320,7 +58288,6 @@
+fi
+done
--
-for ac_func in extattr_get_fd extattr_get_file extattr_get_link
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58361,7 +58328,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51189,62 +17552,53 @@
+@@ -51189,62 +17550,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58429,10 +58396,10 @@
- eval "$as_ac_var=no"
+else
+ ac_cv_search_getxattr=no
- fi
++fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getxattr" >&5
+$as_echo "$ac_cv_search_getxattr" >&6; }
+ac_res=$ac_cv_search_getxattr
@@ -58460,7 +58427,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51252,102 +17606,64 @@
+@@ -51252,102 +17604,64 @@
fi
done
@@ -58610,7 +58577,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51355,102 +17671,141 @@
+@@ -51355,102 +17669,141 @@
fi
done
@@ -58755,12 +58722,12 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $smb_attr_cv_xattr_add_opt" >&5
+$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
+ if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
++
++$as_echo "#define XATTR_ADD_OPT 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define XATTR_ADD_OPT 1" >>confdefs.h
-+
+ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
@@ -58827,7 +58794,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51462,7 +17817,7 @@
+@@ -51462,7 +17815,7 @@
esac
# Check whether --enable-static was given.
@@ -58836,7 +58803,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -51484,7 +17839,7 @@
+@@ -51484,7 +17837,7 @@
fi
# Check whether --enable-shared was given.
@@ -58845,7 +58812,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -51511,16 +17866,16 @@
+@@ -51511,16 +17864,16 @@
PIE_CFLAGS=""
PIE_LDFLAGS=""
# Check whether --enable-pie was given.
@@ -58865,7 +58832,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51529,11 +17884,11 @@
+@@ -51529,11 +17882,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -58880,7 +58847,7 @@
then
samba_cv_fpie=yes
else
-@@ -51542,7 +17897,7 @@
+@@ -51542,7 +17895,7 @@
rm -f conftest*
fi
@@ -58889,7 +58856,7 @@
$as_echo "$samba_cv_fpie" >&6; }
if test x"${samba_cv_fpie}" = x"yes"
then
-@@ -51554,16 +17909,16 @@
+@@ -51554,16 +17907,16 @@
# Set defaults
RELRO_LDFLAGS=""
# Check whether --enable-relro was given.
@@ -58909,7 +58876,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51572,11 +17927,11 @@
+@@ -51572,11 +17925,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58924,7 +58891,7 @@
then
samba_cv_relro=yes
else
-@@ -51585,7 +17940,7 @@
+@@ -51585,7 +17938,7 @@
rm -f conftest*
fi
@@ -58933,7 +58900,7 @@
$as_echo "$samba_cv_relro" >&6; }
if test x"${samba_cv_relro}" = x"yes"
then
-@@ -51614,7 +17969,7 @@
+@@ -51614,7 +17967,7 @@
# You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
@@ -58942,7 +58909,7 @@
$as_echo_n "checking ability to build shared libraries... " >&6; }
# and these are for particular systems
-@@ -51622,9 +17977,7 @@
+@@ -51622,9 +17975,7 @@
*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
case "$host_os" in *linux*)
@@ -58953,7 +58920,7 @@
;;
esac
BLDSHARED="true"
-@@ -51636,15 +17989,11 @@
+@@ -51636,15 +17987,11 @@
DYNEXP="-Wl,--export-dynamic"
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
@@ -58971,7 +58938,7 @@
BLDSHARED="true"
LDSHFLAGS="-G"
-@@ -51662,33 +18011,23 @@
+@@ -51662,33 +18009,23 @@
LDSHFLAGS="-G \${CFLAGS}"
fi
@@ -59010,7 +58977,7 @@
;;
*netbsd* | *freebsd* | *dragonfly* )
-@@ -51698,14 +18037,10 @@
+@@ -51698,14 +18035,10 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC -DPIC"
@@ -59027,7 +58994,7 @@
;;
*openbsd*) BLDSHARED="true"
-@@ -51714,26 +18049,18 @@
+@@ -51714,26 +18047,18 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC"
@@ -59058,7 +59025,7 @@
;;
esac
-@@ -51747,15 +18074,11 @@
+@@ -51747,15 +18072,11 @@
PICFLAG="-KPIC"
fi
@@ -59076,7 +59043,7 @@
BLDSHARED="true"
# use expfull to export underscored symbols
-@@ -51771,25 +18094,17 @@
+@@ -51771,25 +18092,17 @@
fi
@@ -59106,7 +59073,7 @@
# Use special PIC flags for the native HP-UX compiler.
BLDSHARED="true"
-@@ -51811,84 +18126,58 @@
+@@ -51811,84 +18124,58 @@
DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
fi
@@ -59206,7 +59173,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ROFF"; then
-@@ -51899,91 +18188,71 @@
+@@ -51899,91 +18186,71 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -59313,7 +59280,7 @@
BLDSHARED="true"
LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -51997,16 +18266,12 @@
+@@ -51997,16 +18264,12 @@
# actually support the PIE stuff.
PIE_LDFLAGS=
PIE_CFLAGS=
@@ -59332,7 +59299,7 @@
;;
esac
-@@ -52023,53 +18288,53 @@
+@@ -52023,53 +18286,53 @@
LDFLAGS="$LDFLAGS -L./bin"
fi
@@ -59405,7 +59372,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -52085,7 +18350,7 @@
+@@ -52085,7 +18348,7 @@
fi
@@ -59414,7 +59381,7 @@
$as_echo "$ac_cv_shlib_works" >&6; }
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
-@@ -52101,9 +18366,9 @@
+@@ -52101,9 +18364,9 @@
SHLIBEXT="shared_libraries_disabled"
fi
@@ -59426,7 +59393,7 @@
$as_echo "$PICFLAG" >&6; }
-@@ -52145,165 +18410,39 @@
+@@ -52145,165 +18408,39 @@
################
@@ -59588,13 +59555,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+$as_echo "#define HAVE_LONGLONG 1" >>confdefs.h
--fi
+ ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -59604,7 +59571,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52313,102 +18452,9 @@
+@@ -52313,102 +18450,9 @@
fi
else
@@ -59709,7 +59676,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52423,17 +18469,13 @@
+@@ -52423,17 +18467,13 @@
# Check if the compiler supports the LL prefix on long long integers.
# AIX needs this.
@@ -59730,7 +59697,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -52444,190 +18486,97 @@
+@@ -52444,190 +18484,97 @@
return 0;
}
_ACEOF
@@ -59949,7 +59916,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52637,67 +18586,34 @@
+@@ -52637,67 +18584,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
@@ -60027,7 +59994,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52707,67 +18623,34 @@
+@@ -52707,67 +18621,34 @@
#include <sys/stat.h>
main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60105,7 +60072,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52777,67 +18660,34 @@
+@@ -52777,67 +18658,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
@@ -60183,7 +60150,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52847,67 +18697,34 @@
+@@ -52847,67 +18695,34 @@
#include <sys/stat.h>
main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60261,7 +60228,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52917,64 +18734,31 @@
+@@ -52917,64 +18732,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
@@ -60335,7 +60302,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52990,55 +18774,28 @@
+@@ -52990,55 +18772,28 @@
return 0;
}
_ACEOF
@@ -60398,7 +60365,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53054,58 +18811,31 @@
+@@ -53054,58 +18809,31 @@
return 0;
}
_ACEOF
@@ -60465,7 +60432,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53114,67 +18844,34 @@
+@@ -53114,67 +18842,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = major(dev); return 0; }
_ACEOF
@@ -60543,7 +60510,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53183,67 +18880,34 @@
+@@ -53183,67 +18878,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = minor(dev); return 0; }
_ACEOF
@@ -60621,7 +60588,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53252,129 +18916,63 @@
+@@ -53252,129 +18914,63 @@
#include <sys/types.h>
main() { dev_t dev = makedev(1,2); return 0; }
_ACEOF
@@ -60770,7 +60737,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -53387,55 +18985,28 @@
+@@ -53387,55 +18983,28 @@
return 0;
}
_ACEOF
@@ -60833,7 +60800,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -53446,55 +19017,28 @@
+@@ -53446,55 +19015,28 @@
return 0;
}
_ACEOF
@@ -60896,7 +60863,7 @@
/* end confdefs.h. */
#include <sys/time.h>
-@@ -53507,46 +19051,19 @@
+@@ -53507,46 +19049,19 @@
return 0;
}
_ACEOF
@@ -60949,7 +60916,7 @@
fi
-@@ -53558,120 +19075,24 @@
+@@ -53558,120 +19073,24 @@
# which rely on signals.
@@ -61078,7 +61045,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53695,58 +19116,27 @@
+@@ -53695,58 +19114,27 @@
return 0;
}
_ACEOF
@@ -61118,21 +61085,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+-
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
--
+
- { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
$as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
@@ -61145,7 +61112,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53770,58 +19160,27 @@
+@@ -53770,58 +19158,27 @@
return 0;
}
_ACEOF
@@ -61185,21 +61152,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+-
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
--
+
- { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_REALTIME" >&5
$as_echo_n "checking for CLOCK_REALTIME... " >&6; }
@@ -61212,7 +61179,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53845,49 +19204,22 @@
+@@ -53845,49 +19202,22 @@
return 0;
}
_ACEOF
@@ -61252,8 +61219,8 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+-
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -61268,7 +61235,7 @@
-@@ -53905,18 +19237,14 @@
+@@ -53905,18 +19235,14 @@
;;
*)
# clock_gettime was not found, try adding librt
@@ -61290,7 +61257,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -53934,60 +19262,29 @@
+@@ -53934,60 +19260,29 @@
return 0;
}
_ACEOF
@@ -61360,7 +61327,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54011,58 +19308,27 @@
+@@ -54011,58 +19306,27 @@
return 0;
}
_ACEOF
@@ -61400,21 +61367,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
- { $as_echo "$as_me:$LINENO: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_PROCESS_CPUTIME_ID" >&5
$as_echo_n "checking for CLOCK_PROCESS_CPUTIME_ID... " >&6; }
@@ -61427,7 +61394,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54086,58 +19352,27 @@
+@@ -54086,58 +19350,27 @@
return 0;
}
_ACEOF
@@ -61467,21 +61434,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
- { $as_echo "$as_me:$LINENO: checking for CLOCK_REALTIME" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_REALTIME" >&5
$as_echo_n "checking for CLOCK_REALTIME... " >&6; }
@@ -61494,7 +61461,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54161,49 +19396,22 @@
+@@ -54161,49 +19394,22 @@
return 0;
}
_ACEOF
@@ -61534,8 +61501,8 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -61550,7 +61517,7 @@
-@@ -54228,20 +19436,16 @@
+@@ -54228,20 +19434,16 @@
fi
@@ -61575,7 +61542,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -54249,64 +19453,31 @@
+@@ -54249,64 +19451,31 @@
if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
di->d_name[0] == 0) exit(0); exit(1);}
_ACEOF
@@ -61649,7 +61616,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utime.h>
-@@ -54318,41 +19489,18 @@
+@@ -54318,41 +19487,18 @@
return 0;
}
_ACEOF
@@ -61695,7 +61662,7 @@
fi
-@@ -54360,104 +19508,12 @@
+@@ -54360,104 +19506,12 @@
# Check utmp details, but only if our OS offers utmp.h
if test x"$ac_cv_header_utmp_h" = x"yes"; then
@@ -61805,7 +61772,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -54466,17 +19522,13 @@
+@@ -54466,17 +19520,13 @@
done
@@ -61826,7 +61793,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54488,55 +19540,28 @@
+@@ -54488,55 +19538,28 @@
return 0;
}
_ACEOF
@@ -61889,7 +61856,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54548,55 +19573,28 @@
+@@ -54548,55 +19571,28 @@
return 0;
}
_ACEOF
@@ -61952,7 +61919,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54608,55 +19606,28 @@
+@@ -54608,55 +19604,28 @@
return 0;
}
_ACEOF
@@ -62015,7 +61982,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54668,55 +19639,28 @@
+@@ -54668,55 +19637,28 @@
return 0;
}
_ACEOF
@@ -62078,7 +62045,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54728,55 +19672,28 @@
+@@ -54728,55 +19670,28 @@
return 0;
}
_ACEOF
@@ -62141,7 +62108,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54788,55 +19705,28 @@
+@@ -54788,55 +19703,28 @@
return 0;
}
_ACEOF
@@ -62163,14 +62130,13 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- samba_cv_HAVE_UT_UT_TV=yes
++if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_HAVE_UT_UT_TV=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_UT_UT_TV=no
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_HAVE_UT_UT_TV=yes
+else
+ samba_cv_HAVE_UT_UT_TV=no
fi
@@ -62206,7 +62172,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54848,55 +19738,28 @@
+@@ -54848,55 +19736,28 @@
return 0;
}
_ACEOF
@@ -62269,7 +62235,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54908,55 +19771,28 @@
+@@ -54908,55 +19769,28 @@
return 0;
}
_ACEOF
@@ -62332,7 +62298,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54968,55 +19804,28 @@
+@@ -54968,55 +19802,28 @@
return 0;
}
_ACEOF
@@ -62395,7 +62361,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55028,55 +19837,28 @@
+@@ -55028,55 +19835,28 @@
return 0;
}
_ACEOF
@@ -62458,7 +62424,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55088,56 +19870,29 @@
+@@ -55088,56 +19868,29 @@
return 0;
}
_ACEOF
@@ -62522,7 +62488,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55149,56 +19904,29 @@
+@@ -55149,56 +19902,29 @@
return 0;
}
_ACEOF
@@ -62586,7 +62552,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmpx.h>
-@@ -55210,41 +19938,18 @@
+@@ -55210,41 +19936,18 @@
return 0;
}
_ACEOF
@@ -62632,7 +62598,7 @@
fi
-@@ -55255,12 +19960,10 @@
+@@ -55255,12 +19958,10 @@
ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
# Check whether --with-libiconv was given.
@@ -62647,7 +62613,7 @@
else
if test "$withval" != "yes" ; then
ICONV_PATH_SPEC=yes
-@@ -55306,7 +20009,7 @@
+@@ -55306,7 +20007,7 @@
export LDFLAGS LIBS CPPFLAGS
# Try to find iconv(3)
@@ -62656,7 +62622,7 @@
$as_echo_n "checking for iconv in $i/$l... " >&6; }
jm_cv_func_iconv="no"
jm_cv_lib_iconv=""
-@@ -55314,11 +20017,7 @@
+@@ -55314,11 +20015,7 @@
jm_save_LIBS="$LIBS"
if test "$jm_cv_func_iconv" != yes; then
@@ -62669,7 +62635,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55332,48 +20031,17 @@
+@@ -55332,48 +20029,17 @@
return 0;
}
_ACEOF
@@ -62722,7 +62688,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55387,49 +20055,18 @@
+@@ -55387,49 +20053,18 @@
return 0;
}
_ACEOF
@@ -62776,7 +62742,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55443,53 +20080,22 @@
+@@ -55443,53 +20078,22 @@
return 0;
}
_ACEOF
@@ -62834,7 +62800,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55503,50 +20109,19 @@
+@@ -55503,50 +20107,19 @@
return 0;
}
_ACEOF
@@ -62889,7 +62855,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <biconv.h>
-@@ -55560,42 +20135,15 @@
+@@ -55560,42 +20133,15 @@
return 0;
}
_ACEOF
@@ -62935,7 +62901,7 @@
LIBS="$jm_save_LIBS"
fi
-@@ -55606,36 +20154,30 @@
+@@ -55606,36 +20152,30 @@
if test "$jm_cv_func_iconv" = yes; then
if test "$jm_cv_giconv" = yes; then
@@ -62979,7 +62945,7 @@
$as_echo "no" >&6; }
fi
-@@ -55673,16 +20215,12 @@
+@@ -55673,16 +20213,12 @@
# check for default dos charset name
for j in CP850 IBM850 ; do
@@ -62999,7 +62965,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55695,43 +20233,16 @@
+@@ -55695,43 +20231,16 @@
}
_ACEOF
@@ -63048,7 +63014,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_dos_charset="$ICONV_CHARSET"
-@@ -55743,16 +20254,12 @@
+@@ -55743,16 +20252,12 @@
# check for default display charset name
for j in ASCII 646 ; do
@@ -63068,7 +63034,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55765,43 +20272,16 @@
+@@ -55765,43 +20270,16 @@
}
_ACEOF
@@ -63117,7 +63083,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_display_charset="$ICONV_CHARSET"
-@@ -55813,16 +20293,12 @@
+@@ -55813,16 +20291,12 @@
# check for default unix charset name
for j in UTF-8 UTF8 ; do
@@ -63137,7 +63103,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55835,43 +20311,16 @@
+@@ -55835,43 +20309,16 @@
}
_ACEOF
@@ -63186,7 +63152,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_unix_charset="$ICONV_CHARSET"
-@@ -55910,9 +20359,9 @@
+@@ -55910,9 +20357,9 @@
default_display_charset="ASCII"
default_unix_charset="UTF-8"
samba_cv_HAVE_NATIVE_ICONV=yes
@@ -63198,7 +63164,7 @@
$as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
fi
-@@ -55936,9 +20385,7 @@
+@@ -55936,9 +20383,7 @@
default_unix_charset="\"$default_unix_charset\""
@@ -63209,7 +63175,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -55972,7 +20419,7 @@
+@@ -55972,7 +20417,7 @@
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -63218,7 +63184,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;}
-@@ -55994,20 +20441,16 @@
+@@ -55994,20 +20439,16 @@
fi
@@ -63243,7 +63209,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56021,67 +20464,34 @@
+@@ -56021,67 +20462,34 @@
}
_ACEOF
@@ -63321,7 +63287,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56095,204 +20505,36 @@
+@@ -56095,204 +20503,36 @@
}
_ACEOF
@@ -63539,7 +63505,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -56301,119 +20543,25 @@
+@@ -56301,119 +20541,25 @@
done
@@ -63666,7 +63632,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -56424,54 +20572,29 @@
+@@ -56424,54 +20570,29 @@
return 0;
}
_ACEOF
@@ -63727,7 +63693,7 @@
fi
-@@ -56480,157 +20603,18 @@
+@@ -56480,157 +20601,18 @@
# http://oss.sgi.com/projects/fam/
# http://savannah.nongnu.org/projects/fam/
# Check whether --enable-fam was given.
@@ -63891,7 +63857,7 @@
_ACEOF
samba_cv_HAVE_FAM_H=yes
else
-@@ -56642,18 +20626,14 @@
+@@ -56642,18 +20624,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.
@@ -63913,7 +63879,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56671,43 +20651,18 @@
+@@ -56671,43 +20649,18 @@
return 0;
}
_ACEOF
@@ -63963,7 +63929,7 @@
samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
else
samba_cv_HAVE_LIBFAM=no
-@@ -56718,23 +20673,17 @@
+@@ -56718,23 +20671,17 @@
samba_fam_xtra=-lC
@@ -63990,10 +63956,11 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56745,79 +20694,48 @@
+@@ -56744,80 +20691,49 @@
+ extern "C"
#endif
char FAMOpen2 ();
- int
+-int
-main ()
-{
-return FAMOpen2 ();
@@ -64022,6 +63989,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++int
+main ()
+{
+return FAMOpen2 ();
@@ -64085,7 +64053,7 @@
/* end confdefs.h. */
#include <fam.h>
int
-@@ -56828,43 +20746,16 @@
+@@ -56828,43 +20744,16 @@
return 0;
}
_ACEOF
@@ -64132,7 +64100,7 @@
fi
fi
-@@ -56877,18 +20768,14 @@
+@@ -56877,18 +20766,14 @@
samba_dmapi_libs=""
if test x"$samba_dmapi_libs" = x"" ; then
@@ -64154,7 +64122,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56906,61 +20793,32 @@
+@@ -56906,61 +20791,32 @@
return 0;
}
_ACEOF
@@ -64225,7 +64193,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56978,61 +20836,32 @@
+@@ -56978,61 +20834,32 @@
return 0;
}
_ACEOF
@@ -64296,7 +64264,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57050,61 +20879,32 @@
+@@ -57050,61 +20877,32 @@
return 0;
}
_ACEOF
@@ -64367,7 +64335,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57122,43 +20922,18 @@
+@@ -57122,43 +20920,18 @@
return 0;
}
_ACEOF
@@ -64417,7 +64385,7 @@
samba_dmapi_libs="-ldmapi"
fi
-@@ -57167,153 +20942,12 @@
+@@ -57167,153 +20940,12 @@
# Only bother to test ehaders if we have a candidate DMAPI library
if test x"$samba_dmapi_libs" != x"" ; then
@@ -64577,7 +64545,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -57327,11 +20961,7 @@
+@@ -57327,11 +20959,7 @@
if test x"$samba_dmapi_libs" != x"" ; then
samba_dmapi_save_LIBS="$LIBS"
LIBS="$LIBS $samba_dmapi_libs"
@@ -64590,7 +64558,7 @@
/* end confdefs.h. */
#include <time.h> /* needed by Tru64 */
-@@ -57366,50 +20996,25 @@
+@@ -57366,50 +20994,25 @@
return 0;
}
_ACEOF
@@ -64645,7 +64613,7 @@
$as_echo "$as_me: DMAPI support not present" >&6;}
# DMAPI detection failure actions end
-@@ -57417,11 +21022,9 @@
+@@ -57417,11 +21020,9 @@
# DMAPI detection success actions start
@@ -64659,7 +64627,7 @@
$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
# DMAPI detection success actions end
-@@ -57435,20 +21038,16 @@
+@@ -57435,20 +21036,16 @@
default_shared_modules="$default_shared_modules vfs_tsmsm"
fi
@@ -64684,7 +64652,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -57464,65 +21063,32 @@
+@@ -57464,65 +21061,32 @@
}
_ACEOF
@@ -64759,7 +64727,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <fcntl.h>
-@@ -57534,185 +21100,29 @@
+@@ -57534,185 +21098,29 @@
return 0;
}
_ACEOF
@@ -64952,7 +64920,7 @@
fi
-@@ -57722,110 +21132,18 @@
+@@ -57722,110 +21130,18 @@
ac_save_LIBS=$LIBS
@@ -65069,7 +65037,7 @@
-@@ -57842,18 +21160,14 @@
+@@ -57842,18 +21158,14 @@
;;
*)
# cap_get_proc was not found, try adding libcap
@@ -65091,7 +65059,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57871,50 +21185,23 @@
+@@ -57871,50 +21183,23 @@
return 0;
}
_ACEOF
@@ -65149,7 +65117,7 @@
-@@ -57936,20 +21223,16 @@
+@@ -57936,20 +21221,16 @@
@@ -65174,7 +65142,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -57965,52 +21248,23 @@
+@@ -57965,52 +21246,23 @@
exit(0);
}
_ACEOF
@@ -65233,7 +65201,7 @@
else
LIBS=$ac_save_LIBS
-@@ -58023,17 +21277,13 @@
+@@ -58023,17 +21275,13 @@
# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
#
@@ -65254,7 +65222,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58047,55 +21297,28 @@
+@@ -58047,55 +21295,28 @@
return 0;
}
_ACEOF
@@ -65317,7 +65285,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58109,55 +21332,28 @@
+@@ -58109,55 +21330,28 @@
return 0;
}
_ACEOF
@@ -65380,7 +65348,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58171,55 +21367,28 @@
+@@ -58171,55 +21365,28 @@
return 0;
}
_ACEOF
@@ -65443,7 +65411,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58233,56 +21402,29 @@
+@@ -58233,56 +21400,29 @@
return 0;
}
_ACEOF
@@ -65507,7 +65475,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_SECURITY_H
-@@ -58300,238 +21442,112 @@
+@@ -58300,238 +21440,112 @@
return 0;
}
_ACEOF
@@ -65782,7 +65750,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58542,63 +21558,32 @@
+@@ -58542,63 +21556,32 @@
return 0;
}
_ACEOF
@@ -65855,7 +65823,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58609,63 +21594,32 @@
+@@ -58609,63 +21592,32 @@
return 0;
}
_ACEOF
@@ -65928,7 +65896,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58676,63 +21630,32 @@
+@@ -58676,63 +21628,32 @@
return 0;
}
_ACEOF
@@ -66001,7 +65969,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58743,147 +21666,30 @@
+@@ -58743,147 +21664,30 @@
return 0;
}
_ACEOF
@@ -66159,7 +66127,7 @@
_ACEOF
fi
-@@ -58895,20 +21701,16 @@
+@@ -58895,20 +21699,16 @@
seteuid=no;
if test $seteuid = no; then
@@ -66184,7 +66152,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -58916,50 +21718,21 @@
+@@ -58916,50 +21716,21 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66241,7 +66209,7 @@
fi
fi
-@@ -58967,20 +21740,16 @@
+@@ -58967,20 +21738,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
@@ -66266,7 +66234,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -58988,69 +21757,36 @@
+@@ -58988,69 +21755,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66346,7 +66314,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59058,69 +21794,36 @@
+@@ -59058,69 +21792,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66426,7 +66394,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59128,64 +21831,31 @@
+@@ -59128,64 +21829,31 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66500,7 +66468,7 @@
/* end confdefs.h. */
#include <sys/syscall.h>
-@@ -59199,195 +21869,98 @@
+@@ -59199,195 +21867,98 @@
return 0;
}
_ACEOF
@@ -66726,7 +66694,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -59411,66 +21984,33 @@
+@@ -59411,66 +21982,33 @@
#endif
}
_ACEOF
@@ -66802,7 +66770,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59483,55 +22023,28 @@
+@@ -59483,55 +22021,28 @@
return 0;
}
_ACEOF
@@ -66865,7 +66833,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59544,55 +22057,28 @@
+@@ -59544,55 +22055,28 @@
return 0;
}
_ACEOF
@@ -66928,7 +66896,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59605,57 +22091,30 @@
+@@ -59605,57 +22089,30 @@
return 0;
}
_ACEOF
@@ -66993,7 +66961,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -59671,58 +22130,31 @@
+@@ -59671,58 +22128,31 @@
return 0;
}
_ACEOF
@@ -67060,7 +67028,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -59741,74 +22173,45 @@
+@@ -59741,74 +22171,45 @@
}
_ACEOF
@@ -67146,7 +67114,7 @@
$as_echo "no" >&6; }
fi
-@@ -59817,24 +22220,24 @@
+@@ -59817,24 +22218,24 @@
####################################################
# check for Linux-specific AFS fake-kaserver support
samba_cv_WITH_FAKE_KASERVER=no
@@ -67176,7 +67144,7 @@
$as_echo "no" >&6; }
fi
-@@ -59846,18 +22249,14 @@
+@@ -59846,18 +22247,14 @@
test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
# see if this box has the OpenSSL DES libraries
@@ -67198,7 +67166,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59875,208 +22274,43 @@
+@@ -59875,208 +22272,43 @@
return 0;
}
_ACEOF
@@ -67423,7 +67391,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -60088,12 +22322,10 @@
+@@ -60088,12 +22320,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
@@ -67438,7 +67406,7 @@
fi
else
have_afs_headers=yes
-@@ -60103,9 +22335,7 @@
+@@ -60103,9 +22333,7 @@
FAKE_KASERVER_OBJ=""
if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -67449,7 +67417,7 @@
FAKE_KASERVER_OBJ="utils/net_afs.o"
fi
-@@ -60114,24 +22344,24 @@
+@@ -60114,24 +22342,24 @@
#################################################
# check whether to compile AFS/NT ACL mapping module
samba_cv_WITH_VFS_AFSACL=no
@@ -67479,7 +67447,7 @@
$as_echo "no" >&6; }
fi
-@@ -60143,36 +22373,32 @@
+@@ -60143,36 +22371,32 @@
if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -67523,7 +67491,7 @@
$as_echo "no" >&6; }
fi
-@@ -60182,12 +22408,12 @@
+@@ -60182,12 +22406,12 @@
# Compile with LDAP support?
with_ldap_support=auto
@@ -67538,7 +67506,7 @@
withval=$with_ldap; case "$withval" in
yes|no)
with_ldap_support=$withval
-@@ -60196,303 +22422,70 @@
+@@ -60196,7 +22420,7 @@
fi
@@ -67547,12 +67515,11 @@
$as_echo "$with_ldap_support" >&6; }
SMBLDAP=""
+@@ -60205,294 +22429,61 @@
- SMBLDAPUTIL=""
+ LDBLDAP=""
--LDBLDAP=""
-
--
-if test x"$with_ldap_support" != x"no"; then
-
- ##################################################################
@@ -67784,8 +67751,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <lber.h>
-+LDBLDAP=""
-
+-
-int
-main ()
-{
@@ -67887,7 +67853,7 @@
$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
fi
with_ldap_support=no
-@@ -60509,23 +22502,17 @@
+@@ -60509,23 +22500,17 @@
# this test must be before the libldap test
@@ -67914,7 +67880,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60543,54 +22530,28 @@
+@@ -60543,54 +22528,28 @@
return 0;
}
_ACEOF
@@ -67976,7 +67942,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLBER 1
_ACEOF
-@@ -60606,25 +22567,19 @@
+@@ -60606,25 +22565,19 @@
fi
@@ -68005,7 +67971,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. */
-@@ -60665,61 +22620,31 @@
+@@ -60665,61 +22618,31 @@
return 0;
}
_ACEOF
@@ -68076,7 +68042,7 @@
/* end confdefs.h. */
#include <ldap.h>
int
-@@ -60730,59 +22655,32 @@
+@@ -60730,59 +22653,32 @@
return 0;
}
_ACEOF
@@ -68143,7 +68109,7 @@
/* end confdefs.h. */
#include <lber.h>
int
-@@ -60793,42 +22691,19 @@
+@@ -60793,42 +22689,19 @@
return 0;
}
_ACEOF
@@ -68190,7 +68156,7 @@
fi
-@@ -60836,23 +22711,17 @@
+@@ -60836,23 +22709,17 @@
# now see if we can find the ldap libs in standard paths
@@ -68217,7 +68183,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60870,54 +22739,28 @@
+@@ -60870,54 +22737,28 @@
return 0;
}
_ACEOF
@@ -68279,7 +68245,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
_ACEOF
-@@ -60933,25 +22776,19 @@
+@@ -60933,25 +22774,19 @@
fi
@@ -68308,7 +68274,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. */
-@@ -60992,62 +22829,32 @@
+@@ -60992,62 +22827,32 @@
return 0;
}
_ACEOF
@@ -68380,7 +68346,7 @@
/* end confdefs.h. */
#include <lber.h>
-@@ -61060,37 +22867,16 @@
+@@ -61060,37 +22865,16 @@
return 0;
}
_ACEOF
@@ -68421,7 +68387,7 @@
$as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
-@@ -61101,19 +22887,14 @@
+@@ -61101,19 +22885,14 @@
@@ -68444,7 +68410,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. */
-@@ -61154,55 +22935,27 @@
+@@ -61154,55 +22933,27 @@
return 0;
}
_ACEOF
@@ -68507,7 +68473,7 @@
CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -61210,17 +22963,15 @@
+@@ -61210,17 +22961,15 @@
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
with_ldap_support=yes
@@ -68529,7 +68495,7 @@
$as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
fi
-@@ -61235,12 +22986,12 @@
+@@ -61235,12 +22984,12 @@
# active directory support
with_ads_support=auto
@@ -68544,7 +68510,7 @@
withval=$with_ads; case "$withval" in
yes|no)
with_ads_support="$withval"
-@@ -61249,7 +23000,7 @@
+@@ -61249,7 +22998,7 @@
fi
@@ -68553,7 +68519,7 @@
$as_echo "$with_ads_support" >&6; }
FOUND_KRB5=no
-@@ -61258,11 +23009,9 @@
+@@ -61258,11 +23007,9 @@
if test x"$with_ldap_support" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -68567,7 +68533,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
with_ads_support=no
fi
-@@ -61277,19 +23026,14 @@
+@@ -61277,19 +23024,14 @@
*hpux*)
@@ -68590,7 +68556,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. */
-@@ -61330,57 +23074,29 @@
+@@ -61330,57 +23072,29 @@
return 0;
}
_ACEOF
@@ -68656,7 +68622,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
with_ads_support=no
fi
-@@ -61389,19 +23105,14 @@
+@@ -61389,19 +23103,14 @@
*)
@@ -68679,7 +68645,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. */
-@@ -61442,57 +23153,29 @@
+@@ -61442,57 +23151,29 @@
return 0;
}
_ACEOF
@@ -68745,7 +68711,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
with_ads_support=no
fi
-@@ -61503,19 +23186,14 @@
+@@ -61503,19 +23184,14 @@
@@ -68768,7 +68734,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. */
-@@ -61556,57 +23234,29 @@
+@@ -61556,57 +23232,29 @@
return 0;
}
_ACEOF
@@ -68834,7 +68800,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
with_ads_support=no
fi
-@@ -61622,23 +23272,23 @@
+@@ -61622,23 +23270,23 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# check for location of Kerberos 5 install
@@ -68863,7 +68829,7 @@
$as_echo "$withval" >&6; }
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
-@@ -61650,7 +23300,7 @@
+@@ -61650,7 +23298,7 @@
;;
esac
else
@@ -68872,7 +68838,7 @@
$as_echo "no krb5-path given" >&6; }
fi
-@@ -61661,9 +23311,9 @@
+@@ -61661,9 +23309,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
@@ -68884,7 +68850,7 @@
$as_echo_n "(cached) " >&6
else
case $KRB5CONFIG in
-@@ -61676,14 +23326,14 @@
+@@ -61676,14 +23324,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -68902,7 +68868,7 @@
IFS=$as_save_IFS
;;
-@@ -61691,15 +23341,15 @@
+@@ -61691,15 +23339,15 @@
fi
KRB5CONFIG=$ac_cv_path_KRB5CONFIG
if test -n "$KRB5CONFIG"; then
@@ -68921,7 +68887,7 @@
$as_echo_n "checking for working krb5-config... " >&6; }
if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
ac_save_CFLAGS=$CFLAGS
-@@ -61713,17 +23363,17 @@
+@@ -61713,17 +23361,17 @@
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
@@ -68942,7 +68908,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
-@@ -61731,17 +23381,17 @@
+@@ -61731,17 +23379,17 @@
KRB5_CPPFLAGS="-I/usr/include/heimdal"
KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
FOUND_KRB5=yes
@@ -68963,7 +68929,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61749,17 +23399,17 @@
+@@ -61749,17 +23397,17 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
@@ -68984,7 +68950,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61767,16 +23417,16 @@
+@@ -61767,16 +23415,16 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the OpenBSD location for heimdal krb5
@@ -69004,7 +68970,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61863,151 +23513,12 @@
+@@ -61863,151 +23511,12 @@
# now check for krb5.h. Some systems have the libraries without the headers!
# note that this check is done here to allow for different kerberos
# include paths
@@ -69161,7 +69127,7 @@
_ACEOF
fi
-@@ -62021,11 +23532,9 @@
+@@ -62021,11 +23530,9 @@
# i.e with_ads_support = auto, otherwise die with an error.
if test x"$with_ads_support" = x"yes"; then
@@ -69175,7 +69141,7 @@
$as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
fi
-@@ -62037,151 +23546,12 @@
+@@ -62037,151 +23544,12 @@
CPPFLAGS=$ac_save_CPPFLAGS
LDFLAGS=$ac_save_LDFLAGS
fi
@@ -69332,7 +69298,7 @@
_ACEOF
fi
-@@ -62203,152 +23573,12 @@
+@@ -62203,152 +23571,12 @@
# now check for gssapi headers. This is also done here to allow for
# different kerberos include paths
@@ -69491,7 +69457,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -62362,23 +23592,17 @@
+@@ -62362,23 +23590,17 @@
# we might need the k5crypto and com_err libraries on some systems
@@ -69518,7 +69484,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62396,54 +23620,28 @@
+@@ -62396,54 +23618,28 @@
return 0;
}
_ACEOF
@@ -69580,7 +69546,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
-@@ -62460,24 +23658,17 @@
+@@ -62460,24 +23656,17 @@
fi
@@ -69608,7 +69574,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62495,54 +23686,28 @@
+@@ -62495,54 +23684,28 @@
return 0;
}
_ACEOF
@@ -69670,7 +69636,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
-@@ -62558,27 +23723,20 @@
+@@ -62558,27 +23721,20 @@
fi
@@ -69701,7 +69667,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62596,54 +23754,28 @@
+@@ -62596,54 +23752,28 @@
return 0;
}
_ACEOF
@@ -69763,7 +69729,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
-@@ -62660,24 +23792,17 @@
+@@ -62660,24 +23790,17 @@
fi
@@ -69791,10 +69757,11 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62694,55 +23819,29 @@
+@@ -62693,56 +23816,30 @@
+ return copy_Authenticator ();
;
return 0;
- }
+-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -69817,6 +69784,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ext_asn1_copy_Authenticator=yes;
@@ -69855,7 +69823,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBASN1 1
_ACEOF
-@@ -62759,24 +23858,17 @@
+@@ -62759,24 +23856,17 @@
fi
@@ -69883,7 +69851,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62794,54 +23886,28 @@
+@@ -62794,54 +23884,28 @@
return 0;
}
_ACEOF
@@ -69945,7 +69913,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBROKEN 1
_ACEOF
-@@ -62857,27 +23923,20 @@
+@@ -62857,27 +23921,20 @@
fi
@@ -69976,7 +69944,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62895,54 +23954,28 @@
+@@ -62895,54 +23952,28 @@
return 0;
}
_ACEOF
@@ -70038,7 +70006,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI 1
_ACEOF
-@@ -62958,29 +23991,22 @@
+@@ -62958,29 +23989,22 @@
fi
@@ -70071,7 +70039,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62998,54 +24024,28 @@
+@@ -62998,54 +24022,28 @@
return 0;
}
_ACEOF
@@ -70133,7 +70101,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63062,24 +24062,17 @@
+@@ -63062,24 +24060,17 @@
fi
@@ -70161,7 +70129,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63097,54 +24090,28 @@
+@@ -63097,54 +24088,28 @@
return 0;
}
_ACEOF
@@ -70223,7 +70191,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63160,29 +24127,22 @@
+@@ -63160,29 +24125,22 @@
fi
@@ -70256,7 +70224,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63200,54 +24160,28 @@
+@@ -63200,54 +24158,28 @@
return 0;
}
_ACEOF
@@ -70318,7 +70286,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI_KRB5 1
_ACEOF
-@@ -63262,24 +24196,18 @@
+@@ -63262,24 +24194,18 @@
have_gssapi=yes
fi
@@ -70346,7 +70314,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. */
-@@ -63320,43 +24248,18 @@
+@@ -63320,43 +24246,18 @@
return 0;
}
_ACEOF
@@ -70396,7 +70364,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_REAL_TIME 1
_ACEOF
-@@ -63364,20 +24267,14 @@
+@@ -63364,20 +24265,14 @@
fi
@@ -70420,7 +70388,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. */
-@@ -63418,43 +24315,18 @@
+@@ -63418,43 +24313,18 @@
return 0;
}
_ACEOF
@@ -70470,7 +70438,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -63462,20 +24334,14 @@
+@@ -63462,20 +24332,14 @@
fi
@@ -70494,7 +70462,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. */
-@@ -63516,43 +24382,18 @@
+@@ -63516,43 +24380,18 @@
return 0;
}
_ACEOF
@@ -70544,7 +70512,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
_ACEOF
-@@ -63560,20 +24401,14 @@
+@@ -63560,20 +24399,14 @@
fi
@@ -70568,7 +70536,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. */
-@@ -63614,43 +24449,18 @@
+@@ -63614,43 +24447,18 @@
return 0;
}
_ACEOF
@@ -70618,7 +70586,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
_ACEOF
-@@ -63658,20 +24468,14 @@
+@@ -63658,20 +24466,14 @@
fi
@@ -70642,7 +70610,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. */
-@@ -63712,43 +24516,18 @@
+@@ -63712,43 +24514,18 @@
return 0;
}
_ACEOF
@@ -70692,7 +70660,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL2SALT 1
_ACEOF
-@@ -63756,20 +24535,14 @@
+@@ -63756,20 +24533,14 @@
fi
@@ -70716,7 +70684,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. */
-@@ -63810,43 +24583,18 @@
+@@ -63810,43 +24581,18 @@
return 0;
}
_ACEOF
@@ -70766,7 +70734,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_USE_ENCTYPE 1
_ACEOF
-@@ -63854,20 +24602,14 @@
+@@ -63854,20 +24600,14 @@
fi
@@ -70790,7 +70758,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. */
-@@ -63908,43 +24650,18 @@
+@@ -63908,43 +24648,18 @@
return 0;
}
_ACEOF
@@ -70840,7 +70808,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY 1
_ACEOF
-@@ -63952,20 +24669,14 @@
+@@ -63952,20 +24667,14 @@
fi
@@ -70864,7 +70832,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. */
-@@ -64006,43 +24717,18 @@
+@@ -64006,43 +24715,18 @@
return 0;
}
_ACEOF
@@ -70914,7 +70882,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PW_SALT 1
_ACEOF
-@@ -64050,20 +24736,14 @@
+@@ -64050,20 +24734,14 @@
fi
@@ -70938,7 +70906,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. */
-@@ -64104,43 +24784,18 @@
+@@ -64104,43 +24782,18 @@
return 0;
}
_ACEOF
@@ -70988,7 +70956,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY_SALT 1
_ACEOF
-@@ -64148,20 +24803,14 @@
+@@ -64148,20 +24801,14 @@
fi
@@ -71012,7 +70980,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. */
-@@ -64202,43 +24851,18 @@
+@@ -64202,43 +24849,18 @@
return 0;
}
_ACEOF
@@ -71062,7 +71030,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETKEY 1
_ACEOF
-@@ -64246,20 +24870,14 @@
+@@ -64246,20 +24868,14 @@
fi
@@ -71086,7 +71054,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. */
-@@ -64300,43 +24918,18 @@
+@@ -64300,43 +24916,18 @@
return 0;
}
_ACEOF
@@ -71136,7 +71104,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
_ACEOF
-@@ -64344,20 +24937,14 @@
+@@ -64344,20 +24935,14 @@
fi
@@ -71160,7 +71128,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. */
-@@ -64398,43 +24985,18 @@
+@@ -64398,43 +24983,18 @@
return 0;
}
_ACEOF
@@ -71210,7 +71178,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_LOCATE_KDC 1
_ACEOF
-@@ -64442,20 +25004,14 @@
+@@ -64442,20 +25002,14 @@
fi
@@ -71234,7 +71202,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. */
-@@ -64496,43 +25052,18 @@
+@@ -64496,43 +25050,18 @@
return 0;
}
_ACEOF
@@ -71284,7 +71252,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
_ACEOF
-@@ -64540,20 +25071,14 @@
+@@ -64540,20 +25069,14 @@
fi
@@ -71308,7 +71276,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. */
-@@ -64594,43 +25119,18 @@
+@@ -64594,43 +25117,18 @@
return 0;
}
_ACEOF
@@ -71358,7 +71326,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -64638,20 +25138,14 @@
+@@ -64638,20 +25136,14 @@
fi
@@ -71382,7 +71350,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. */
-@@ -64692,43 +25186,18 @@
+@@ -64692,43 +25184,18 @@
return 0;
}
_ACEOF
@@ -71432,7 +71400,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_DATA_CONTENTS 1
_ACEOF
-@@ -64736,20 +25205,14 @@
+@@ -64736,20 +25203,14 @@
fi
@@ -71456,7 +71424,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. */
-@@ -64790,43 +25253,18 @@
+@@ -64790,43 +25251,18 @@
return 0;
}
_ACEOF
@@ -71506,7 +71474,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
_ACEOF
-@@ -64834,20 +25272,14 @@
+@@ -64834,20 +25270,14 @@
fi
@@ -71530,7 +71498,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. */
-@@ -64888,43 +25320,18 @@
+@@ -64888,43 +25318,18 @@
return 0;
}
_ACEOF
@@ -71580,7 +71548,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_UNPARSED_NAME 1
_ACEOF
-@@ -64932,20 +25339,14 @@
+@@ -64932,20 +25337,14 @@
fi
@@ -71604,7 +71572,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. */
-@@ -64986,43 +25387,18 @@
+@@ -64986,43 +25385,18 @@
return 0;
}
_ACEOF
@@ -71654,7 +71622,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
_ACEOF
-@@ -65030,20 +25406,14 @@
+@@ -65030,20 +25404,14 @@
fi
@@ -71678,7 +71646,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. */
-@@ -65084,43 +25454,18 @@
+@@ -65084,43 +25452,18 @@
return 0;
}
_ACEOF
@@ -71728,7 +71696,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KT_FREE_ENTRY 1
_ACEOF
-@@ -65128,20 +25473,14 @@
+@@ -65128,20 +25471,14 @@
fi
@@ -71752,7 +71720,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. */
-@@ -65182,43 +25521,18 @@
+@@ -65182,43 +25519,18 @@
return 0;
}
_ACEOF
@@ -71802,7 +71770,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_INIT 1
_ACEOF
-@@ -65226,20 +25540,14 @@
+@@ -65226,20 +25538,14 @@
fi
@@ -71826,7 +71794,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. */
-@@ -65280,43 +25588,18 @@
+@@ -65280,43 +25586,18 @@
return 0;
}
_ACEOF
@@ -71876,7 +71844,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
_ACEOF
-@@ -65324,20 +25607,14 @@
+@@ -65324,20 +25605,14 @@
fi
@@ -71900,7 +71868,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. */
-@@ -65378,43 +25655,18 @@
+@@ -65378,43 +25653,18 @@
return 0;
}
_ACEOF
@@ -71950,7 +71918,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_ENCTYPE_COMPARE 1
_ACEOF
-@@ -65422,20 +25674,14 @@
+@@ -65422,20 +25672,14 @@
fi
@@ -71974,7 +71942,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. */
-@@ -65476,43 +25722,18 @@
+@@ -65476,43 +25720,18 @@
return 0;
}
_ACEOF
@@ -72024,7 +71992,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
_ACEOF
-@@ -65520,20 +25741,14 @@
+@@ -65520,20 +25739,14 @@
fi
@@ -72048,7 +72016,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. */
-@@ -65574,43 +25789,18 @@
+@@ -65574,43 +25787,18 @@
return 0;
}
_ACEOF
@@ -72098,7 +72066,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_INIT 1
_ACEOF
-@@ -65618,20 +25808,14 @@
+@@ -65618,20 +25806,14 @@
fi
@@ -72122,7 +72090,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. */
-@@ -65672,43 +25856,18 @@
+@@ -65672,43 +25854,18 @@
return 0;
}
_ACEOF
@@ -72172,7 +72140,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_DESTROY 1
_ACEOF
-@@ -65716,20 +25875,14 @@
+@@ -65716,20 +25873,14 @@
fi
@@ -72196,7 +72164,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. */
-@@ -65770,43 +25923,18 @@
+@@ -65770,43 +25921,18 @@
return 0;
}
_ACEOF
@@ -72246,7 +72214,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_DECODE_AP_REQ 1
_ACEOF
-@@ -65814,20 +25942,14 @@
+@@ -65814,20 +25940,14 @@
fi
@@ -72270,7 +72238,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. */
-@@ -65868,43 +25990,18 @@
+@@ -65868,43 +25988,18 @@
return 0;
}
_ACEOF
@@ -72320,7 +72288,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_FREE_AP_REQ 1
_ACEOF
-@@ -65912,20 +26009,14 @@
+@@ -65912,20 +26007,14 @@
fi
@@ -72344,7 +72312,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. */
-@@ -65966,43 +26057,18 @@
+@@ -65966,43 +26055,18 @@
return 0;
}
_ACEOF
@@ -72394,7 +72362,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66010,20 +26076,14 @@
+@@ -66010,20 +26074,14 @@
fi
@@ -72418,7 +72386,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. */
-@@ -66064,43 +26124,18 @@
+@@ -66064,43 +26122,18 @@
return 0;
}
_ACEOF
@@ -72468,7 +72436,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66108,20 +26143,14 @@
+@@ -66108,20 +26141,14 @@
fi
@@ -72492,7 +72460,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. */
-@@ -66162,43 +26191,18 @@
+@@ -66162,43 +26189,18 @@
return 0;
}
_ACEOF
@@ -72542,7 +72510,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
_ACEOF
-@@ -66206,20 +26210,14 @@
+@@ -66206,20 +26208,14 @@
fi
@@ -72566,7 +72534,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. */
-@@ -66260,43 +26258,18 @@
+@@ -66260,43 +26256,18 @@
return 0;
}
_ACEOF
@@ -72616,7 +72584,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PARSE_NAME_NOREALM 1
_ACEOF
-@@ -66304,20 +26277,14 @@
+@@ -66304,20 +26275,14 @@
fi
@@ -72640,7 +72608,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. */
-@@ -66358,43 +26325,18 @@
+@@ -66358,43 +26323,18 @@
return 0;
}
_ACEOF
@@ -72690,7 +72658,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINC_SIZE 1
_ACEOF
-@@ -66402,20 +26344,14 @@
+@@ -66402,20 +26342,14 @@
fi
@@ -72714,7 +72682,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. */
-@@ -66456,43 +26392,18 @@
+@@ -66456,43 +26390,18 @@
return 0;
}
_ACEOF
@@ -72764,7 +72732,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
_ACEOF
-@@ -66500,20 +26411,14 @@
+@@ -66500,20 +26409,14 @@
fi
@@ -72788,7 +72756,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. */
-@@ -66554,43 +26459,18 @@
+@@ -66554,43 +26457,18 @@
return 0;
}
_ACEOF
@@ -72838,7 +72806,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_RENEWED_CREDS 1
_ACEOF
-@@ -66598,20 +26478,14 @@
+@@ -66598,20 +26476,14 @@
fi
@@ -72862,7 +72830,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. */
-@@ -66652,43 +26526,18 @@
+@@ -66652,43 +26524,18 @@
return 0;
}
_ACEOF
@@ -72912,7 +72880,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_KDC_CRED 1
_ACEOF
-@@ -66696,20 +26545,14 @@
+@@ -66696,20 +26543,14 @@
fi
@@ -72936,7 +72904,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. */
-@@ -66750,43 +26593,18 @@
+@@ -66750,43 +26591,18 @@
return 0;
}
_ACEOF
@@ -72986,7 +72954,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_ERROR_CONTENTS 1
_ACEOF
-@@ -66794,20 +26612,14 @@
+@@ -66794,20 +26610,14 @@
fi
@@ -73010,7 +72978,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. */
-@@ -66848,43 +26660,18 @@
+@@ -66848,43 +26658,18 @@
return 0;
}
_ACEOF
@@ -73060,7 +73028,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
_ACEOF
-@@ -66892,20 +26679,14 @@
+@@ -66892,20 +26677,14 @@
fi
@@ -73084,7 +73052,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. */
-@@ -66946,43 +26727,18 @@
+@@ -66946,43 +26725,18 @@
return 0;
}
_ACEOF
@@ -73134,7 +73102,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
_ACEOF
-@@ -66990,20 +26746,14 @@
+@@ -66990,20 +26744,14 @@
fi
@@ -73158,7 +73126,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. */
-@@ -67044,43 +26794,18 @@
+@@ -67044,43 +26792,18 @@
return 0;
}
_ACEOF
@@ -73208,7 +73176,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
_ACEOF
-@@ -67088,20 +26813,14 @@
+@@ -67088,20 +26811,14 @@
fi
@@ -73232,7 +73200,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. */
-@@ -67142,43 +26861,18 @@
+@@ -67142,43 +26859,18 @@
return 0;
}
_ACEOF
@@ -73282,7 +73250,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
_ACEOF
-@@ -67186,20 +26880,14 @@
+@@ -67186,20 +26878,14 @@
fi
@@ -73306,7 +73274,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. */
-@@ -67240,43 +26928,18 @@
+@@ -67240,43 +26926,18 @@
return 0;
}
_ACEOF
@@ -73356,7 +73324,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPE_TO_STRING 1
_ACEOF
-@@ -67284,20 +26947,14 @@
+@@ -67284,20 +26945,14 @@
fi
@@ -73380,7 +73348,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. */
-@@ -67338,43 +26995,18 @@
+@@ -67338,43 +26993,18 @@
return 0;
}
_ACEOF
@@ -73430,7 +73398,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FWD_TGT_CREDS 1
_ACEOF
-@@ -67382,20 +27014,14 @@
+@@ -67382,20 +27012,14 @@
fi
@@ -73454,7 +73422,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. */
-@@ -67436,63 +27062,33 @@
+@@ -67436,63 +27060,33 @@
return 0;
}
_ACEOF
@@ -73527,7 +73495,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67512,57 +27108,30 @@
+@@ -67512,57 +27106,30 @@
return 0;
}
_ACEOF
@@ -73592,7 +73560,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67578,58 +27147,31 @@
+@@ -67578,58 +27145,31 @@
return 0;
}
_ACEOF
@@ -73658,7 +73626,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67641,36 +27183,15 @@
+@@ -67641,36 +27181,15 @@
return 0;
}
_ACEOF
@@ -73698,7 +73666,7 @@
$as_echo "$smb_krb5_cv_verify_checksum" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -67678,17 +27199,13 @@
+@@ -67678,17 +27197,13 @@
_ACEOF
@@ -73719,7 +73687,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67699,56 +27216,29 @@
+@@ -67699,56 +27214,29 @@
return 0;
}
_ACEOF
@@ -73783,7 +73751,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67759,56 +27249,29 @@
+@@ -67759,56 +27247,29 @@
return 0;
}
_ACEOF
@@ -73847,7 +73815,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67819,56 +27282,29 @@
+@@ -67819,56 +27280,29 @@
return 0;
}
_ACEOF
@@ -73911,7 +73879,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67879,56 +27315,29 @@
+@@ -67879,56 +27313,29 @@
return 0;
}
_ACEOF
@@ -73975,7 +73943,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67939,56 +27348,29 @@
+@@ -67939,56 +27346,29 @@
return 0;
}
_ACEOF
@@ -74039,7 +74007,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67999,56 +27381,29 @@
+@@ -67999,56 +27379,29 @@
return 0;
}
_ACEOF
@@ -74103,7 +74071,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68059,56 +27414,29 @@
+@@ -68059,56 +27412,29 @@
return 0;
}
_ACEOF
@@ -74167,7 +74135,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68119,55 +27447,28 @@
+@@ -68119,55 +27445,28 @@
return 0;
}
_ACEOF
@@ -74230,7 +74198,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68178,56 +27479,29 @@
+@@ -68178,56 +27477,29 @@
return 0;
}
_ACEOF
@@ -74294,7 +74262,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68238,56 +27512,29 @@
+@@ -68238,56 +27510,29 @@
return 0;
}
_ACEOF
@@ -74358,7 +74326,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68298,56 +27545,29 @@
+@@ -68298,56 +27543,29 @@
return 0;
}
_ACEOF
@@ -74422,11 +74390,10 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68356,58 +27576,31 @@
- krb5_keyblock key; key.keyvalue.data = NULL;
+@@ -68357,57 +27575,30 @@
;
return 0;
--}
+ }
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -74446,7 +74413,6 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes
@@ -74490,7 +74456,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68418,47 +27611,22 @@
+@@ -68418,47 +27609,22 @@
return 0;
}
_ACEOF
@@ -74544,7 +74510,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68469,58 +27637,31 @@
+@@ -68469,58 +27635,31 @@
return 0;
}
_ACEOF
@@ -74610,7 +74576,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68531,56 +27672,29 @@
+@@ -68531,56 +27670,29 @@
return 0;
}
_ACEOF
@@ -74674,7 +74640,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68591,56 +27705,29 @@
+@@ -68591,56 +27703,29 @@
return 0;
}
_ACEOF
@@ -74738,7 +74704,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68651,56 +27738,29 @@
+@@ -68651,56 +27736,29 @@
return 0;
}
_ACEOF
@@ -74802,7 +74768,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68711,56 +27771,29 @@
+@@ -68711,56 +27769,29 @@
return 0;
}
_ACEOF
@@ -74866,7 +74832,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68771,61 +27804,30 @@
+@@ -68771,61 +27802,30 @@
return 0;
}
_ACEOF
@@ -74937,7 +74903,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68836,56 +27838,29 @@
+@@ -68836,56 +27836,29 @@
return 0;
}
_ACEOF
@@ -75001,7 +74967,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68896,56 +27871,29 @@
+@@ -68896,56 +27869,29 @@
return 0;
}
_ACEOF
@@ -75065,7 +75031,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68956,65 +27904,35 @@
+@@ -68956,65 +27902,35 @@
return 0;
}
_ACEOF
@@ -75142,7 +75108,7 @@
/* end confdefs.h. */
#include<krb5.h>
-@@ -69027,65 +27945,32 @@
+@@ -69027,65 +27943,32 @@
return krb5_kt_resolve(context, "WRFILE:api", &keytab);
}
_ACEOF
@@ -75217,7 +75183,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69099,56 +27984,29 @@
+@@ -69099,56 +27982,29 @@
return 0;
}
_ACEOF
@@ -75281,7 +75247,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69159,56 +28017,29 @@
+@@ -69159,56 +28015,29 @@
return 0;
}
_ACEOF
@@ -75345,7 +75311,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69220,49 +28051,26 @@
+@@ -69220,49 +28049,26 @@
return 0;
}
_ACEOF
@@ -75401,7 +75367,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69276,20 +28084,13 @@
+@@ -69276,20 +28082,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75427,7 +75393,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -69303,42 +28104,15 @@
+@@ -69303,42 +28102,15 @@
}
_ACEOF
@@ -75474,7 +75440,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69350,20 +28124,18 @@
+@@ -69350,20 +28122,18 @@
export LDFLAGS;
fi
@@ -75499,7 +75465,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69377,20 +28149,13 @@
+@@ -69377,20 +28147,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75525,7 +75491,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -69401,42 +28166,15 @@
+@@ -69401,42 +28164,15 @@
}
_ACEOF
@@ -75572,7 +75538,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69448,29 +28186,23 @@
+@@ -69448,29 +28184,23 @@
export LDFLAGS;
fi
@@ -75607,7 +75573,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69481,61 +28213,30 @@
+@@ -69481,61 +28211,30 @@
return 0;
}
_ACEOF
@@ -75678,7 +75644,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69546,47 +28247,20 @@
+@@ -69546,47 +28245,20 @@
return 0;
}
_ACEOF
@@ -75732,7 +75698,7 @@
fi
-@@ -69598,7 +28272,7 @@
+@@ -69598,7 +28270,7 @@
#
#
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -75741,7 +75707,7 @@
$as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
use_ads=no
fi
-@@ -69606,7 +28280,7 @@
+@@ -69606,7 +28278,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
@@ -75750,7 +75716,7 @@
$as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69614,7 +28288,7 @@
+@@ -69614,7 +28286,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
@@ -75759,7 +75725,7 @@
$as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69622,7 +28296,7 @@
+@@ -69622,7 +28294,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
@@ -75768,7 +75734,7 @@
$as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69630,7 +28304,7 @@
+@@ -69630,7 +28302,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
@@ -75777,7 +75743,7 @@
$as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69642,14 +28316,14 @@
+@@ -69642,14 +28314,14 @@
if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
then
@@ -75794,7 +75760,7 @@
$as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69658,29 +28332,21 @@
+@@ -69658,29 +28330,21 @@
if test x"$use_ads" = x"yes"; then
@@ -75829,7 +75795,7 @@
$as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
fi
-@@ -69706,9 +28372,9 @@
+@@ -69706,9 +28370,9 @@
KRB5_LIBS=""
with_ads_support=no
fi
@@ -75841,7 +75807,7 @@
$as_echo "$use_ads" >&6; }
LIBS="$ac_save_LIBS"
-@@ -69720,23 +28386,17 @@
+@@ -69720,23 +28384,17 @@
@@ -75868,7 +75834,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -69754,54 +28414,28 @@
+@@ -69754,54 +28412,28 @@
return 0;
}
_ACEOF
@@ -75930,7 +75896,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSCD 1
_ACEOF
-@@ -69816,7 +28450,6 @@
+@@ -69816,7 +28448,6 @@
fi
@@ -75938,7 +75904,7 @@
PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
-@@ -69824,12 +28457,12 @@
+@@ -69824,12 +28455,12 @@
# Compile with DNS Updates support?
with_dnsupdate_support=no
@@ -75953,7 +75919,7 @@
withval=$with_dnsupdate; case "$withval" in
yes|no)
with_dnsupdate_support=$withval
-@@ -69838,7 +28471,7 @@
+@@ -69838,7 +28469,7 @@
fi
@@ -75962,7 +75928,7 @@
$as_echo "$with_dnsupdate_support" >&6; }
if test x"$with_dnsupdate_support" != x"no"; then
-@@ -69852,151 +28485,12 @@
+@@ -69852,151 +28483,12 @@
##################################################################
# then test for uuid.h (necessary to generate unique DNS keynames
# (uuid.h is required for this test)
@@ -76119,7 +76085,7 @@
_ACEOF
fi
-@@ -70006,11 +28500,9 @@
+@@ -70006,11 +28498,9 @@
if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76133,7 +76099,7 @@
$as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70026,102 +28518,12 @@
+@@ -70026,102 +28516,12 @@
UUID_LIBS=""
@@ -76241,7 +76207,7 @@
_ACEOF
# uuid_generate was found in libc or existing $LIBS
-@@ -70138,9 +28540,7 @@
+@@ -70138,9 +28538,7 @@
with_dnsupdate_support=yes
@@ -76252,7 +76218,7 @@
-@@ -70153,11 +28553,9 @@
+@@ -70153,11 +28551,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76266,7 +76232,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70166,18 +28564,14 @@
+@@ -70166,18 +28562,14 @@
;;
*)
# uuid_generate was not found, try adding libuuid
@@ -76288,7 +76254,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -70195,43 +28589,18 @@
+@@ -70195,43 +28587,18 @@
return 0;
}
_ACEOF
@@ -76338,7 +76304,7 @@
LIBS="-luuid $LIBS"
-@@ -70247,9 +28616,7 @@
+@@ -70247,9 +28614,7 @@
with_dnsupdate_support=yes
@@ -76349,7 +76315,7 @@
-@@ -70259,11 +28626,9 @@
+@@ -70259,11 +28624,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76363,7 +76329,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70283,28 +28648,26 @@
+@@ -70283,28 +28646,26 @@
#################################################
# check for automount support
@@ -76398,7 +76364,7 @@
$as_echo "no" >&6; }
fi
-@@ -70315,208 +28678,63 @@
+@@ -70315,208 +28676,63 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
@@ -76438,7 +76404,7 @@
+ as_fn_error "not on a linux system!" "$LINENO" 5
;;
esac
- ;;
+- ;;
- esac
-else
- case "$host_os" in
@@ -76596,6 +76562,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
++ ;;
+ esac
else
- eval "$as_ac_Header=\$ac_header_preproc"
@@ -76639,7 +76606,7 @@
_ACEOF
HAVE_KEYUTILS_H=1
else
-@@ -70528,34 +28746,28 @@
+@@ -70528,34 +28744,28 @@
CIFSUPCALL_PROGS=""
INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
@@ -76681,7 +76648,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70563,9 +28775,7 @@
+@@ -70563,9 +28773,7 @@
fi
;;
*)
@@ -76692,7 +76659,7 @@
;;
esac
;;
-@@ -70574,18 +28784,16 @@
+@@ -70574,18 +28782,16 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -76715,7 +76682,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70593,7 +28801,7 @@
+@@ -70593,7 +28799,7 @@
fi
;;
*)
@@ -76724,7 +76691,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -70610,11 +28818,11 @@
+@@ -70610,11 +28816,11 @@
with_pam_for_crypt=no
try_pam=no
@@ -76738,7 +76705,7 @@
withval=$with_pam; case "$withval" in
yes|no)
try_pam=$withval
-@@ -70623,7 +28831,7 @@
+@@ -70623,7 +28829,7 @@
fi
@@ -76747,7 +76714,7 @@
$as_echo "$try_pam" >&6; }
use_pam=no
-@@ -70634,150 +28842,12 @@
+@@ -70634,150 +28840,12 @@
# Most systems have PAM headers in /usr/include/security, but Darwin
# has them in /usr/include/pam.
@@ -76904,7 +76871,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -70789,9 +28859,7 @@
+@@ -70789,9 +28857,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
@@ -76915,7 +76882,7 @@
fi
use_pam=no
create_pam_modules=no
-@@ -70799,23 +28867,17 @@
+@@ -70799,23 +28865,17 @@
@@ -76942,7 +76909,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -70833,54 +28895,28 @@
+@@ -70833,54 +28893,28 @@
return 0;
}
_ACEOF
@@ -77004,7 +76971,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -70895,34 +28931,18 @@
+@@ -70895,34 +28929,18 @@
fi
@@ -77044,7 +77011,7 @@
#if HAVE_SECURITY_PAM_APPL_H
#include <security/pam_appl.h>
#endif
-@@ -70930,44 +28950,9 @@
+@@ -70930,44 +28948,9 @@
#include <pam/pam_appl.h>
#endif
@@ -77092,7 +77059,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -70979,179 +28964,33 @@
+@@ -70979,179 +28962,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
@@ -77282,7 +77249,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71160,150 +28999,12 @@
+@@ -71160,150 +28997,12 @@
done
@@ -77439,7 +77406,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71314,19 +29015,14 @@
+@@ -71314,19 +29013,14 @@
@@ -77462,7 +77429,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. */
-@@ -71367,62 +29063,36 @@
+@@ -71367,62 +29061,36 @@
return 0;
}
_ACEOF
@@ -77536,7 +77503,7 @@
$as_echo "$create_pam_modules" >&6; }
fi # try_pam != no
-@@ -71431,26 +29101,22 @@
+@@ -71431,26 +29099,22 @@
PAM_MODULES=""
INSTALL_PAM_MODULES=""
UNINSTALL_PAM_MODULES=""
@@ -77568,7 +77535,7 @@
else
PAM_MODULES="pam_smbpass"
INSTALL_PAM_MODULES="installpammodules"
-@@ -71458,12 +29124,12 @@
+@@ -71458,12 +29122,12 @@
fi
;;
*)
@@ -77583,7 +77550,7 @@
$as_echo "no" >&6; }
fi
-@@ -71477,98 +29143,63 @@
+@@ -71477,98 +29141,63 @@
## $with_pam_for_crypt variable as above --jerry
##
if test $with_pam_for_crypt = no; then
@@ -77698,7 +77665,7 @@
$as_echo "no" >&6; }
fi
-@@ -71576,28 +29207,26 @@
+@@ -71576,28 +29205,26 @@
#################################################
# check for syslog logging
@@ -77733,7 +77700,7 @@
$as_echo "no" >&6; }
fi
-@@ -71605,16 +29234,14 @@
+@@ -71605,16 +29232,14 @@
#################################################
# check for custom syslog facility
@@ -77753,7 +77720,7 @@
else
if test "$withval" != "yes" ; then
syslog_facility="$withval"
-@@ -71639,14 +29266,14 @@
+@@ -71639,14 +29264,14 @@
samba_cv_TRY_SYS_QUOTAS=auto
samba_cv_SYSQUOTA_FOUND=no
@@ -77771,7 +77738,7 @@
$as_echo "yes" >&6; }
samba_cv_WITH_QUOTAS=yes
samba_cv_TRY_QUOTAS=yes
-@@ -71655,7 +29282,7 @@
+@@ -71655,7 +29280,7 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
auto)
@@ -77780,7 +77747,7 @@
$as_echo "auto" >&6; }
samba_cv_WITH_QUOTAS=auto
samba_cv_TRY_QUOTAS=auto
-@@ -71664,719 +29291,165 @@
+@@ -71664,719 +29289,165 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
no)
@@ -77838,13 +77805,13 @@
;;
*)
- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
- $as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
- ;;
- esac
+-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+- ;;
+- esac
-else
- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
--$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+ $as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
-
-fi
-
@@ -78186,14 +78153,15 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++ ;;
++ esac
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
@@ -78586,7 +78554,7 @@
_ACEOF
fi
-@@ -72386,17 +29459,13 @@
+@@ -72386,17 +29457,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
@@ -78607,7 +78575,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72416,35 +29485,14 @@
+@@ -72416,35 +29483,14 @@
return 0;
}
_ACEOF
@@ -78646,7 +78614,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
-@@ -72452,17 +29500,13 @@
+@@ -72452,17 +29498,13 @@
fi
# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -78667,7 +78635,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72480,41 +29524,18 @@
+@@ -72480,41 +29522,18 @@
return 0;
}
_ACEOF
@@ -78713,7 +78681,7 @@
fi
-@@ -72522,9 +29543,9 @@
+@@ -72522,9 +29541,9 @@
# look for a working quota system
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -78725,7 +78693,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72538,14 +29559,10 @@
+@@ -72538,14 +29557,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78742,7 +78710,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4A 1
-@@ -72553,42 +29570,15 @@
+@@ -72553,42 +29568,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78789,7 +78757,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72600,23 +29590,21 @@
+@@ -72600,23 +29588,21 @@
export LDFLAGS;
fi
@@ -78817,7 +78785,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72630,14 +29618,10 @@
+@@ -72630,14 +29616,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78834,7 +78802,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4B 1
-@@ -72645,42 +29629,15 @@
+@@ -72645,42 +29627,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78881,7 +78849,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72692,24 +29649,22 @@
+@@ -72692,24 +29647,22 @@
export LDFLAGS;
fi
@@ -78910,7 +78878,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72723,14 +29678,10 @@
+@@ -72723,14 +29676,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78927,7 +78895,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_3 1
-@@ -72738,42 +29689,15 @@
+@@ -72738,42 +29687,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78974,7 +78942,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72785,15 +29709,13 @@
+@@ -72785,15 +29707,13 @@
export LDFLAGS;
fi
@@ -78992,7 +78960,7 @@
samba_cv_sysquotas_file="lib/sysquotas_3.c"
fi
-@@ -72801,410 +29723,12 @@
+@@ -72801,151 +29721,12 @@
#################################################
# check for mntent.h and struct mntent
@@ -79139,20 +79107,23 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
++if test "x$ac_cv_header_mntent_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define HAVE_MNTENT_H 1
+ _ACEOF
+
+ fi
+@@ -72954,361 +29735,42 @@
+
+ #################################################
+ # check for setmntent,getmntent,endmntent
-
--fi
-
--done
-
--#################################################
--# check for setmntent,getmntent,endmntent
--
--
--
--for ac_func in setmntent getmntent endmntent
+ for ac_func in setmntent getmntent endmntent
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -79399,18 +79370,19 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
-+if test "x$ac_cv_header_mntent_h" = x""yes; then :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_MNTENT_H 1
- _ACEOF
-
- fi
-@@ -73212,103 +29736,43 @@
- done
-
- #################################################
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-#################################################
-# check for devnm
-
-for ac_func in devnm
@@ -79465,14 +79437,6 @@
- ;
- return 0;
-}
-+# check for setmntent,getmntent,endmntent
-+for ac_func in setmntent getmntent endmntent
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
@@ -79542,7 +79506,7 @@
_ACEOF
fi
-@@ -73331,19 +29795,15 @@
+@@ -73331,19 +29793,15 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -79565,7 +79529,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73361,76 +29821,47 @@
+@@ -73361,76 +29819,47 @@
return 0;
}
_ACEOF
@@ -79653,7 +79617,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73448,62 +29879,35 @@
+@@ -73448,62 +29877,35 @@
return 0;
}
_ACEOF
@@ -79723,7 +79687,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73519,56 +29923,33 @@
+@@ -73519,56 +29921,33 @@
return 0;
}
_ACEOF
@@ -79788,7 +79752,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -73580,12 +29961,12 @@
+@@ -73580,12 +29959,12 @@
#################################################
# check for experimental utmp accounting
@@ -79803,7 +79767,7 @@
withval=$with_utmp; case "$withval" in
no)
WITH_UTMP=no
-@@ -73608,15 +29989,13 @@
+@@ -73608,15 +29987,13 @@
# Display test results
if test x"$WITH_UTMP" = x"yes"; then
@@ -79822,7 +79786,7 @@
$as_echo "no$utmp_no_reason" >&6; }
fi
-@@ -73642,10 +30021,10 @@
+@@ -73642,10 +30019,10 @@
USESHARED=false
@@ -79835,7 +79799,7 @@
enableval=$enable_shared_libs; enable_shared_libs=$enableval
else
enable_shared_libs=yes
-@@ -73656,11 +30035,11 @@
+@@ -73656,11 +30033,11 @@
USESHARED=$BLDSHARED
fi
@@ -79849,7 +79813,7 @@
$as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
fi
-@@ -73688,14 +30067,13 @@
+@@ -73688,14 +30065,13 @@
# Check whether --with-static-libs was given.
@@ -79866,7 +79830,7 @@
fi
-@@ -73742,16 +30120,16 @@
+@@ -73742,16 +30118,16 @@
@@ -79886,7 +79850,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73777,7 +30155,7 @@
+@@ -73777,7 +30153,7 @@
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -79895,7 +79859,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
enable_static=yes
-@@ -73790,12 +30168,12 @@
+@@ -73790,12 +30166,12 @@
enable_static=yes
LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -79910,10 +79874,23 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -73833,16 +30211,16 @@
+@@ -73807,6 +30183,12 @@
++if test "x$enable_external_libtalloc" = xyes
++then
++ NO_LIBTALLOC='#'
++ LIBTALLOC_STATIC=
++fi
++
+
+
+
+@@ -73833,16 +30215,16 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtdb shared library" >&5
$as_echo_n "checking whether to build the libtdb shared library... " >&6; }
@@ -79930,7 +79907,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73868,7 +30246,7 @@
+@@ -73868,7 +30250,7 @@
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -79939,7 +79916,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
enable_static=yes
-@@ -73881,12 +30259,12 @@
+@@ -73881,12 +30263,12 @@
enable_static=yes
LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -79954,7 +79931,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -73924,16 +30302,16 @@
+@@ -73924,16 +30306,16 @@
@@ -79974,7 +79951,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73959,7 +30337,7 @@
+@@ -73959,7 +30341,7 @@
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -79983,7 +79960,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
enable_static=yes
-@@ -73972,12 +30350,12 @@
+@@ -73972,12 +30354,12 @@
enable_static=yes
LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -79998,7 +79975,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74015,16 +30393,16 @@
+@@ -74015,16 +30397,16 @@
@@ -80018,7 +79995,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74050,7 +30428,7 @@
+@@ -74050,7 +30432,7 @@
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -80027,7 +80004,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
enable_static=yes
-@@ -74063,12 +30441,12 @@
+@@ -74063,12 +30445,12 @@
enable_static=yes
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -80042,7 +80019,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74106,16 +30484,16 @@
+@@ -74106,16 +30488,16 @@
@@ -80062,7 +80039,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74141,7 +30519,7 @@
+@@ -74141,7 +30523,7 @@
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -80071,7 +80048,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
enable_static=yes
-@@ -74154,12 +30532,12 @@
+@@ -74154,12 +30536,12 @@
enable_static=yes
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -80086,7 +80063,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74197,19 +30575,19 @@
+@@ -74197,19 +30579,19 @@
@@ -80109,7 +80086,7 @@
$as_echo "yes" >&6; }
build_lib=no
;;
-@@ -74218,7 +30596,7 @@
+@@ -74218,7 +30600,7 @@
else
# if unspecified, default is not to build
@@ -80118,7 +80095,7 @@
$as_echo "yes" >&6; }
build_lib=no
-@@ -74234,7 +30612,7 @@
+@@ -74234,7 +30616,7 @@
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -80127,7 +80104,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
enable_static=yes
-@@ -74247,12 +30625,12 @@
+@@ -74247,12 +30629,12 @@
enable_static=yes
LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -80142,7 +80119,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74268,26 +30646,22 @@
+@@ -74268,26 +30650,22 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -80174,7 +80151,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -74301,51 +30675,22 @@
+@@ -74301,51 +30679,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -80232,7 +80209,7 @@
fi
fi
-@@ -74358,16 +30703,12 @@
+@@ -74358,16 +30707,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -80252,7 +80229,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74379,47 +30720,20 @@
+@@ -74379,47 +30724,20 @@
return 0;
}
_ACEOF
@@ -80306,7 +80283,7 @@
fi
fi
-@@ -74427,17 +30741,13 @@
+@@ -74427,17 +30745,13 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -80327,7 +80304,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74449,57 +30759,30 @@
+@@ -74449,57 +30763,30 @@
return 0;
}
_ACEOF
@@ -80392,7 +80369,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74511,56 +30794,29 @@
+@@ -74511,56 +30798,29 @@
return 0;
}
_ACEOF
@@ -80456,7 +80433,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74572,55 +30828,28 @@
+@@ -74572,55 +30832,28 @@
return 0;
}
_ACEOF
@@ -80519,7 +80496,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74632,59 +30861,32 @@
+@@ -74632,59 +30865,32 @@
return 0;
}
_ACEOF
@@ -80587,7 +80564,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -74697,71 +30899,38 @@
+@@ -74697,71 +30903,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -80669,7 +80646,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -74780,71 +30949,38 @@
+@@ -74780,71 +30953,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80751,7 +80728,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -74854,71 +30990,38 @@
+@@ -74854,71 +30994,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -80833,7 +80810,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -74934,71 +31037,38 @@
+@@ -74934,71 +31041,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80915,7 +80892,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -75018,52 +31088,23 @@
+@@ -75018,52 +31092,23 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -80974,7 +80951,7 @@
fi
fi
-@@ -75076,13 +31117,9 @@
+@@ -75076,13 +31121,9 @@
# If we don't have all of these then disable large
# file support.
#
@@ -80990,7 +80967,7 @@
/* end confdefs.h. */
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -75099,41 +31136,18 @@
+@@ -75099,41 +31140,18 @@
return 0;
}
_ACEOF
@@ -81036,7 +81013,7 @@
$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
#################################################
-@@ -75143,10 +31157,10 @@
+@@ -75143,10 +31161,10 @@
# Check whether --with-ctdb was given.
@@ -81049,7 +81026,7 @@
$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
;;
*)
-@@ -75160,71 +31174,23 @@
+@@ -75160,71 +31178,23 @@
CPPFLAGS="$CPPFLAGS $CTDB_CPPFLAGS"
ctdb_broken="missing or broken headers"
@@ -81131,7 +81108,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -75235,17 +31201,13 @@
+@@ -75235,17 +31205,13 @@
@@ -81152,7 +81129,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -75266,41 +31228,18 @@
+@@ -75266,41 +31232,18 @@
return 0;
}
_ACEOF
@@ -81198,7 +81175,7 @@
fi
-@@ -75311,397 +31250,79 @@
+@@ -75311,397 +31254,79 @@
fi
# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
@@ -81637,7 +81614,7 @@
withval=$with_cluster_support;
fi
-@@ -75712,44 +31333,38 @@
+@@ -75712,44 +31337,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -81689,7 +81666,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -75762,105 +31377,85 @@
+@@ -75762,105 +31381,85 @@
with_acl_support="auto"
fi
@@ -81816,7 +81793,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75878,60 +31473,31 @@
+@@ -75878,60 +31477,31 @@
return 0;
}
_ACEOF
@@ -81886,7 +81863,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75949,61 +31515,32 @@
+@@ -75949,61 +31519,32 @@
return 0;
}
_ACEOF
@@ -81957,7 +81934,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76022,64 +31559,33 @@
+@@ -76022,64 +31563,33 @@
return 0;
}
_ACEOF
@@ -82032,7 +82009,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76097,58 +31603,29 @@
+@@ -76097,58 +31607,29 @@
return 0;
}
_ACEOF
@@ -82099,7 +82076,7 @@
fi
;;
-@@ -76160,31 +31637,27 @@
+@@ -76160,31 +31641,27 @@
#################################################
# check for AIO support
@@ -82137,7 +82114,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76202,58 +31675,29 @@
+@@ -76202,58 +31679,29 @@
return 0;
}
_ACEOF
@@ -82205,7 +82182,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76271,59 +31715,30 @@
+@@ -76271,59 +31719,30 @@
return 0;
}
_ACEOF
@@ -82274,7 +82251,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76335,55 +31750,26 @@
+@@ -76335,55 +31754,26 @@
return 0;
}
_ACEOF
@@ -82338,7 +82315,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76395,716 +31781,317 @@
+@@ -76395,716 +31785,317 @@
return 0;
}
_ACEOF
@@ -83193,7 +83170,7 @@
$as_echo "no" >&6; }
fi
-@@ -77121,30 +32108,26 @@
+@@ -77121,30 +32112,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -83230,7 +83207,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77160,53 +32143,24 @@
+@@ -77160,53 +32147,24 @@
return 0;
}
_ACEOF
@@ -83292,7 +83269,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77222,54 +32176,25 @@
+@@ -77222,54 +32180,25 @@
return 0;
}
_ACEOF
@@ -83355,7 +83332,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -77289,103 +32214,58 @@
+@@ -77289,103 +32218,58 @@
return 0;
}
_ACEOF
@@ -83476,7 +83453,7 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -77412,76 +32292,41 @@
+@@ -77412,76 +32296,41 @@
return 0;
}
_ACEOF
@@ -83565,7 +83542,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77505,73 +32350,38 @@
+@@ -77505,73 +32354,38 @@
return 0;
}
_ACEOF
@@ -83651,7 +83628,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77595,77 +32405,41 @@
+@@ -77595,77 +32409,41 @@
return 0;
}
_ACEOF
@@ -83741,7 +83718,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -77683,43 +32457,18 @@
+@@ -77683,43 +32461,18 @@
return 0;
}
_ACEOF
@@ -83791,7 +83768,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -77728,17 +32477,13 @@
+@@ -77728,17 +32481,13 @@
fi
@@ -83812,7 +83789,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77769,74 +32514,39 @@
+@@ -77769,74 +32518,39 @@
return 0;
}
_ACEOF
@@ -83899,7 +83876,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77867,75 +32577,40 @@
+@@ -77867,75 +32581,40 @@
return 0;
}
_ACEOF
@@ -83987,7 +83964,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77963,59 +32638,28 @@
+@@ -77963,59 +32642,28 @@
return 0;
}
_ACEOF
@@ -84056,7 +84033,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -78024,12 +32668,12 @@
+@@ -78024,12 +32672,12 @@
esac
;;
*)
@@ -84071,7 +84048,7 @@
$as_echo "yes" >&6; }
fi
-@@ -78038,17 +32682,13 @@
+@@ -78038,17 +32686,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -84092,7 +84069,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78063,62 +32703,31 @@
+@@ -78063,62 +32707,31 @@
return 0;
}
_ACEOF
@@ -84164,7 +84141,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78129,41 +32738,18 @@
+@@ -78129,41 +32742,18 @@
return 0;
}
_ACEOF
@@ -84210,7 +84187,7 @@
fi
-@@ -78171,17 +32757,13 @@
+@@ -78171,17 +32761,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -84231,7 +84208,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78196,47 +32778,20 @@
+@@ -78196,47 +32782,20 @@
return 0;
}
_ACEOF
@@ -84285,7 +84262,7 @@
fi
-@@ -78245,17 +32800,13 @@
+@@ -78245,17 +32804,13 @@
case "$host_os" in
*linux*)
@@ -84306,7 +84283,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78270,40 +32821,15 @@
+@@ -78270,40 +32825,15 @@
return 0;
}
_ACEOF
@@ -84352,7 +84329,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -78313,24 +32839,18 @@
+@@ -78313,24 +32843,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -84381,7 +84358,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78341,41 +32861,18 @@
+@@ -78341,41 +32865,18 @@
return 0;
}
_ACEOF
@@ -84427,7 +84404,7 @@
fi
-@@ -78383,68 +32880,35 @@
+@@ -78383,68 +32884,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -84506,7 +84483,7 @@
fi
-@@ -78452,7 +32916,7 @@
+@@ -78452,7 +32920,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -84515,7 +84492,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -78464,7 +32928,7 @@
+@@ -78464,7 +32932,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -84524,7 +84501,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -78565,7 +33029,7 @@
+@@ -78565,7 +33033,7 @@
# Check whether --with-winbind was given.
@@ -84533,7 +84510,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -78596,18 +33060,14 @@
+@@ -78596,18 +33064,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -84555,7 +84532,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78625,57 +33085,28 @@
+@@ -78625,57 +33089,28 @@
return 0;
}
_ACEOF
@@ -84622,7 +84599,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -78706,12 +33137,10 @@
+@@ -78706,12 +33141,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -84637,7 +84614,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -78722,624 +33151,112 @@
+@@ -78722,624 +33155,112 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -85351,7 +85328,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -79349,17 +33266,13 @@
+@@ -79349,17 +33270,13 @@
fi
@@ -85372,7 +85349,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -79374,41 +33287,18 @@
+@@ -79374,41 +33291,18 @@
return 0;
}
_ACEOF
@@ -85418,7 +85395,7 @@
fi
-@@ -79418,7 +33308,7 @@
+@@ -79418,7 +33312,7 @@
# Check whether --with-included-popt was given.
@@ -85427,7 +85404,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -79431,18 +33321,14 @@
+@@ -79431,18 +33325,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -85449,7 +85426,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79460,43 +33346,18 @@
+@@ -79460,43 +33350,18 @@
return 0;
}
_ACEOF
@@ -85499,7 +85476,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -79504,16 +33365,16 @@
+@@ -79504,16 +33369,16 @@
fi
@@ -85519,7 +85496,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -79526,7 +33387,7 @@
+@@ -79526,7 +33391,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -85528,7 +85505,7 @@
enableval=$enable_dnssd;
fi
-@@ -79535,151 +33396,12 @@
+@@ -79535,151 +33400,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -85685,7 +85662,7 @@
_ACEOF
fi
-@@ -79692,102 +33414,12 @@
+@@ -79692,102 +33418,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -85793,7 +85770,7 @@
_ACEOF
fi
-@@ -79795,23 +33427,17 @@
+@@ -79795,23 +33431,17 @@
@@ -85820,7 +85797,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79829,54 +33455,28 @@
+@@ -79829,54 +33459,28 @@
return 0;
}
_ACEOF
@@ -85882,7 +85859,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -79891,7 +33491,6 @@
+@@ -79891,7 +33495,6 @@
fi
@@ -85890,7 +85867,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
-@@ -79899,15 +33498,11 @@
+@@ -79899,15 +33502,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -85908,7 +85885,7 @@
fi
fi
-@@ -79917,7 +33512,7 @@
+@@ -79917,7 +33516,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -85917,7 +85894,7 @@
enableval=$enable_avahi;
fi
-@@ -79926,151 +33521,12 @@
+@@ -79926,151 +33525,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -86074,7 +86051,7 @@
_ACEOF
fi
-@@ -80081,151 +33537,12 @@
+@@ -80081,151 +33541,12 @@
have_avahi_support=no
fi
@@ -86231,7 +86208,7 @@
_ACEOF
fi
-@@ -80238,23 +33555,17 @@
+@@ -80238,23 +33559,17 @@
@@ -86258,7 +86235,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80272,54 +33583,28 @@
+@@ -80272,54 +33587,28 @@
return 0;
}
_ACEOF
@@ -86320,7 +86297,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBAVAHI_CLIENT 1
_ACEOF
-@@ -80334,24 +33619,19 @@
+@@ -80334,24 +33623,19 @@
fi
@@ -86347,7 +86324,7 @@
fi
fi
fi
-@@ -80361,7 +33641,7 @@
+@@ -80361,7 +33645,7 @@
# Check whether --with-included-iniparser was given.
@@ -86356,7 +86333,7 @@
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -80374,18 +33654,14 @@
+@@ -80374,18 +33658,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -86378,7 +86355,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80403,43 +33679,18 @@
+@@ -80403,43 +33683,18 @@
return 0;
}
_ACEOF
@@ -86428,7 +86405,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -80447,260 +33698,40 @@
+@@ -80447,260 +33702,40 @@
fi
@@ -86708,7 +86685,7 @@
_ACEOF
fi
-@@ -80708,20 +33739,16 @@
+@@ -80708,20 +33743,16 @@
done
@@ -86733,7 +86710,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -80733,46 +33760,19 @@
+@@ -80733,46 +33764,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -86785,7 +86762,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -80807,7 +33807,7 @@
+@@ -80807,7 +33811,7 @@
# Check whether --with-static-modules was given.
@@ -86794,7 +86771,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80819,7 +33819,7 @@
+@@ -80819,7 +33823,7 @@
# Check whether --with-shared-modules was given.
@@ -86803,7 +86780,7 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80830,7 +33830,7 @@
+@@ -80830,7 +33834,7 @@
@@ -86812,7 +86789,7 @@
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -80842,12 +33842,10 @@
+@@ -80842,12 +33846,10 @@
if test x"$DEST" = xSHARED; then
@@ -86827,7 +86804,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -80858,16 +33856,16 @@
+@@ -80858,16 +33860,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -86847,7 +86824,7 @@
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -80879,12 +33877,10 @@
+@@ -80879,12 +33881,10 @@
if test x"$DEST" = xSHARED; then
@@ -86862,7 +86839,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -80895,16 +33891,16 @@
+@@ -80895,16 +33895,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -86882,7 +86859,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -80916,12 +33912,10 @@
+@@ -80916,12 +33916,10 @@
if test x"$DEST" = xSHARED; then
@@ -86897,7 +86874,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -80932,16 +33926,16 @@
+@@ -80932,16 +33930,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -86917,7 +86894,7 @@
$as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
if test "$MODULE_pdb_wbc_sam"; then
DEST=$MODULE_pdb_wbc_sam
-@@ -80953,12 +33947,10 @@
+@@ -80953,12 +33951,10 @@
if test x"$DEST" = xSHARED; then
@@ -86932,7 +86909,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -80969,11 +33961,11 @@
+@@ -80969,11 +33965,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -86946,7 +86923,7 @@
$as_echo "not" >&6; }
fi
-@@ -80995,7 +33987,7 @@
+@@ -80995,7 +33991,7 @@
@@ -86955,7 +86932,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -81007,12 +33999,10 @@
+@@ -81007,12 +34003,10 @@
if test x"$DEST" = xSHARED; then
@@ -86970,7 +86947,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -81023,16 +34013,16 @@
+@@ -81023,16 +34017,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -86990,7 +86967,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -81044,12 +34034,10 @@
+@@ -81044,12 +34038,10 @@
if test x"$DEST" = xSHARED; then
@@ -87005,7 +86982,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -81060,16 +34048,16 @@
+@@ -81060,16 +34052,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -87025,7 +87002,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -81081,12 +34069,10 @@
+@@ -81081,12 +34073,10 @@
if test x"$DEST" = xSHARED; then
@@ -87040,7 +87017,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -81097,16 +34083,16 @@
+@@ -81097,16 +34087,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -87060,7 +87037,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -81118,12 +34104,10 @@
+@@ -81118,12 +34108,10 @@
if test x"$DEST" = xSHARED; then
@@ -87075,7 +87052,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -81134,16 +34118,16 @@
+@@ -81134,16 +34122,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -87095,7 +87072,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -81155,12 +34139,10 @@
+@@ -81155,12 +34143,10 @@
if test x"$DEST" = xSHARED; then
@@ -87110,7 +87087,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -81171,16 +34153,16 @@
+@@ -81171,16 +34157,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -87130,7 +87107,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -81192,12 +34174,10 @@
+@@ -81192,12 +34178,10 @@
if test x"$DEST" = xSHARED; then
@@ -87145,7 +87122,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -81208,16 +34188,16 @@
+@@ -81208,16 +34192,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -87165,7 +87142,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -81229,12 +34209,10 @@
+@@ -81229,12 +34213,10 @@
if test x"$DEST" = xSHARED; then
@@ -87180,7 +87157,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -81245,16 +34223,16 @@
+@@ -81245,16 +34227,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -87200,7 +87177,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -81266,12 +34244,10 @@
+@@ -81266,12 +34248,10 @@
if test x"$DEST" = xSHARED; then
@@ -87215,7 +87192,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -81282,16 +34258,16 @@
+@@ -81282,16 +34262,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -87235,7 +87212,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -81303,12 +34279,10 @@
+@@ -81303,12 +34283,10 @@
if test x"$DEST" = xSHARED; then
@@ -87250,7 +87227,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -81319,16 +34293,16 @@
+@@ -81319,16 +34297,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -87270,7 +87247,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -81340,12 +34314,10 @@
+@@ -81340,12 +34318,10 @@
if test x"$DEST" = xSHARED; then
@@ -87285,7 +87262,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -81356,16 +34328,16 @@
+@@ -81356,16 +34332,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -87305,7 +87282,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -81377,12 +34349,10 @@
+@@ -81377,12 +34353,10 @@
if test x"$DEST" = xSHARED; then
@@ -87320,7 +87297,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -81393,16 +34363,16 @@
+@@ -81393,16 +34367,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -87340,7 +87317,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -81414,12 +34384,10 @@
+@@ -81414,12 +34388,10 @@
if test x"$DEST" = xSHARED; then
@@ -87355,7 +87332,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -81430,16 +34398,16 @@
+@@ -81430,16 +34402,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -87375,7 +87352,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -81451,12 +34419,10 @@
+@@ -81451,12 +34423,10 @@
if test x"$DEST" = xSHARED; then
@@ -87390,7 +87367,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -81467,16 +34433,16 @@
+@@ -81467,16 +34437,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -87410,7 +87387,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -81488,12 +34454,10 @@
+@@ -81488,12 +34458,10 @@
if test x"$DEST" = xSHARED; then
@@ -87425,7 +87402,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -81504,11 +34468,11 @@
+@@ -81504,11 +34472,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -87439,7 +87416,7 @@
$as_echo "not" >&6; }
fi
-@@ -81529,7 +34493,7 @@
+@@ -81529,7 +34497,7 @@
@@ -87448,7 +87425,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -81541,12 +34505,10 @@
+@@ -81541,12 +34509,10 @@
if test x"$DEST" = xSHARED; then
@@ -87463,7 +87440,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -81557,16 +34519,16 @@
+@@ -81557,16 +34523,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -87483,7 +87460,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -81578,12 +34540,10 @@
+@@ -81578,12 +34544,10 @@
if test x"$DEST" = xSHARED; then
@@ -87498,7 +87475,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -81594,16 +34554,16 @@
+@@ -81594,16 +34558,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -87518,7 +87495,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -81615,12 +34575,10 @@
+@@ -81615,12 +34579,10 @@
if test x"$DEST" = xSHARED; then
@@ -87533,7 +87510,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -81631,16 +34589,16 @@
+@@ -81631,16 +34593,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -87553,7 +87530,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -81652,12 +34610,10 @@
+@@ -81652,12 +34614,10 @@
if test x"$DEST" = xSHARED; then
@@ -87568,7 +87545,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -81668,16 +34624,16 @@
+@@ -81668,16 +34628,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -87588,7 +87565,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -81689,12 +34645,10 @@
+@@ -81689,12 +34649,10 @@
if test x"$DEST" = xSHARED; then
@@ -87603,7 +87580,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -81705,16 +34659,16 @@
+@@ -81705,16 +34663,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -87623,7 +87600,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -81726,12 +34680,10 @@
+@@ -81726,12 +34684,10 @@
if test x"$DEST" = xSHARED; then
@@ -87638,7 +87615,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -81742,16 +34694,16 @@
+@@ -81742,16 +34698,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -87658,7 +87635,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -81763,12 +34715,10 @@
+@@ -81763,12 +34719,10 @@
if test x"$DEST" = xSHARED; then
@@ -87673,7 +87650,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -81779,16 +34729,16 @@
+@@ -81779,16 +34733,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -87693,7 +87670,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -81800,12 +34750,10 @@
+@@ -81800,12 +34754,10 @@
if test x"$DEST" = xSHARED; then
@@ -87708,7 +87685,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -81816,16 +34764,16 @@
+@@ -81816,16 +34768,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -87728,7 +87705,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -81837,12 +34785,10 @@
+@@ -81837,12 +34789,10 @@
if test x"$DEST" = xSHARED; then
@@ -87743,7 +87720,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -81853,11 +34799,11 @@
+@@ -81853,11 +34803,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -87757,7 +87734,7 @@
$as_echo "not" >&6; }
fi
-@@ -81878,7 +34824,7 @@
+@@ -81878,7 +34828,7 @@
@@ -87766,7 +87743,7 @@
$as_echo_n "checking how to build nss_info_template... " >&6; }
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
-@@ -81890,12 +34836,10 @@
+@@ -81890,12 +34840,10 @@
if test x"$DEST" = xSHARED; then
@@ -87781,7 +87758,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -81906,11 +34850,11 @@
+@@ -81906,11 +34854,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -87795,7 +87772,7 @@
$as_echo "not" >&6; }
fi
-@@ -81931,7 +34875,7 @@
+@@ -81931,7 +34879,7 @@
@@ -87804,7 +87781,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -81943,12 +34887,10 @@
+@@ -81943,12 +34891,10 @@
if test x"$DEST" = xSHARED; then
@@ -87819,7 +87796,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -81959,16 +34901,16 @@
+@@ -81959,16 +34905,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -87839,7 +87816,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -81980,12 +34922,10 @@
+@@ -81980,12 +34926,10 @@
if test x"$DEST" = xSHARED; then
@@ -87854,7 +87831,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -81996,16 +34936,16 @@
+@@ -81996,16 +34940,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -87874,7 +87851,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -82017,12 +34957,10 @@
+@@ -82017,12 +34961,10 @@
if test x"$DEST" = xSHARED; then
@@ -87889,7 +87866,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -82033,16 +34971,16 @@
+@@ -82033,16 +34975,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -87909,7 +87886,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -82054,12 +34992,10 @@
+@@ -82054,12 +34996,10 @@
if test x"$DEST" = xSHARED; then
@@ -87924,7 +87901,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -82070,11 +35006,11 @@
+@@ -82070,11 +35010,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -87938,7 +87915,7 @@
$as_echo "not" >&6; }
fi
-@@ -82095,7 +35031,7 @@
+@@ -82095,7 +35035,7 @@
@@ -87947,7 +87924,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -82107,12 +35043,10 @@
+@@ -82107,12 +35047,10 @@
if test x"$DEST" = xSHARED; then
@@ -87962,7 +87939,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -82123,16 +35057,16 @@
+@@ -82123,16 +35061,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -87982,7 +87959,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -82144,12 +35078,10 @@
+@@ -82144,12 +35082,10 @@
if test x"$DEST" = xSHARED; then
@@ -87997,7 +87974,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -82160,16 +35092,16 @@
+@@ -82160,16 +35096,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -88017,7 +87994,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -82181,12 +35113,10 @@
+@@ -82181,12 +35117,10 @@
if test x"$DEST" = xSHARED; then
@@ -88032,7 +88009,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -82197,16 +35127,16 @@
+@@ -82197,16 +35131,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -88052,7 +88029,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -82218,12 +35148,10 @@
+@@ -82218,12 +35152,10 @@
if test x"$DEST" = xSHARED; then
@@ -88067,7 +88044,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -82234,16 +35162,16 @@
+@@ -82234,16 +35166,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -88087,7 +88064,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -82255,12 +35183,10 @@
+@@ -82255,12 +35187,10 @@
if test x"$DEST" = xSHARED; then
@@ -88102,7 +88079,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -82271,16 +35197,16 @@
+@@ -82271,16 +35201,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -88122,7 +88099,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -82292,12 +35218,10 @@
+@@ -82292,12 +35222,10 @@
if test x"$DEST" = xSHARED; then
@@ -88137,7 +88114,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -82308,16 +35232,16 @@
+@@ -82308,16 +35236,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -88157,7 +88134,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -82329,12 +35253,10 @@
+@@ -82329,12 +35257,10 @@
if test x"$DEST" = xSHARED; then
@@ -88172,7 +88149,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -82345,16 +35267,16 @@
+@@ -82345,16 +35271,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -88192,7 +88169,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -82366,12 +35288,10 @@
+@@ -82366,12 +35292,10 @@
if test x"$DEST" = xSHARED; then
@@ -88207,7 +88184,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -82382,16 +35302,16 @@
+@@ -82382,16 +35306,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -88227,7 +88204,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -82403,12 +35323,10 @@
+@@ -82403,12 +35327,10 @@
if test x"$DEST" = xSHARED; then
@@ -88242,7 +88219,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -82419,11 +35337,11 @@
+@@ -82419,11 +35341,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -88256,7 +88233,7 @@
$as_echo "not" >&6; }
fi
-@@ -82444,7 +35362,7 @@
+@@ -82444,7 +35366,7 @@
@@ -88265,7 +88242,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -82456,12 +35374,10 @@
+@@ -82456,12 +35378,10 @@
if test x"$DEST" = xSHARED; then
@@ -88280,7 +88257,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -82472,16 +35388,16 @@
+@@ -82472,16 +35392,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -88300,7 +88277,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -82493,12 +35409,10 @@
+@@ -82493,12 +35413,10 @@
if test x"$DEST" = xSHARED; then
@@ -88315,7 +88292,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -82509,16 +35423,16 @@
+@@ -82509,16 +35427,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -88335,7 +88312,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -82530,12 +35444,10 @@
+@@ -82530,12 +35448,10 @@
if test x"$DEST" = xSHARED; then
@@ -88350,7 +88327,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -82546,16 +35458,16 @@
+@@ -82546,16 +35462,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -88370,7 +88347,7 @@
$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
-@@ -82567,12 +35479,10 @@
+@@ -82567,12 +35483,10 @@
if test x"$DEST" = xSHARED; then
@@ -88385,7 +88362,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -82583,16 +35493,16 @@
+@@ -82583,16 +35497,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -88405,7 +88382,7 @@
$as_echo_n "checking how to build vfs_full_audit... " >&6; }
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
-@@ -82604,12 +35514,10 @@
+@@ -82604,12 +35518,10 @@
if test x"$DEST" = xSHARED; then
@@ -88420,7 +88397,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -82620,16 +35528,16 @@
+@@ -82620,16 +35532,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -88440,7 +88417,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -82641,12 +35549,10 @@
+@@ -82641,12 +35553,10 @@
if test x"$DEST" = xSHARED; then
@@ -88455,7 +88432,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -82657,16 +35563,16 @@
+@@ -82657,16 +35567,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -88475,7 +88452,7 @@
$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
-@@ -82678,12 +35584,10 @@
+@@ -82678,12 +35588,10 @@
if test x"$DEST" = xSHARED; then
@@ -88490,7 +88467,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -82694,16 +35598,16 @@
+@@ -82694,16 +35602,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -88510,7 +88487,7 @@
$as_echo_n "checking how to build vfs_default_quota... " >&6; }
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
-@@ -82715,12 +35619,10 @@
+@@ -82715,12 +35623,10 @@
if test x"$DEST" = xSHARED; then
@@ -88525,7 +88502,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -82731,16 +35633,16 @@
+@@ -82731,16 +35637,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -88545,7 +88522,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -82752,12 +35654,10 @@
+@@ -82752,12 +35658,10 @@
if test x"$DEST" = xSHARED; then
@@ -88560,7 +88537,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -82768,16 +35668,16 @@
+@@ -82768,16 +35672,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -88580,7 +88557,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -82789,12 +35689,10 @@
+@@ -82789,12 +35693,10 @@
if test x"$DEST" = xSHARED; then
@@ -88595,7 +88572,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -82805,16 +35703,16 @@
+@@ -82805,16 +35707,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -88615,7 +88592,7 @@
$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
-@@ -82826,12 +35724,10 @@
+@@ -82826,12 +35728,10 @@
if test x"$DEST" = xSHARED; then
@@ -88630,7 +88607,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -82842,16 +35738,16 @@
+@@ -82842,16 +35742,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -88650,7 +88627,7 @@
$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
-@@ -82863,12 +35759,10 @@
+@@ -82863,12 +35763,10 @@
if test x"$DEST" = xSHARED; then
@@ -88665,7 +88642,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -82879,16 +35773,16 @@
+@@ -82879,16 +35777,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -88685,7 +88662,7 @@
$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
-@@ -82900,12 +35794,10 @@
+@@ -82900,12 +35798,10 @@
if test x"$DEST" = xSHARED; then
@@ -88700,7 +88677,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -82916,16 +35808,16 @@
+@@ -82916,16 +35812,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -88720,7 +88697,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -82937,12 +35829,10 @@
+@@ -82937,12 +35833,10 @@
if test x"$DEST" = xSHARED; then
@@ -88735,7 +88712,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -82953,16 +35843,16 @@
+@@ -82953,16 +35847,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -88755,7 +88732,7 @@
$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
-@@ -82974,12 +35864,10 @@
+@@ -82974,12 +35868,10 @@
if test x"$DEST" = xSHARED; then
@@ -88770,7 +88747,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -82990,16 +35878,16 @@
+@@ -82990,16 +35882,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -88790,7 +88767,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -83011,12 +35899,10 @@
+@@ -83011,12 +35903,10 @@
if test x"$DEST" = xSHARED; then
@@ -88805,7 +88782,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -83027,16 +35913,16 @@
+@@ -83027,16 +35917,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -88825,7 +88802,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -83048,12 +35934,10 @@
+@@ -83048,12 +35938,10 @@
if test x"$DEST" = xSHARED; then
@@ -88840,7 +88817,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -83064,16 +35948,16 @@
+@@ -83064,16 +35952,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -88860,7 +88837,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -83085,12 +35969,10 @@
+@@ -83085,12 +35973,10 @@
if test x"$DEST" = xSHARED; then
@@ -88875,7 +88852,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -83101,16 +35983,16 @@
+@@ -83101,16 +35987,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -88895,7 +88872,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -83122,12 +36004,10 @@
+@@ -83122,12 +36008,10 @@
if test x"$DEST" = xSHARED; then
@@ -88910,7 +88887,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -83138,16 +36018,16 @@
+@@ -83138,16 +36022,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -88930,7 +88907,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -83159,12 +36039,10 @@
+@@ -83159,12 +36043,10 @@
if test x"$DEST" = xSHARED; then
@@ -88945,7 +88922,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -83175,16 +36053,16 @@
+@@ -83175,16 +36057,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -88965,7 +88942,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -83196,12 +36074,10 @@
+@@ -83196,12 +36078,10 @@
if test x"$DEST" = xSHARED; then
@@ -88980,7 +88957,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -83212,16 +36088,16 @@
+@@ -83212,16 +36092,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -89000,7 +88977,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -83233,12 +36109,10 @@
+@@ -83233,12 +36113,10 @@
if test x"$DEST" = xSHARED; then
@@ -89015,7 +88992,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -83249,16 +36123,16 @@
+@@ -83249,16 +36127,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -89035,7 +89012,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -83270,12 +36144,10 @@
+@@ -83270,12 +36148,10 @@
if test x"$DEST" = xSHARED; then
@@ -89050,7 +89027,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -83286,16 +36158,16 @@
+@@ -83286,16 +36162,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -89070,7 +89047,7 @@
$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
-@@ -83307,12 +36179,10 @@
+@@ -83307,12 +36183,10 @@
if test x"$DEST" = xSHARED; then
@@ -89085,7 +89062,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -83323,16 +36193,16 @@
+@@ -83323,16 +36197,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -89105,7 +89082,7 @@
$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
-@@ -83344,12 +36214,10 @@
+@@ -83344,12 +36218,10 @@
if test x"$DEST" = xSHARED; then
@@ -89120,7 +89097,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -83360,16 +36228,16 @@
+@@ -83360,16 +36232,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -89140,7 +89117,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -83381,12 +36249,10 @@
+@@ -83381,12 +36253,10 @@
if test x"$DEST" = xSHARED; then
@@ -89155,7 +89132,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -83397,16 +36263,16 @@
+@@ -83397,16 +36267,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -89175,7 +89152,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -83418,12 +36284,10 @@
+@@ -83418,12 +36288,10 @@
if test x"$DEST" = xSHARED; then
@@ -89190,7 +89167,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -83434,16 +36298,16 @@
+@@ -83434,16 +36302,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -89210,7 +89187,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -83455,12 +36319,10 @@
+@@ -83455,12 +36323,10 @@
if test x"$DEST" = xSHARED; then
@@ -89225,7 +89202,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -83471,16 +36333,16 @@
+@@ -83471,16 +36337,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -89245,7 +89222,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -83492,12 +36354,10 @@
+@@ -83492,12 +36358,10 @@
if test x"$DEST" = xSHARED; then
@@ -89260,7 +89237,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -83508,16 +36368,16 @@
+@@ -83508,16 +36372,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -89280,7 +89257,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -83529,12 +36389,10 @@
+@@ -83529,12 +36393,10 @@
if test x"$DEST" = xSHARED; then
@@ -89295,7 +89272,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -83545,16 +36403,16 @@
+@@ -83545,16 +36407,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -89315,7 +89292,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -83566,12 +36424,10 @@
+@@ -83566,12 +36428,10 @@
if test x"$DEST" = xSHARED; then
@@ -89330,7 +89307,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -83582,16 +36438,16 @@
+@@ -83582,16 +36442,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -89350,7 +89327,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -83603,12 +36459,10 @@
+@@ -83603,12 +36463,10 @@
if test x"$DEST" = xSHARED; then
@@ -89365,7 +89342,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -83619,16 +36473,16 @@
+@@ -83619,16 +36477,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -89385,7 +89362,7 @@
$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
-@@ -83640,12 +36494,10 @@
+@@ -83640,12 +36498,10 @@
if test x"$DEST" = xSHARED; then
@@ -89400,7 +89377,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -83656,16 +36508,16 @@
+@@ -83656,16 +36512,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -89420,7 +89397,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -83677,12 +36529,10 @@
+@@ -83677,12 +36533,10 @@
if test x"$DEST" = xSHARED; then
@@ -89435,7 +89412,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -83693,16 +36543,16 @@
+@@ -83693,16 +36547,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -89455,7 +89432,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -83714,12 +36564,10 @@
+@@ -83714,12 +36568,10 @@
if test x"$DEST" = xSHARED; then
@@ -89470,7 +89447,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -83730,16 +36578,16 @@
+@@ -83730,16 +36582,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -89490,7 +89467,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -83751,12 +36599,10 @@
+@@ -83751,12 +36603,10 @@
if test x"$DEST" = xSHARED; then
@@ -89505,7 +89482,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -83767,16 +36613,16 @@
+@@ -83767,16 +36617,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -89525,7 +89502,7 @@
$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
-@@ -83788,12 +36634,10 @@
+@@ -83788,12 +36638,10 @@
if test x"$DEST" = xSHARED; then
@@ -89540,7 +89517,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -83804,16 +36648,16 @@
+@@ -83804,16 +36652,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -89560,7 +89537,7 @@
$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
-@@ -83825,12 +36669,10 @@
+@@ -83825,12 +36673,10 @@
if test x"$DEST" = xSHARED; then
@@ -89575,7 +89552,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -83841,16 +36683,16 @@
+@@ -83841,16 +36687,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -89595,7 +89572,7 @@
$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
-@@ -83862,12 +36704,10 @@
+@@ -83862,12 +36708,10 @@
if test x"$DEST" = xSHARED; then
@@ -89610,7 +89587,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -83878,16 +36718,16 @@
+@@ -83878,16 +36722,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -89630,7 +89607,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
-@@ -83899,12 +36739,10 @@
+@@ -83899,12 +36743,10 @@
if test x"$DEST" = xSHARED; then
@@ -89645,7 +89622,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -83915,16 +36753,16 @@
+@@ -83915,16 +36757,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -89665,7 +89642,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -83936,12 +36774,10 @@
+@@ -83936,12 +36778,10 @@
if test x"$DEST" = xSHARED; then
@@ -89680,7 +89657,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -83952,16 +36788,16 @@
+@@ -83952,16 +36792,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -89700,7 +89677,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
-@@ -83973,12 +36809,10 @@
+@@ -83973,12 +36813,10 @@
if test x"$DEST" = xSHARED; then
@@ -89715,7 +89692,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -83989,16 +36823,16 @@
+@@ -83989,16 +36827,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -89735,7 +89712,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -84010,12 +36844,10 @@
+@@ -84010,12 +36848,10 @@
if test x"$DEST" = xSHARED; then
@@ -89750,7 +89727,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -84026,11 +36858,11 @@
+@@ -84026,11 +36862,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -89764,7 +89741,7 @@
$as_echo "not" >&6; }
fi
-@@ -84052,7 +36884,7 @@
+@@ -84052,7 +36888,7 @@
@@ -89773,7 +89750,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -84064,12 +36896,10 @@
+@@ -84064,12 +36900,10 @@
if test x"$DEST" = xSHARED; then
@@ -89788,7 +89765,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -84080,16 +36910,16 @@
+@@ -84080,16 +36914,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -89808,7 +89785,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -84101,12 +36931,10 @@
+@@ -84101,12 +36935,10 @@
if test x"$DEST" = xSHARED; then
@@ -89823,7 +89800,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -84117,11 +36945,11 @@
+@@ -84117,11 +36949,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -89837,7 +89814,7 @@
$as_echo "not" >&6; }
fi
-@@ -84142,7 +36970,7 @@
+@@ -84142,7 +36974,7 @@
@@ -89846,7 +89823,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -84154,12 +36982,10 @@
+@@ -84154,12 +36986,10 @@
if test x"$DEST" = xSHARED; then
@@ -89861,7 +89838,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -84170,16 +36996,16 @@
+@@ -84170,16 +37000,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -89881,7 +89858,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -84191,12 +37017,10 @@
+@@ -84191,12 +37021,10 @@
if test x"$DEST" = xSHARED; then
@@ -89896,7 +89873,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -84207,16 +37031,16 @@
+@@ -84207,16 +37035,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -89916,7 +89893,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -84228,12 +37052,10 @@
+@@ -84228,12 +37056,10 @@
if test x"$DEST" = xSHARED; then
@@ -89931,7 +89908,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -84244,11 +37066,11 @@
+@@ -84244,11 +37070,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -89945,7 +89922,7 @@
$as_echo "not" >&6; }
fi
-@@ -84284,18 +37106,16 @@
+@@ -84284,18 +37110,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -89968,7 +89945,7 @@
$as_echo "no" >&6; }
fi
-@@ -84312,11 +37132,11 @@
+@@ -84312,11 +37136,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -89983,7 +89960,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -84324,11 +37144,7 @@
+@@ -84324,11 +37148,7 @@
else
@@ -89996,7 +89973,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -84384,41 +37200,16 @@
+@@ -84384,41 +37204,16 @@
}
_ACEOF
@@ -90042,7 +90019,7 @@
/* end confdefs.h. */
int
-@@ -84429,61 +37220,31 @@
+@@ -84429,61 +37224,31 @@
return 0;
}
_ACEOF
@@ -90111,7 +90088,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -84497,13 +37258,9 @@
+@@ -84497,13 +37262,9 @@
# no RT_SIGNAL bug, we are golden
@@ -90127,7 +90104,7 @@
/* end confdefs.h. */
int
-@@ -84514,65 +37271,39 @@
+@@ -84514,65 +37275,39 @@
return 0;
}
_ACEOF
@@ -90202,7 +90179,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -84581,9 +37312,7 @@
+@@ -84581,9 +37316,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -90213,7 +90190,7 @@
fi
-@@ -84603,9 +37332,9 @@
+@@ -84603,9 +37336,9 @@
# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
set dummy python$PYTHON_VERSION; ac_word=$2
@@ -90225,7 +90202,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -84618,14 +37347,14 @@
+@@ -84618,14 +37351,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90243,7 +90220,7 @@
IFS=$as_save_IFS
;;
-@@ -84633,17 +37362,17 @@
+@@ -84633,17 +37366,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90264,7 +90241,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -84654,9 +37383,9 @@
+@@ -84654,9 +37387,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
@@ -90276,7 +90253,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84669,14 +37398,14 @@
+@@ -84669,14 +37402,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90294,7 +90271,7 @@
IFS=$as_save_IFS
;;
-@@ -84684,10 +37413,10 @@
+@@ -84684,10 +37417,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90307,7 +90284,7 @@
$as_echo "no" >&6; }
fi
-@@ -84698,9 +37427,9 @@
+@@ -84698,9 +37431,9 @@
else
# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
set dummy python$PYTHON_VERSION-config; ac_word=$2
@@ -90319,7 +90296,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84713,14 +37442,14 @@
+@@ -84713,14 +37446,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90337,7 +90314,7 @@
IFS=$as_save_IFS
;;
-@@ -84728,10 +37457,10 @@
+@@ -84728,10 +37461,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90350,7 +90327,7 @@
$as_echo "no" >&6; }
fi
-@@ -84739,7 +37468,7 @@
+@@ -84739,7 +37472,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90359,7 +90336,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -84749,11 +37478,7 @@
+@@ -84749,11 +37482,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90372,7 +90349,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84769,42 +37494,15 @@
+@@ -84769,42 +37498,15 @@
return 0;
}
_ACEOF
@@ -90418,7 +90395,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84816,11 +37514,7 @@
+@@ -84816,11 +37518,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90431,7 +90408,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84836,42 +37530,15 @@
+@@ -84836,42 +37534,15 @@
return 0;
}
_ACEOF
@@ -90477,7 +90454,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84886,11 +37553,7 @@
+@@ -84886,11 +37557,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90490,7 +90467,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84906,42 +37569,15 @@
+@@ -84906,42 +37573,15 @@
return 0;
}
_ACEOF
@@ -90536,7 +90513,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84953,11 +37589,7 @@
+@@ -84953,11 +37593,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90549,7 +90526,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84973,42 +37605,15 @@
+@@ -84973,42 +37609,15 @@
return 0;
}
_ACEOF
@@ -90595,7 +90572,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85038,11 +37643,7 @@
+@@ -85038,11 +37647,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -90608,7 +90585,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85058,64 +37659,37 @@
+@@ -85058,64 +37663,37 @@
return 0;
}
_ACEOF
@@ -90681,7 +90658,7 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -85168,9 +37742,9 @@
+@@ -85168,9 +37746,9 @@
# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
set dummy python$PYTHON_VERSION; ac_word=$2
@@ -90693,7 +90670,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -85183,14 +37757,14 @@
+@@ -85183,14 +37761,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90711,7 +90688,7 @@
IFS=$as_save_IFS
;;
-@@ -85198,17 +37772,17 @@
+@@ -85198,17 +37776,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90732,7 +90709,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -85219,9 +37793,9 @@
+@@ -85219,9 +37797,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
@@ -90744,7 +90721,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85234,14 +37808,14 @@
+@@ -85234,14 +37812,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90762,7 +90739,7 @@
IFS=$as_save_IFS
;;
-@@ -85249,10 +37823,10 @@
+@@ -85249,10 +37827,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90775,7 +90752,7 @@
$as_echo "no" >&6; }
fi
-@@ -85263,9 +37837,9 @@
+@@ -85263,9 +37841,9 @@
else
# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
set dummy python$PYTHON_VERSION-config; ac_word=$2
@@ -90787,7 +90764,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85278,14 +37852,14 @@
+@@ -85278,14 +37856,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90805,7 +90782,7 @@
IFS=$as_save_IFS
;;
-@@ -85293,10 +37867,10 @@
+@@ -85293,10 +37871,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90818,7 +90795,7 @@
$as_echo "no" >&6; }
fi
-@@ -85304,7 +37878,7 @@
+@@ -85304,7 +37882,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90827,7 +90804,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -85314,11 +37888,7 @@
+@@ -85314,11 +37892,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90840,7 +90817,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85334,42 +37904,15 @@
+@@ -85334,42 +37908,15 @@
return 0;
}
_ACEOF
@@ -90886,7 +90863,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85381,11 +37924,7 @@
+@@ -85381,11 +37928,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90899,7 +90876,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85401,42 +37940,15 @@
+@@ -85401,42 +37944,15 @@
return 0;
}
_ACEOF
@@ -90945,7 +90922,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85451,11 +37963,7 @@
+@@ -85451,11 +37967,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90958,7 +90935,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85471,42 +37979,15 @@
+@@ -85471,42 +37983,15 @@
return 0;
}
_ACEOF
@@ -91004,7 +90981,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85518,11 +37999,7 @@
+@@ -85518,11 +38003,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -91017,7 +90994,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85538,42 +38015,15 @@
+@@ -85538,42 +38019,15 @@
return 0;
}
_ACEOF
@@ -91063,7 +91040,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85603,11 +38053,7 @@
+@@ -85603,11 +38057,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -91076,7 +91053,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85623,52 +38069,25 @@
+@@ -85623,52 +38073,25 @@
return 0;
}
_ACEOF
@@ -91134,7 +91111,7 @@
$as_echo "yes" >&6; }
-@@ -85696,20 +38115,18 @@
+@@ -85696,20 +38119,18 @@
else
@@ -91159,7 +91136,7 @@
$as_echo "$pythondir" >&6; }
-@@ -85732,545 +38149,125 @@
+@@ -85732,545 +38153,125 @@
@@ -91785,7 +91762,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86288,63 +38285,32 @@
+@@ -86288,63 +38289,32 @@
return 0;
}
_ACEOF
@@ -91860,7 +91837,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86362,43 +38328,18 @@
+@@ -86362,43 +38332,18 @@
return 0;
}
_ACEOF
@@ -91910,7 +91887,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -86412,11 +38353,11 @@
+@@ -86412,11 +38357,11 @@
;;
no)
@@ -91924,7 +91901,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -86428,151 +38369,12 @@
+@@ -86428,151 +38373,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -92082,7 +92059,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -86581,151 +38383,12 @@
+@@ -86581,151 +38387,12 @@
done
@@ -92239,7 +92216,7 @@
_ACEOF
fi
-@@ -86733,168 +38396,26 @@
+@@ -86733,168 +38400,26 @@
done
@@ -92417,7 +92394,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86912,63 +38433,32 @@
+@@ -86912,63 +38437,32 @@
return 0;
}
_ACEOF
@@ -92492,7 +92469,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86986,43 +38476,18 @@
+@@ -86986,43 +38480,18 @@
return 0;
}
_ACEOF
@@ -92542,7 +92519,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -87042,7 +38507,7 @@
+@@ -87042,7 +38511,7 @@
;;
esac
else
@@ -92551,7 +92528,7 @@
$as_echo "no" >&6; }
fi
-@@ -87051,163 +38516,70 @@
+@@ -87051,163 +38520,70 @@
# 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.
@@ -92752,7 +92729,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87225,60 +38597,31 @@
+@@ -87225,60 +38601,31 @@
return 0;
}
_ACEOF
@@ -92823,7 +92800,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -87333,7 +38676,7 @@
+@@ -87333,7 +38680,7 @@
###################################
"
@@ -92832,7 +92809,7 @@
$as_echo "no" >&6; }
fi
-@@ -87342,102 +38685,9 @@
+@@ -87342,102 +38689,9 @@
@@ -92937,7 +92914,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87446,102 +38696,9 @@
+@@ -87446,102 +38700,9 @@
fi
@@ -93042,7 +93019,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87551,151 +38708,12 @@
+@@ -87551,151 +38712,12 @@
fi
@@ -93198,7 +93175,7 @@
_ACEOF
else
-@@ -87705,30 +38723,6 @@
+@@ -87705,30 +38727,6 @@
done
@@ -93229,7 +93206,7 @@
for ac_header in \
crypt.h \
curses.h \
-@@ -87755,147 +38749,11 @@
+@@ -87755,147 +38753,11 @@
netinet6/in6.h \
libintl.h
@@ -93382,7 +93359,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -87905,42 +38763,6 @@
+@@ -87905,42 +38767,6 @@
done
@@ -93425,7 +93402,7 @@
for ac_func in \
atexit \
cgetent \
-@@ -87979,98 +38801,11 @@
+@@ -87979,98 +38805,11 @@
freehostent \
writev
@@ -93529,7 +93506,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -88081,17 +38816,13 @@
+@@ -88081,17 +38820,13 @@
@@ -93550,7 +93527,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -88104,140 +38835,25 @@
+@@ -88104,140 +38839,25 @@
return 0;
}
_ACEOF
@@ -93700,7 +93677,7 @@
_ACEOF
fi
-@@ -88253,177 +38869,58 @@
+@@ -88253,177 +38873,58 @@
#define $ac_tr_func 1
_ACEOF
@@ -93905,7 +93882,7 @@
_ACEOF
fi
-@@ -88439,11 +38936,11 @@
+@@ -88439,11 +38940,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -93919,7 +93896,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -88454,25 +38951,21 @@
+@@ -88454,25 +38955,21 @@
@@ -93949,7 +93926,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -88482,63 +38975,45 @@
+@@ -88482,63 +38979,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -94024,7 +94001,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -88551,35 +39026,14 @@
+@@ -88551,35 +39030,14 @@
return 0;
}
_ACEOF
@@ -94063,7 +94040,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -88589,9 +39043,7 @@
+@@ -88589,9 +39047,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -94074,7 +94051,7 @@
fi
-@@ -88622,18 +39074,14 @@
+@@ -88622,18 +39078,14 @@
@@ -94096,7 +94073,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -88650,44 +39098,15 @@
+@@ -88650,44 +39102,15 @@
return 0;
}
_ACEOF
@@ -94146,7 +94123,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -88699,44 +39118,19 @@
+@@ -88699,44 +39122,19 @@
return 0;
}
_ACEOF
@@ -94196,7 +94173,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -88744,81 +39138,23 @@
+@@ -88744,81 +39142,23 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -94284,7 +94261,7 @@
fi
-@@ -88837,23 +39173,17 @@
+@@ -88837,23 +39177,17 @@
@@ -94311,7 +94288,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -88871,54 +39201,28 @@
+@@ -88871,54 +39205,28 @@
return 0;
}
_ACEOF
@@ -94373,7 +94350,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -88935,7 +39239,6 @@
+@@ -88935,7 +39243,6 @@
fi
@@ -94381,7 +94358,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -88955,23 +39258,17 @@
+@@ -88955,23 +39262,17 @@
@@ -94408,7 +94385,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -88989,54 +39286,28 @@
+@@ -88989,54 +39290,28 @@
return 0;
}
_ACEOF
@@ -94470,7 +94447,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -89053,7 +39324,6 @@
+@@ -89053,7 +39328,6 @@
fi
@@ -94478,7 +94455,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -89077,151 +39347,12 @@
+@@ -89077,151 +39351,12 @@
@@ -94634,7 +94611,7 @@
_ACEOF
fi
-@@ -89229,22 +39360,9 @@
+@@ -89229,22 +39364,9 @@
done
@@ -94659,7 +94636,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -89255,46 +39373,10 @@
+@@ -89255,46 +39377,10 @@
#include <arpa/nameser.h>
#endif
@@ -94709,7 +94686,7 @@
_ACEOF
fi
-@@ -89306,9 +39388,9 @@
+@@ -89306,9 +39392,9 @@
@@ -94721,7 +94698,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89323,11 +39405,7 @@
+@@ -89323,11 +39409,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94734,7 +94711,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89352,38 +39430,11 @@
+@@ -89352,38 +39434,11 @@
return 0;
}
_ACEOF
@@ -94776,7 +94753,7 @@
done
eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
LIBS="$ac_save_LIBS"
-@@ -89395,102 +39446,12 @@
+@@ -89395,102 +39450,12 @@
eval "ac_res=\$ac_cv_funclib_res_search"
if false; then
@@ -94884,7 +94861,7 @@
_ACEOF
fi
-@@ -89510,13 +39471,13 @@
+@@ -89510,13 +39475,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -94900,7 +94877,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89530,7 +39491,7 @@
+@@ -89530,7 +39495,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -94909,7 +94886,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89545,9 +39506,9 @@
+@@ -89545,9 +39510,9 @@
@@ -94921,7 +94898,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89562,11 +39523,7 @@
+@@ -89562,11 +39527,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94934,7 +94911,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89591,38 +39548,11 @@
+@@ -89591,38 +39552,11 @@
return 0;
}
_ACEOF
@@ -94976,7 +94953,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -89634,102 +39564,12 @@
+@@ -89634,102 +39568,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -95084,7 +95061,7 @@
_ACEOF
fi
-@@ -89749,13 +39589,13 @@
+@@ -89749,13 +39593,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95100,7 +95077,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89769,7 +39609,7 @@
+@@ -89769,7 +39613,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95109,7 +95086,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89784,9 +39624,9 @@
+@@ -89784,9 +39628,9 @@
@@ -95121,7 +95098,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89801,11 +39641,7 @@
+@@ -89801,11 +39645,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95134,7 +95111,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89830,38 +39666,11 @@
+@@ -89830,38 +39670,11 @@
return 0;
}
_ACEOF
@@ -95176,7 +95153,7 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -89872,103 +39681,13 @@
+@@ -89872,103 +39685,13 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
@@ -95286,7 +95263,7 @@
_ACEOF
fi
-@@ -89988,13 +39707,13 @@
+@@ -89988,13 +39711,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95302,7 +95279,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90008,7 +39727,7 @@
+@@ -90008,7 +39731,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95311,7 +95288,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90023,9 +39742,9 @@
+@@ -90023,9 +39746,9 @@
@@ -95323,7 +95300,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90040,11 +39759,7 @@
+@@ -90040,11 +39763,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95336,7 +95313,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -90069,38 +39784,11 @@
+@@ -90069,38 +39788,11 @@
return 0;
}
_ACEOF
@@ -95378,7 +95355,7 @@
done
eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
LIBS="$ac_save_LIBS"
-@@ -90112,102 +39800,12 @@
+@@ -90112,102 +39804,12 @@
eval "ac_res=\$ac_cv_funclib_dn_expand"
if false; then
@@ -95486,7 +95463,7 @@
_ACEOF
fi
-@@ -90227,13 +39825,13 @@
+@@ -90227,13 +39829,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95502,7 +95479,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90247,7 +39845,7 @@
+@@ -90247,7 +39849,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95511,7 +95488,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90259,18 +39857,14 @@
+@@ -90259,18 +39861,14 @@
@@ -95533,7 +95510,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -90294,44 +39888,15 @@
+@@ -90294,44 +39892,15 @@
return 0;
}
_ACEOF
@@ -95583,7 +95560,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -90343,44 +39908,19 @@
+@@ -90343,44 +39912,19 @@
return 0;
}
_ACEOF
@@ -95633,7 +95610,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -90388,18 +39928,7 @@
+@@ -90388,18 +39932,7 @@
#define HAVE__RES 1
_ACEOF
@@ -95653,7 +95630,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -90412,64 +39941,17 @@
+@@ -90412,64 +39945,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -95723,7 +95700,7 @@
fi
-@@ -90535,9 +40017,9 @@
+@@ -90535,9 +40021,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
@@ -95735,7 +95712,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -90548,24 +40030,24 @@
+@@ -90548,24 +40034,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -95765,7 +95742,7 @@
$as_echo "no" >&6; }
fi
-@@ -90594,20 +40076,20 @@
+@@ -90594,20 +40080,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -95793,7 +95770,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90616,19 +40098,17 @@
+@@ -90616,19 +40102,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -95817,7 +95794,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90636,55 +40116,29 @@
+@@ -90636,55 +40120,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -95881,7 +95858,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -90693,52 +40147,24 @@
+@@ -90693,52 +40151,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -95941,7 +95918,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -90748,9 +40174,9 @@
+@@ -90748,9 +40178,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -95953,7 +95930,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -90763,9 +40189,9 @@
+@@ -90763,9 +40193,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
@@ -95965,7 +95942,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -90776,24 +40202,24 @@
+@@ -90776,24 +40206,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -95995,7 +95972,7 @@
$as_echo "no" >&6; }
fi
-@@ -90806,9 +40232,9 @@
+@@ -90806,9 +40236,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -96007,7 +95984,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -90816,7 +40242,7 @@
+@@ -90816,7 +40246,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -96016,7 +95993,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
-@@ -90832,7 +40258,7 @@
+@@ -90832,7 +40262,7 @@
LEX=false
YACC=false
fi
@@ -96025,7 +96002,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -90840,21 +40266,15 @@
+@@ -90840,21 +40270,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -96050,7 +96027,7 @@
HAVE_GSSAPI=YES
-@@ -90946,9 +40366,7 @@
+@@ -90946,9 +40370,7 @@
VPATH="$VPATH:\$(HEIMDAL_VPATH)"
@@ -96061,7 +96038,7 @@
-@@ -90957,170 +40375,27 @@
+@@ -90957,170 +40379,27 @@
"
@@ -96239,7 +96216,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91138,46 +40413,15 @@
+@@ -91138,46 +40417,15 @@
return 0;
}
_ACEOF
@@ -96290,7 +96267,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91195,65 +40439,32 @@
+@@ -91195,65 +40443,32 @@
return 0;
}
_ACEOF
@@ -96364,7 +96341,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. */
-@@ -91294,43 +40505,18 @@
+@@ -91294,43 +40509,18 @@
return 0;
}
_ACEOF
@@ -96414,7 +96391,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -91338,7 +40524,6 @@
+@@ -91338,7 +40528,6 @@
fi
@@ -96422,7 +96399,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
-@@ -91369,362 +40554,43 @@
+@@ -91369,362 +40558,43 @@
"
@@ -96819,7 +96796,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -91734,65 +40600,16 @@
+@@ -91734,65 +40604,16 @@
done
@@ -96890,7 +96867,7 @@
_ACEOF
fi
-@@ -91805,19 +40622,15 @@
+@@ -91805,19 +40626,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -96914,7 +96891,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -91831,51 +40644,22 @@
+@@ -91831,51 +40648,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -96972,7 +96949,7 @@
fi
fi
-@@ -91888,16 +40672,12 @@
+@@ -91888,16 +40676,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -96992,7 +96969,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -91909,64 +40689,33 @@
+@@ -91909,64 +40693,33 @@
return 0;
}
_ACEOF
@@ -97066,7 +97043,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -91978,59 +40727,32 @@
+@@ -91978,59 +40731,32 @@
return 0;
}
_ACEOF
@@ -97134,7 +97111,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -92043,71 +40765,38 @@
+@@ -92043,71 +40769,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -97216,7 +97193,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -92126,71 +40815,38 @@
+@@ -92126,71 +40819,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97298,7 +97275,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -92200,71 +40856,38 @@
+@@ -92200,71 +40860,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -97380,7 +97357,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92280,71 +40903,38 @@
+@@ -92280,71 +40907,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97462,7 +97439,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92364,201 +40954,33 @@
+@@ -92364,201 +40958,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -97675,7 +97652,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92567,19 +40989,15 @@
+@@ -92567,19 +40993,15 @@
done
@@ -97698,7 +97675,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92597,46 +41015,15 @@
+@@ -92597,46 +41019,15 @@
return 0;
}
_ACEOF
@@ -97749,7 +97726,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92654,65 +41041,32 @@
+@@ -92654,65 +41045,32 @@
return 0;
}
_ACEOF
@@ -97823,7 +97800,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. */
-@@ -92753,50 +41107,24 @@
+@@ -92753,50 +41111,24 @@
return 0;
}
_ACEOF
@@ -97880,7 +97857,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -92806,18 +41134,14 @@
+@@ -92806,18 +41138,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -97902,7 +97879,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -92840,48 +41164,23 @@
+@@ -92840,48 +41168,23 @@
return 0;
}
_ACEOF
@@ -97956,7 +97933,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -92893,20 +41192,16 @@
+@@ -92893,20 +41196,16 @@
fi
@@ -97981,7 +97958,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -92921,117 +41216,55 @@
+@@ -92921,117 +41220,55 @@
}
_ACEOF
@@ -98115,7 +98092,7 @@
fi
-@@ -93039,7 +41272,7 @@
+@@ -93039,7 +41276,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -98124,7 +98101,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -93048,169 +41281,26 @@
+@@ -93048,169 +41285,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -98302,7 +98279,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -93228,43 +41318,18 @@
+@@ -93228,43 +41322,18 @@
return 0;
}
_ACEOF
@@ -98352,7 +98329,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -93276,9 +41341,9 @@
+@@ -93276,9 +41345,9 @@
fi
fi
@@ -98364,7 +98341,7 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -93291,157 +41356,17 @@
+@@ -93291,157 +41360,17 @@
break
fi
done
@@ -98532,7 +98509,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -93480,12 +41405,10 @@
+@@ -93480,12 +41409,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -98547,7 +98524,7 @@
else
if test "$withval" != "yes" ; then
-@@ -93497,26 +41420,20 @@
+@@ -93497,26 +41424,20 @@
LIBS=-liconv
@@ -98582,7 +98559,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93529,33 +41446,10 @@
+@@ -93529,33 +41450,10 @@
}
_ACEOF
@@ -98619,7 +98596,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93563,29 +41457,17 @@
+@@ -93563,29 +41461,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98654,7 +98631,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93598,33 +41480,10 @@
+@@ -93598,33 +41484,10 @@
}
_ACEOF
@@ -98691,7 +98668,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93632,28 +41491,17 @@
+@@ -93632,28 +41495,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98726,7 +98703,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93666,33 +41514,10 @@
+@@ -93666,33 +41518,10 @@
}
_ACEOF
@@ -98763,7 +98740,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93700,31 +41525,22 @@
+@@ -93700,31 +41529,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98801,7 +98778,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -93737,17 +41553,13 @@
+@@ -93737,17 +41557,13 @@
if test x$ICONV_FOUND = xno; then
@@ -98823,7 +98800,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93760,49 +41572,20 @@
+@@ -93760,49 +41576,20 @@
}
_ACEOF
@@ -98879,7 +98856,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -93819,24 +41602,20 @@
+@@ -93819,24 +41606,20 @@
LIBS=-liconv
@@ -98911,7 +98888,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93849,33 +41628,10 @@
+@@ -93849,33 +41632,10 @@
}
_ACEOF
@@ -98948,7 +98925,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93883,27 +41639,17 @@
+@@ -93883,27 +41643,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98980,7 +98957,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93916,33 +41662,10 @@
+@@ -93916,33 +41666,10 @@
}
_ACEOF
@@ -99017,7 +98994,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93950,26 +41673,17 @@
+@@ -93950,26 +41677,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99049,7 +99026,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93982,33 +41696,10 @@
+@@ -93982,33 +41700,10 @@
}
_ACEOF
@@ -99086,7 +99063,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94016,29 +41707,22 @@
+@@ -94016,29 +41711,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99121,7 +99098,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -94046,7 +41730,7 @@
+@@ -94046,7 +41734,7 @@
done
if test x"$ICONV_FOUND" = x"no"; then
@@ -99130,7 +99107,7 @@
Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
-@@ -94059,9 +41743,7 @@
+@@ -94059,9 +41747,7 @@
else
@@ -99141,7 +99118,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94082,203 +41764,23 @@
+@@ -94082,203 +41768,23 @@
@@ -99353,7 +99330,7 @@
_ACEOF
fi
-@@ -94357,151 +41859,12 @@
+@@ -94357,151 +41863,12 @@
@@ -99509,7 +99486,7 @@
_ACEOF
fi
-@@ -94511,23 +41874,17 @@
+@@ -94511,23 +41878,17 @@
@@ -99536,7 +99513,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94545,54 +41902,28 @@
+@@ -94545,54 +41906,28 @@
return 0;
}
_ACEOF
@@ -99598,7 +99575,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -94608,18 +41939,13 @@
+@@ -94608,18 +41943,13 @@
fi
@@ -99620,7 +99597,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -94637,40 +41963,19 @@
+@@ -94637,40 +41967,19 @@
return 0;
}
_ACEOF
@@ -99663,7 +99640,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -94729,9 +42034,9 @@
+@@ -94729,9 +42038,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
@@ -99675,7 +99652,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94744,14 +42049,14 @@
+@@ -94744,14 +42053,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99693,7 +99670,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94760,10 +42065,10 @@
+@@ -94760,10 +42069,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99706,7 +99683,7 @@
$as_echo "no" >&6; }
fi
-@@ -94779,52 +42084,27 @@
+@@ -94779,52 +42088,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -99766,7 +99743,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -94832,22 +42112,16 @@
+@@ -94832,22 +42116,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTALLOC} = \"YES\";"
@@ -99793,7 +99770,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -94862,7 +42136,7 @@
+@@ -94862,7 +42140,7 @@
ac_cv_LIBTALLOC_found=yes
else
@@ -99802,7 +99779,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= $TALLOC_MIN_VERSION'
ac_cv_LIBTALLOC_found=no
-@@ -94892,9 +42166,9 @@
+@@ -94892,9 +42170,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
@@ -99814,7 +99791,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94907,14 +42181,14 @@
+@@ -94907,14 +42185,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99832,7 +99809,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94923,10 +42197,10 @@
+@@ -94923,10 +42201,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99845,7 +99822,7 @@
$as_echo "no" >&6; }
fi
-@@ -94942,52 +42216,27 @@
+@@ -94942,52 +42220,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -99905,7 +99882,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -94995,22 +42244,16 @@
+@@ -94995,22 +42248,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTDB} = \"YES\";"
@@ -99932,7 +99909,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95025,7 +42268,7 @@
+@@ -95025,7 +42272,7 @@
ac_cv_LIBTDB_found=yes
else
@@ -99941,7 +99918,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= $TDB_MIN_VERSION'
ac_cv_LIBTDB_found=no
-@@ -95050,9 +42293,7 @@
+@@ -95050,9 +42297,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -99952,7 +99929,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"
-@@ -95065,104 +42306,12 @@
+@@ -95065,104 +42310,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -100062,7 +100039,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -95170,151 +42319,12 @@
+@@ -95170,151 +42323,12 @@
fi
done
@@ -100220,7 +100197,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95325,17 +42335,13 @@
+@@ -95325,17 +42339,13 @@
@@ -100241,7 +100218,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95346,56 +42352,29 @@
+@@ -95346,56 +42356,29 @@
return 0;
}
_ACEOF
@@ -100305,7 +100282,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95406,41 +42385,18 @@
+@@ -95406,41 +42389,18 @@
return 0;
}
_ACEOF
@@ -100351,7 +100328,7 @@
fi
-@@ -95466,9 +42422,9 @@
+@@ -95466,9 +42426,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
@@ -100363,7 +100340,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95481,14 +42437,14 @@
+@@ -95481,14 +42441,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100381,7 +100358,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95497,10 +42453,10 @@
+@@ -95497,10 +42457,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100394,7 +100371,7 @@
$as_echo "no" >&6; }
fi
-@@ -95516,52 +42472,27 @@
+@@ -95516,52 +42476,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100454,7 +100431,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -95569,22 +42500,16 @@
+@@ -95569,22 +42504,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTEVENT} = \"YES\";"
@@ -100481,7 +100458,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95599,7 +42524,7 @@
+@@ -95599,7 +42528,7 @@
ac_cv_LIBTEVENT_found=yes
else
@@ -100490,7 +100467,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = $TEVENT_REQUIRED_VERSION'
ac_cv_LIBTEVENT_found=no
-@@ -95628,9 +42553,7 @@
+@@ -95628,9 +42557,7 @@
fi
done
if test x"$teventdir" = "x"; then
@@ -100501,7 +100478,7 @@
fi
fi
-@@ -95648,253 +42571,24 @@
+@@ -95648,253 +42575,24 @@
TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
@@ -100763,7 +100740,7 @@
_ACEOF
fi
-@@ -95903,9 +42597,7 @@
+@@ -95903,9 +42601,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"
@@ -100774,7 +100751,7 @@
fi
-@@ -95971,9 +42663,9 @@
+@@ -95971,9 +42667,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
@@ -100786,7 +100763,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95986,14 +42678,14 @@
+@@ -95986,14 +42682,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100804,7 +100781,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96002,10 +42694,10 @@
+@@ -96002,10 +42698,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100817,7 +100794,7 @@
$as_echo "no" >&6; }
fi
-@@ -96021,52 +42713,27 @@
+@@ -96021,52 +42717,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100877,7 +100854,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -96074,22 +42741,16 @@
+@@ -96074,22 +42745,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBLDB} = \"YES\";"
@@ -100904,7 +100881,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96104,7 +42765,7 @@
+@@ -96104,7 +42769,7 @@
ac_cv_LIBLDB_found=yes
else
@@ -100913,7 +100890,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = $LDB_REQUIRED_VERSION'
ac_cv_LIBLDB_found=no
-@@ -96150,12 +42811,12 @@
+@@ -96150,12 +42815,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -100928,7 +100905,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -96164,157 +42825,18 @@
+@@ -96164,157 +42829,18 @@
fi
@@ -101092,7 +101069,7 @@
_ACEOF
fi
-@@ -96324,11 +42846,9 @@
+@@ -96324,11 +42850,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101106,7 +101083,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -96343,23 +42863,17 @@
+@@ -96343,23 +42867,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -101133,7 +101110,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96377,54 +42891,28 @@
+@@ -96377,54 +42895,28 @@
return 0;
}
_ACEOF
@@ -101195,7 +101172,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -96440,21 +42928,16 @@
+@@ -96440,21 +42932,16 @@
fi
@@ -101221,7 +101198,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -96466,11 +42949,9 @@
+@@ -96466,11 +42953,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101235,7 +101212,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -96531,7 +43012,7 @@
+@@ -96531,7 +43016,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -101244,7 +101221,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -96545,9 +43026,9 @@
+@@ -96545,9 +43030,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
@@ -101256,7 +101233,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96560,14 +43041,14 @@
+@@ -96560,14 +43045,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -101274,7 +101251,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96576,10 +43057,10 @@
+@@ -96576,10 +43061,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -101287,7 +101264,7 @@
$as_echo "no" >&6; }
fi
-@@ -96595,52 +43076,27 @@
+@@ -96595,52 +43080,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -101347,7 +101324,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -96648,22 +43104,16 @@
+@@ -96648,22 +43108,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{GNUTLS} = \"YES\";"
@@ -101374,7 +101351,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96678,7 +43128,7 @@
+@@ -96678,7 +43132,7 @@
ac_cv_GNUTLS_found=yes
else
@@ -101383,7 +101360,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls < 2.6.0'
ac_cv_GNUTLS_found=no
-@@ -96695,770 +43145,161 @@
+@@ -96695,770 +43149,161 @@
use_gnutls=no
fi
@@ -102249,7 +102226,7 @@
_ACEOF
fi
-@@ -97467,23 +43308,17 @@
+@@ -97467,23 +43312,17 @@
@@ -102276,7 +102253,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97501,54 +43336,28 @@
+@@ -97501,54 +43340,28 @@
return 0;
}
_ACEOF
@@ -102338,7 +102315,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -97564,7 +43373,6 @@
+@@ -97564,7 +43377,6 @@
fi
@@ -102346,7 +102323,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -97602,19 +43410,17 @@
+@@ -97602,19 +43414,17 @@
#################################################
# check for pthread support
@@ -102370,7 +102347,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97632,12 +43438,12 @@
+@@ -97632,12 +43442,12 @@
;;
*)
@@ -102385,7 +102362,7 @@
$as_echo "no" >&6; }
fi
-@@ -97653,274 +43459,45 @@
+@@ -97653,274 +43463,45 @@
@@ -102673,7 +102650,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97938,54 +43515,28 @@
+@@ -97938,54 +43519,28 @@
return 0;
}
_ACEOF
@@ -102735,7 +102712,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -98001,15 +43552,14 @@
+@@ -98001,15 +43556,14 @@
fi
@@ -102753,7 +102730,7 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98019,22 +43569,20 @@
+@@ -98019,22 +43573,20 @@
\$enabled{SETPROCTITLE} = \"YES\";"
@@ -102780,7 +102757,7 @@
$as_echo "no" >&6; }
fi
-@@ -98052,17 +43600,13 @@
+@@ -98052,17 +43604,13 @@
@@ -102801,7 +102778,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -98081,209 +43625,43 @@
+@@ -98081,209 +43629,43 @@
return 0;
}
_ACEOF
@@ -103022,7 +102999,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98301,46 +43679,15 @@
+@@ -98301,46 +43683,15 @@
return 0;
}
_ACEOF
@@ -103073,7 +103050,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98353,70 +43700,37 @@
+@@ -98353,70 +43704,37 @@
int
main ()
{
@@ -103157,7 +103134,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. */
-@@ -98457,50 +43771,24 @@
+@@ -98457,50 +43775,24 @@
return 0;
}
_ACEOF
@@ -103214,7 +103191,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -98511,9 +43799,7 @@
+@@ -98511,9 +43803,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -103225,7 +103202,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98541,102 +43827,12 @@
+@@ -98541,102 +43831,12 @@
fi
@@ -103332,7 +103309,7 @@
_ACEOF
fi
-@@ -98646,151 +43842,12 @@
+@@ -98646,151 +43846,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -103488,7 +103465,7 @@
_ACEOF
fi
-@@ -98799,23 +43856,17 @@
+@@ -98799,23 +43860,17 @@
@@ -103515,7 +103492,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98833,54 +43884,28 @@
+@@ -98833,54 +43888,28 @@
return 0;
}
_ACEOF
@@ -103577,7 +103554,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -98895,7 +43920,6 @@
+@@ -98895,7 +43924,6 @@
fi
@@ -103585,7 +103562,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
-@@ -98921,23 +43945,17 @@
+@@ -98921,23 +43949,17 @@
# test for where we get crypt() from
@@ -103612,7 +103589,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98955,54 +43973,28 @@
+@@ -98955,54 +43977,28 @@
return 0;
}
_ACEOF
@@ -103674,7 +103651,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -99018,7 +44010,6 @@
+@@ -99018,7 +44014,6 @@
fi
@@ -103682,7 +103659,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -99035,102 +44026,12 @@
+@@ -99035,102 +44030,12 @@
@@ -103790,7 +103767,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -99139,151 +44040,12 @@
+@@ -99139,151 +44044,12 @@
done
@@ -103946,7 +103923,7 @@
_ACEOF
fi
-@@ -99292,330 +44054,18 @@
+@@ -99292,330 +44058,18 @@
@@ -104281,7 +104258,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -99623,70 +44073,125 @@
+@@ -99623,70 +44077,125 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -104453,7 +104430,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -99697,41 +44202,18 @@
+@@ -99697,41 +44206,18 @@
return 0;
}
_ACEOF
@@ -104499,7 +104476,7 @@
fi
-@@ -99775,17 +44257,13 @@
+@@ -99775,17 +44261,13 @@
fi
@@ -104520,7 +104497,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -99796,56 +44274,29 @@
+@@ -99796,56 +44278,29 @@
return 0;
}
_ACEOF
@@ -104584,7 +104561,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -99856,41 +44307,18 @@
+@@ -99856,41 +44311,18 @@
return 0;
}
_ACEOF
@@ -104630,7 +104607,7 @@
fi
-@@ -99914,151 +44342,12 @@
+@@ -99914,151 +44346,12 @@
fi
@@ -104787,7 +104764,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -100372,151 +44661,12 @@
+@@ -100372,151 +44665,12 @@
@@ -104943,7 +104920,7 @@
_ACEOF
fi
-@@ -100526,23 +44676,17 @@
+@@ -100526,23 +44680,17 @@
@@ -104970,7 +104947,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100560,54 +44704,28 @@
+@@ -100560,54 +44708,28 @@
return 0;
}
_ACEOF
@@ -105032,7 +105009,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -100623,18 +44741,13 @@
+@@ -100623,18 +44745,13 @@
fi
@@ -105054,7 +105031,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -100652,40 +44765,19 @@
+@@ -100652,40 +44769,19 @@
return 0;
}
_ACEOF
@@ -105097,7 +105074,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -100799,87 +44891,54 @@
+@@ -100799,87 +44895,54 @@
#################################################
# Display summary of libraries detected
@@ -105201,7 +105178,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
-@@ -100938,13 +44997,13 @@
+@@ -100938,13 +45001,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -105217,7 +105194,7 @@
esac ;;
esac
done
-@@ -100952,8 +45011,8 @@
+@@ -100952,8 +45015,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -105228,7 +105205,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -100976,11 +45035,11 @@
+@@ -100976,11 +45039,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" &&
@@ -105242,7 +105219,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -101000,8 +45059,8 @@
+@@ -101000,8 +45063,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.
@@ -105253,7 +105230,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -101025,9 +45084,10 @@
+@@ -101025,9 +45088,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -105266,7 +105243,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -101037,17 +45097,18 @@
+@@ -101037,17 +45101,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -105292,7 +105269,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -101055,23 +45116,15 @@
+@@ -101055,23 +45120,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -105321,7 +105298,7 @@
as_nl='
'
export as_nl
-@@ -101079,7 +45132,13 @@
+@@ -101079,7 +45136,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
@@ -105336,7 +105313,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -101090,7 +45149,7 @@
+@@ -101090,7 +45153,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -105345,7 +105322,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -101113,13 +45172,6 @@
+@@ -101113,13 +45176,6 @@
}
fi
@@ -105359,7 +105336,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -101129,15 +45181,15 @@
+@@ -101129,15 +45185,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -105378,7 +105355,7 @@
IFS=$as_save_IFS
;;
-@@ -101149,12 +45201,16 @@
+@@ -101149,12 +45205,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -105399,7 +105376,7 @@
done
PS1='$ '
PS2='> '
-@@ -101166,7 +45222,89 @@
+@@ -101166,7 +45226,89 @@
LANGUAGE=C
export LANGUAGE
@@ -105490,7 +105467,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -101180,8 +45318,12 @@
+@@ -101180,8 +45322,12 @@
as_basename=false
fi
@@ -105504,7 +105481,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -101201,76 +45343,25 @@
+@@ -101201,76 +45347,25 @@
}
s/.*/./; q'`
@@ -105592,7 +105569,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -101299,8 +45390,56 @@
+@@ -101299,8 +45394,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -105650,7 +105627,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -101319,10 +45458,10 @@
+@@ -101319,10 +45462,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -105663,7 +105640,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -101337,13 +45476,19 @@
+@@ -101337,13 +45480,19 @@
exec 6>&1
@@ -105685,7 +105662,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -101375,10 +45520,11 @@
+@@ -101375,10 +45524,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -105700,7 +105677,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -101400,16 +45546,16 @@
+@@ -101400,16 +45550,16 @@
Configuration commands:
$config_commands
@@ -105720,7 +105697,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -101451,20 +45597,19 @@
+@@ -101451,20 +45601,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -105745,7 +105722,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -101472,11 +45617,10 @@
+@@ -101472,11 +45621,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -105760,7 +105737,7 @@
ac_need_defaults=false ;;
esac
-@@ -101569,9 +45713,7 @@
+@@ -101569,9 +45717,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -105771,7 +105748,7 @@
esac
done
-@@ -101598,7 +45740,7 @@
+@@ -101598,7 +45744,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -105780,7 +105757,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -101609,11 +45751,7 @@
+@@ -101609,11 +45755,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -105793,7 +105770,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -101621,10 +45759,16 @@
+@@ -101621,10 +45763,16 @@
if test -n "$CONFIG_FILES"; then
@@ -105813,7 +105790,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -101638,24 +45782,18 @@
+@@ -101638,24 +45786,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -105841,7 +105818,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101744,9 +45882,7 @@
+@@ -101744,9 +45886,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -105852,7 +105829,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -101787,9 +45923,7 @@
+@@ -101787,9 +45927,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -105863,7 +105840,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101874,9 +46008,7 @@
+@@ -101874,9 +46012,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -105874,7 +105851,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -101889,9 +46021,7 @@
+@@ -101889,9 +46025,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -105885,7 +105862,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -101919,12 +46049,10 @@
+@@ -101919,12 +46053,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -105900,7 +105877,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -101935,7 +46063,7 @@
+@@ -101935,7 +46067,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -105909,7 +105886,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -101948,9 +46076,7 @@
+@@ -101948,9 +46080,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -105920,7 +105897,7 @@
esac
;;
esac
-@@ -101978,47 +46104,7 @@
+@@ -101978,47 +46108,7 @@
q
}
s/.*/./; q'`
@@ -105969,7 +105946,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -102070,7 +46156,6 @@
+@@ -102070,7 +46160,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=
@@ -105977,7 +105954,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -102080,12 +46165,11 @@
+@@ -102080,12 +46169,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -105992,7 +105969,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
-@@ -102095,7 +46179,7 @@
+@@ -102095,7 +46183,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -106001,7 +105978,7 @@
esac
_ACEOF
-@@ -102123,14 +46207,12 @@
+@@ -102123,14 +46211,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -106018,7 +105995,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;}
-@@ -102140,9 +46222,7 @@
+@@ -102140,9 +46226,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -106029,7 +106006,7 @@
;;
:H)
#
-@@ -102153,29 +46233,23 @@
+@@ -102153,29 +46237,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -106064,7 +106041,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -102201,15 +46275,12 @@
+@@ -102201,15 +46279,12 @@
done # for ac_tag
@@ -106082,7 +106059,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -102230,10 +46301,10 @@
+@@ -102230,10 +46305,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.
@@ -106095,7 +106072,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -102244,8 +46315,8 @@
+@@ -102244,8 +46319,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
Modified: trunk/samba/debian/patches/external-talloc-support.patch
===================================================================
--- trunk/samba/debian/patches/external-talloc-support.patch 2009-09-08 02:54:00 UTC (rev 3021)
+++ trunk/samba/debian/patches/external-talloc-support.patch 2009-09-08 04:39:45 UTC (rev 3022)
@@ -27,16 +27,7 @@
===================================================================
--- samba-deb.clean.orig/source3/configure.in
+++ samba-deb.clean/source3/configure.in
-@@ -42,6 +42,8 @@
- if test "x$enable_external_libtalloc" = xno
- then
- m4_include(../lib/talloc/libtalloc.m4)
-+else
-+ NO_LIBTALLOC='#'
- fi
-
- LIBTALLOC_OBJ0=""
-@@ -49,6 +51,7 @@
+@@ -49,6 +49,7 @@
LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
done
AC_SUBST(LIBTALLOC_OBJ0)
@@ -44,3 +35,16 @@
m4_include(../lib/tevent/libtevent.m4)
+@@ -4749,6 +4750,12 @@
+ # be extracted from their respective source directories
+ #
+ SMB_LIBRARY(talloc, 1)
++if test "x$enable_external_libtalloc" = xyes
++then
++ NO_LIBTALLOC='#'
++ LIBTALLOC_STATIC=
++fi
++
+ SMB_LIBRARY(tdb, 1)
+ SMB_LIBRARY(netapi, 0)
+ SMB_LIBRARY(smbclient, 0)
More information about the Pkg-samba-maint
mailing list