[Pkg-samba-maint] r2616 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Feb 28 07:52:12 UTC 2009
Author: bubulle
Date: 2009-02-28 07:52:11 +0000 (Sat, 28 Feb 2009)
New Revision: 2616
Modified:
trunk/samba/debian/patches/autoconf.patch
Log:
Update for 3.3.1
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-02-28 07:52:02 UTC (rev 2615)
+++ trunk/samba/debian/patches/autoconf.patch 2009-02-28 07:52:11 UTC (rev 2616)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.3.0/source/configure
+Index: samba-3.3.1/source/configure
===================================================================
---- samba-3.3.0.orig/source/configure
-+++ samba-3.3.0/source/configure
+--- samba-3.3.1.orig/source/configure
++++ samba-3.3.1/source/configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -314,6 +314,7 @@
-WINBIND_WINS_NSS
-WINBIND_NSS
-WINBIND_NSS_PTHREAD
+-CTDB_CFLAGS
-LIBADDNS_SOVER
-UNINSTALL_LIBADDNS
-INSTALL_LIBADDNS
@@ -475,7 +476,6 @@
-codepagedir
-swatdir
-privatedir
--ctdbdir
-logfilebase
-piddir
-lockdir
@@ -587,7 +587,6 @@
+lockdir
+piddir
+logfilebase
-+ctdbdir
+privatedir
+swatdir
+codepagedir
@@ -755,6 +754,7 @@
+INSTALL_LIBADDNS
+UNINSTALL_LIBADDNS
+LIBADDNS_SOVER
++CTDB_CFLAGS
+WINBIND_NSS_PTHREAD
+WINBIND_NSS
+WINBIND_WINS_NSS
@@ -800,7 +800,6 @@
-with_swatdir
-with_configdir
-with_logfilebase
--with_ctdb
-with_modulesdir
-with_pammodulesdir
-with_mandir
@@ -854,6 +853,7 @@
-with_libsmbclient
-with_libsmbsharemodes
-with_libaddns
+-with_ctdb
-with_cluster_support
-with_acl_support
-with_aio_support
@@ -1673,18 +1673,7 @@
;;
* )
logfilebase="$withval"
-@@ -2588,8 +2429,8 @@
- if test "${with_ctdb+set}" = set; then
- withval=$with_ctdb; case "$withval" in
- yes|no)
-- { $as_echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
--$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
-+echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
- ;;
- * )
- ctdbdir="$withval"
-@@ -2608,8 +2449,8 @@
+@@ -2593,8 +2434,8 @@
#
# Just in case anybody does it
#
@@ -1695,7 +1684,7 @@
;;
* )
modulesdir="$withval"
-@@ -2628,8 +2469,8 @@
+@@ -2613,8 +2454,8 @@
#
# Just in case anybody calls it without argument
#
@@ -1706,7 +1695,7 @@
;;
* )
pammodulesdir="$withval"
-@@ -2648,8 +2489,8 @@
+@@ -2633,8 +2474,8 @@
#
# Just in case anybody does it
#
@@ -1717,7 +1706,7 @@
;;
* )
mandir="$withval"
-@@ -2668,8 +2509,8 @@
+@@ -2653,8 +2494,8 @@
#
# Just in case anybody does it
#
@@ -1728,7 +1717,7 @@
;;
*)
localedir="$withval"
-@@ -2705,8 +2546,8 @@
+@@ -2689,8 +2530,8 @@
if test "${with_selftest_prefix+set}" = set; then
withval=$with_selftest_prefix; case "$withval" in
yes|no)
@@ -1739,7 +1728,7 @@
;;
* )
selftest_prefix="$withval"
-@@ -2725,15 +2566,15 @@
+@@ -2709,15 +2550,15 @@
if test "${with_smbtorture4_path+set}" = set; then
withval=$with_smbtorture4_path; case "$withval" in
yes|no)
@@ -1759,7 +1748,7 @@
{ (exit 1); exit 1; }; }
fi
;;
-@@ -2824,10 +2665,10 @@
+@@ -2808,10 +2649,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -1773,7 +1762,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2840,7 +2681,7 @@
+@@ -2824,7 +2665,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -1782,7 +1771,7 @@
break 2
fi
done
-@@ -2851,11 +2692,11 @@
+@@ -2835,11 +2676,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -1798,7 +1787,7 @@
fi
-@@ -2864,10 +2705,10 @@
+@@ -2848,10 +2689,10 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -1812,7 +1801,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2880,7 +2721,7 @@
+@@ -2864,7 +2705,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -1821,7 +1810,7 @@
break 2
fi
done
-@@ -2891,11 +2732,11 @@
+@@ -2875,11 +2716,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -1837,7 +1826,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -2903,8 +2744,12 @@
+@@ -2887,8 +2728,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -1852,7 +1841,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -2917,10 +2762,10 @@
+@@ -2901,10 +2746,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -1866,7 +1855,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2933,7 +2778,7 @@
+@@ -2917,7 +2762,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -1875,7 +1864,7 @@
break 2
fi
done
-@@ -2944,11 +2789,11 @@
+@@ -2928,11 +2773,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -1891,7 +1880,7 @@
fi
-@@ -2957,10 +2802,10 @@
+@@ -2941,10 +2786,10 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -1905,7 +1894,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2978,7 +2823,7 @@
+@@ -2962,7 +2807,7 @@
continue
fi
ac_cv_prog_CC="cc"
@@ -1914,7 +1903,7 @@
break 2
fi
done
-@@ -3001,11 +2846,11 @@
+@@ -2985,11 +2830,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -1930,7 +1919,7 @@
fi
-@@ -3016,10 +2861,10 @@
+@@ -3000,10 +2845,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -1944,7 +1933,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3032,7 +2877,7 @@
+@@ -3016,7 +2861,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -1953,7 +1942,7 @@
break 2
fi
done
-@@ -3043,11 +2888,11 @@
+@@ -3027,11 +2872,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -1969,7 +1958,7 @@
fi
-@@ -3060,10 +2905,10 @@
+@@ -3044,10 +2889,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1983,7 +1972,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3076,7 +2921,7 @@
+@@ -3060,7 +2905,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -1992,7 +1981,7 @@
break 2
fi
done
-@@ -3087,11 +2932,11 @@
+@@ -3071,11 +2916,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -2008,7 +1997,7 @@
fi
-@@ -3103,8 +2948,12 @@
+@@ -3087,8 +2932,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2023,7 +2012,7 @@
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
-@@ -3114,50 +2963,44 @@
+@@ -3098,50 +2947,44 @@
fi
@@ -2085,7 +2074,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-@@ -3176,22 +3019,27 @@
+@@ -3160,22 +3003,27 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -2122,7 +2111,7 @@
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
-@@ -3202,11 +3050,10 @@
+@@ -3186,11 +3034,10 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2136,7 +2125,7 @@
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3217,7 +3064,7 @@
+@@ -3201,7 +3048,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2145,7 +2134,7 @@
;;
[ab].out )
# We found the default executable, but exeext='' is most
-@@ -3244,27 +3091,25 @@
+@@ -3228,27 +3075,25 @@
ac_file=''
fi
@@ -2181,7 +2170,7 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -3273,53 +3118,49 @@
+@@ -3257,53 +3102,49 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2251,7 +2240,7 @@
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3328,33 +3169,31 @@
+@@ -3312,33 +3153,31 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -2294,7 +2283,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3377,43 +3216,40 @@
+@@ -3361,43 +3200,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2350,7 +2339,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3439,21 +3275,20 @@
+@@ -3423,21 +3259,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2375,20 +2364,17 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -3461,21 +3296,17 @@
+@@ -3447,19 +3282,15 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
--
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-+
- fi
+-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -2404,7 +2390,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -3502,21 +3333,20 @@
+@@ -3486,21 +3317,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2429,7 +2415,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -3541,21 +3371,20 @@
+@@ -3525,21 +3355,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2454,7 +2440,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3581,21 +3410,20 @@
+@@ -3565,21 +3394,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2479,7 +2465,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3610,8 +3438,8 @@
+@@ -3594,8 +3422,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -2490,7 +2476,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -3627,10 +3455,10 @@
+@@ -3611,10 +3439,10 @@
CFLAGS=
fi
fi
@@ -2504,7 +2490,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -3701,21 +3529,20 @@
+@@ -3685,21 +3513,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2529,7 +2515,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3731,15 +3558,15 @@
+@@ -3715,15 +3542,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -2551,7 +2537,7 @@
esac
-@@ -3752,10 +3579,10 @@
+@@ -3736,10 +3563,10 @@
CFLAGS=$savedCFLAGS
if test x"$GCC" != x"yes" ; then
@@ -2565,7 +2551,7 @@
else
ac_cv_prog_cc_c99=no
ac_save_CC=$CC
-@@ -3902,7 +3729,7 @@
+@@ -3886,7 +3713,7 @@
return 0;
}
_ACEOF
@@ -2574,7 +2560,7 @@
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-@@ -3911,21 +3738,20 @@
+@@ -3895,21 +3722,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2599,7 +2585,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3941,15 +3767,15 @@
+@@ -3925,15 +3751,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c99" in
x)
@@ -2621,7 +2607,7 @@
esac
-@@ -3957,27 +3783,33 @@
+@@ -3941,27 +3767,33 @@
fi
if test x"$GCC" = x"yes" ; then
@@ -2662,7 +2648,7 @@
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -4009,21 +3841,20 @@
+@@ -3993,21 +3825,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2687,7 +2673,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -4047,14 +3878,13 @@
+@@ -4031,14 +3862,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2704,7 +2690,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -4062,7 +3892,7 @@
+@@ -4046,7 +3876,7 @@
# Broken: success on invalid input.
continue
else
@@ -2713,7 +2699,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -4087,8 +3917,8 @@
+@@ -4071,8 +3901,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -2724,7 +2710,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -4116,21 +3946,20 @@
+@@ -4100,21 +3930,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2749,7 +2735,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -4154,14 +3983,13 @@
+@@ -4138,14 +3967,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -2766,7 +2752,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -4169,7 +3997,7 @@
+@@ -4153,7 +3981,7 @@
# Broken: success on invalid input.
continue
else
@@ -2775,7 +2761,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -4185,13 +4013,11 @@
+@@ -4169,13 +3997,11 @@
if $ac_preproc_ok; then
:
else
@@ -2792,7 +2778,7 @@
fi
ac_ext=c
-@@ -4201,37 +4027,42 @@
+@@ -4185,37 +4011,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -2847,7 +2833,7 @@
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4246,60 +4077,74 @@
+@@ -4230,60 +4061,74 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -2942,7 +2928,7 @@
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -4314,31 +4159,69 @@
+@@ -4298,31 +4143,69 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -3023,7 +3009,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4365,21 +4248,20 @@
+@@ -4349,21 +4232,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3048,7 +3034,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -4471,40 +4353,37 @@
+@@ -4455,40 +4337,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3097,7 +3083,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4526,11 +4405,11 @@
+@@ -4510,11 +4389,11 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
@@ -3113,7 +3099,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4548,21 +4427,20 @@
+@@ -4532,21 +4411,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3138,7 +3124,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -4570,15 +4448,12 @@
+@@ -4554,15 +4432,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -3159,7 +3145,7 @@
_ACEOF
fi
-@@ -4586,19 +4461,18 @@
+@@ -4570,19 +4445,18 @@
done
@@ -3187,7 +3173,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4614,33 +4488,32 @@
+@@ -4598,33 +4472,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3228,7 +3214,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4654,52 +4527,51 @@
+@@ -4638,52 +4511,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3302,7 +3288,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -4708,25 +4580,25 @@
+@@ -4692,25 +4564,25 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -3335,7 +3321,7 @@
cat >>confdefs.h <<\_ACEOF
#define _POSIX_SOURCE 1
-@@ -4742,14 +4614,22 @@
+@@ -4726,14 +4598,22 @@
#define _MINIX 1
_ACEOF
@@ -3344,8 +3330,6 @@
+
+
+
-+
-+
@@ -3354,6 +3338,8 @@
+
+
+
++
++
+ { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; }
if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
@@ -3362,7 +3348,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4774,21 +4654,20 @@
+@@ -4758,21 +4638,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3387,7 +3373,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_safe_to_define___extensions__=no
-@@ -4796,22 +4675,14 @@
+@@ -4780,22 +4659,14 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -3412,7 +3398,7 @@
#define _POSIX_PTHREAD_SEMANTICS 1
_ACEOF
-@@ -4820,78 +4691,28 @@
+@@ -4804,78 +4675,28 @@
_ACEOF
@@ -3501,7 +3487,7 @@
;
return 0;
-@@ -4903,34 +4724,33 @@
+@@ -4887,34 +4708,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3542,7 +3528,7 @@
;
return 0;
-@@ -4942,21 +4762,20 @@
+@@ -4926,21 +4746,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3567,7 +3553,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_bigendian=no
-@@ -4964,69 +4783,29 @@
+@@ -4948,69 +4767,29 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
@@ -3650,7 +3636,7 @@
;
return 0;
}
-@@ -5037,101 +4816,30 @@
+@@ -5021,101 +4800,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3763,7 +3749,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5150,14 +4858,14 @@
+@@ -5134,14 +4842,14 @@
main ()
{
@@ -3786,7 +3772,7 @@
;
return 0;
-@@ -5169,67 +4877,60 @@
+@@ -5153,67 +4861,60 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3880,7 +3866,7 @@
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
-@@ -5252,21 +4953,20 @@
+@@ -5236,21 +4937,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3905,7 +3891,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5277,8 +4977,8 @@
+@@ -5261,8 +4961,8 @@
done
fi
@@ -3916,7 +3902,7 @@
case $ac_cv_c_inline in
-@@ -5300,8 +5000,8 @@
+@@ -5284,8 +4984,8 @@
saved_CFLAGS="$CFLAGS";
c99_init=no
if test x"$c99_init" = x"no"; then
@@ -3927,7 +3913,7 @@
CFLAGS="$saved_CFLAGS";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5326,33 +5026,32 @@
+@@ -5310,33 +5010,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -3970,7 +3956,7 @@
CFLAGS="$saved_CFLAGS -AC99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5377,33 +5076,32 @@
+@@ -5361,33 +5060,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4013,7 +3999,7 @@
CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5428,33 +5126,32 @@
+@@ -5412,33 +5110,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4056,7 +4042,7 @@
CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5479,33 +5176,32 @@
+@@ -5463,33 +5160,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4099,7 +4085,7 @@
CFLAGS="$saved_CFLAGS -c99"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5530,26 +5226,25 @@
+@@ -5514,26 +5210,25 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4133,7 +4119,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -5570,8 +5265,8 @@
+@@ -5554,8 +5249,8 @@
else
CFLAGS="$saved_CFLAGS"
saved_CFLAGS=""
@@ -4144,7 +4130,7 @@
fi
-@@ -5588,12 +5283,11 @@
+@@ -5572,12 +5267,11 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -4160,7 +4146,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -5622,29 +5316,17 @@
+@@ -5606,29 +5300,17 @@
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -4192,7 +4178,7 @@
fi
if test "${ac_cv_path_install+set}" = set; then
-@@ -5657,8 +5339,8 @@
+@@ -5641,8 +5323,8 @@
INSTALL=$ac_install_sh
fi
fi
@@ -4203,7 +4189,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -5669,10 +5351,10 @@
+@@ -5653,10 +5335,10 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -4217,7 +4203,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -5710,30 +5392,26 @@
+@@ -5694,30 +5376,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4253,7 +4239,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
-@@ -5748,8 +5426,8 @@
+@@ -5732,8 +5410,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -4264,7 +4250,7 @@
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -5774,10 +5452,10 @@
+@@ -5758,10 +5436,10 @@
if test "$enable_largefile" != no; then
@@ -4278,7 +4264,7 @@
else
ac_cv_sys_largefile_CC=no
if test "$GCC" != yes; then
-@@ -5814,21 +5492,20 @@
+@@ -5798,21 +5476,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4303,7 +4289,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5842,21 +5519,20 @@
+@@ -5826,21 +5503,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4328,7 +4314,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5869,16 +5545,16 @@
+@@ -5853,16 +5529,16 @@
rm -f conftest.$ac_ext
fi
fi
@@ -4350,7 +4336,7 @@
else
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -5910,21 +5586,20 @@
+@@ -5894,21 +5570,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4375,7 +4361,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5961,21 +5636,20 @@
+@@ -5945,21 +5620,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4400,7 +4386,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5986,8 +5660,8 @@
+@@ -5970,8 +5644,8 @@
break
done
fi
@@ -4411,7 +4397,7 @@
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
*)
-@@ -5996,12 +5670,12 @@
+@@ -5980,12 +5654,12 @@
_ACEOF
;;
esac
@@ -4428,7 +4414,7 @@
else
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -6033,21 +5707,20 @@
+@@ -6017,21 +5691,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4453,7 +4439,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6084,21 +5757,20 @@
+@@ -6068,21 +5741,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4478,7 +4464,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6109,8 +5781,8 @@
+@@ -6093,8 +5765,8 @@
break
done
fi
@@ -4489,7 +4475,7 @@
case $ac_cv_sys_large_files in #(
no | unknown) ;;
*)
-@@ -6119,7 +5791,7 @@
+@@ -6103,7 +5775,7 @@
_ACEOF
;;
esac
@@ -4498,7 +4484,7 @@
fi
fi
-@@ -6138,13 +5810,13 @@
+@@ -6122,13 +5794,13 @@
_ACEOF
if test "`uname -r`" = "B.11.00" -o "`uname -r`" = "B.11.11"; then
@@ -4516,7 +4502,7 @@
CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED"
fi
;;
-@@ -6221,21 +5893,20 @@
+@@ -6205,21 +5877,20 @@
for ac_header in standards.h
do
@@ -4547,7 +4533,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6251,33 +5922,32 @@
+@@ -6235,33 +5906,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4588,7 +4574,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6291,393 +5961,87 @@
+@@ -6275,52 +5945,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -4662,375 +4648,57 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
+@@ -6329,24 +5998,21 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--# Solaris needs HAVE_LONG_LONG defined
--{ $as_echo "$as_me:$LINENO: checking for long long" >&5
--$as_echo_n "checking for long long... " >&6; }
--if test "${ac_cv_type_long_long+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_type_long_long=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (long long))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((long long)))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_long_long=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--$as_echo "$ac_cv_type_long_long" >&6; }
--if test "x$ac_cv_type_long_long" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LONG_LONG 1
--_ACEOF
--
--
--fi
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ $as_echo "$as_me:$LINENO: checking size of int" >&5
--$as_echo_n "checking size of int... " >&6; }
--if test "${ac_cv_sizeof_int+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
-+## ---------------------------------------- ##
-+_ASBOX
-+ ) | sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
-- ac_lo= ac_hi=
fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+@@ -6355,24 +6021,26 @@
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+done
-+
-+
-+# Solaris needs HAVE_LONG_LONG defined
+
+ # Solaris needs HAVE_LONG_LONG defined
+-{ $as_echo "$as_me:$LINENO: checking for long long" >&5
+-$as_echo_n "checking for long long... " >&6; }
+{ echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long_long+set}" = set; then
+ if test "${ac_cv_type_long_long+set}" = set; then
+- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- cat >conftest.$ac_ext <<_ACEOF
+ else
+- ac_cv_type_long_long=no
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6685,12 +6049,14 @@
+ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5038,9 +4706,8 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
--test_array [0] = 0
--
+-if (sizeof (long long))
+- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
@@ -5048,7 +4715,7 @@
;
return 0;
}
-@@ -6701,42 +6067,43 @@
+@@ -6383,18 +6051,44 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5066,34 +4733,16 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid
+ ac_cv_type_long_long=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
++else
+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_long_long=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_int=$ac_lo;;
--'') if test "$ac_cv_type_int" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (int)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_int=0
-- fi ;;
--esac
+fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+if test $ac_cv_type_long_long = yes; then
@@ -5110,43 +4759,20 @@
+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+if test "${ac_cv_type_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
++else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6745,103 +6112,56 @@
+ _ACEOF
+@@ -6402,11 +6096,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
--static long int longval () { return (long int) (sizeof (int)); }
--static unsigned long int ulongval () { return (long int) (sizeof (int)); }
--#include <stdio.h>
--#include <stdlib.h>
+typedef int ac__type_new_;
int
main ()
{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
-- return 1;
-- if (((long int) (sizeof (int))) < 0)
-- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (int))))
-- return 1;
-- fprintf (f, "%ld", i);
-- }
-- else
-- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (int))))
-- return 1;
-- fprintf (f, "%lu", i);
-- }
-- /* Do not output a trailing newline, as this causes \r\n confusion
-- on some platforms. */
-- return ferror (f) || fclose (f) != 0;
--
+-if (sizeof ((long long)))
+- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
@@ -5154,79 +4780,56 @@
;
return 0;
}
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
- case "(($ac_try" in
+@@ -6417,56 +6114,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof_int=`cat conftest.val`
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_long_long=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_int=yes
else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
+- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--( exit $ac_status )
--if test "$ac_cv_type_int" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (int)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_int=0
-- fi
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
+-
+ ac_cv_type_int=no
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--$as_echo "$ac_cv_sizeof_int" >&6; }
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+-$as_echo "$ac_cv_type_long_long" >&6; }
+-if test "x$ac_cv_type_long_long" = x""yes; then
-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_LONG_LONG 1
+-_ACEOF
-
-
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT $ac_cv_sizeof_int
--_ACEOF
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+-fi
+-
+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6; }
@@ -5234,18 +4837,17 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
--{ $as_echo "$as_me:$LINENO: checking size of char" >&5
--$as_echo_n "checking size of char... " >&6; }
--if test "${ac_cv_sizeof_char+set}" = set; then
-- $as_echo_n "(cached) " >&6
+-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+-$as_echo_n "checking size of int... " >&6; }
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_int+set}" = set; then
+ if test "${ac_cv_sizeof_int+set}" = set; then
+- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -6852,10 +6172,11 @@
+@@ -6477,10 +6156,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5253,12 +4855,12 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
-@@ -6868,14 +6189,13 @@
+@@ -6493,14 +6173,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5275,7 +4877,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -6889,10 +6209,11 @@
+@@ -6514,10 +6193,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5283,12 +4885,12 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
-@@ -6905,21 +6226,20 @@
+@@ -6530,21 +6210,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5313,7 +4915,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -6933,7 +6253,7 @@
+@@ -6558,7 +6237,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -5322,7 +4924,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -6943,10 +6263,11 @@
+@@ -6568,10 +6247,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5330,12 +4932,12 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
-@@ -6959,14 +6280,13 @@
+@@ -6584,14 +6264,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5352,7 +4954,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -6980,10 +6300,11 @@
+@@ -6605,10 +6284,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5360,12 +4962,12 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
-@@ -6996,21 +6317,20 @@
+@@ -6621,21 +6301,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5390,7 +4992,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -7024,7 +6344,7 @@
+@@ -6649,7 +6328,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -5399,7 +5001,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -7044,10 +6364,11 @@
+@@ -6669,10 +6348,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5407,12 +5009,12 @@
int
main ()
{
--static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
-@@ -7060,21 +6381,20 @@
+@@ -6685,21 +6365,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5437,51 +5039,44 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -7083,17 +6403,15 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+@@ -6710,13 +6389,11 @@
case $ac_lo in
--?*) ac_cv_sizeof_char=$ac_lo;;
--'') if test "$ac_cv_type_char" = yes; then
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+ '') if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+?*) ac_cv_sizeof_int=$ac_lo;;
-+'') if test "$ac_cv_type_int" = yes; then
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (char)
+-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+ { (exit 77); exit 77; }; }
else
-- ac_cv_sizeof_char=0
-+ ac_cv_sizeof_int=0
+ ac_cv_sizeof_int=0
fi ;;
- esac
- else
-@@ -7104,8 +6422,9 @@
+@@ -6729,8 +6406,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
--static long int longval () { return (long int) (sizeof (char)); }
--static unsigned long int ulongval () { return (long int) (sizeof (char)); }
+-static long int longval () { return (long int) (sizeof (int)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+ typedef int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -7115,22 +6434,20 @@
+@@ -6740,22 +6418,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
-- if (((long int) (sizeof (char))) < 0)
+- if (((long int) (sizeof (int))) < 0)
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
long int i = longval ();
-- if (i != ((long int) (sizeof (char))))
+- if (i != ((long int) (sizeof (int))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%ld", i);
@@ -5490,7 +5085,7 @@
else
{
unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (char))))
+- if (i != ((long int) (sizeof (int))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%lu", i);
@@ -5501,7 +5096,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -7143,64 +6460,113 @@
+@@ -6768,48 +6444,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5525,8 +5120,7 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_sizeof_char=`cat conftest.val`
-+ ac_cv_sizeof_int=`cat conftest.val`
+ ac_cv_sizeof_int=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
@@ -5535,21 +5129,19 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
--if test "$ac_cv_type_char" = yes; then
+ if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+if test "$ac_cv_type_int" = yes; then
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (char)
+-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+ { (exit 77); exit 77; }; }
else
-- ac_cv_sizeof_char=0
-+ ac_cv_sizeof_int=0
+ ac_cv_sizeof_int=0
fi
fi
-rm -rf conftest.dSYM
@@ -5557,54 +5149,376 @@
fi
rm -f conftest.val
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
--$as_echo "$ac_cv_sizeof_char" >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
- cat >>confdefs.h <<_ACEOF
--#define SIZEOF_CHAR $ac_cv_sizeof_char
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
-+
+@@ -6818,222 +6489,26 @@
+ _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 char" >&5
+-$as_echo_n "checking size of char... " >&6; }
+-if test "${ac_cv_sizeof_char+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+{ echo "$as_me:$LINENO: checking for char" >&5
+echo $ECHO_N "checking for char... $ECHO_C" >&6; }
+if test "${ac_cv_type_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+typedef char ac__type_new_;
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
+-test_array [0] = 0
+-
+- ;
+if ((ac__type_new_ *) 0)
-+ return 0;
+ return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+if (sizeof (ac__type_new_))
-+ return 0;
-+ ;
-+ return 0;
-+}
- _ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
+ return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+-test_array [0] = 0
+-
+ ;
+ return 0;
+ }
+@@ -7044,147 +6519,38 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_char=$ac_lo;;
+-'') if test "$ac_cv_type_char" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (char)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_char=0
+- fi ;;
+-esac
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (char)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (char)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- return 1;
+- if (((long int) (sizeof (char))) < 0)
+- {
+- long int i = longval ();
+- if (i != ((long int) (sizeof (char))))
+- return 1;
+- fprintf (f, "%ld", i);
+- }
+- else
+- {
+- unsigned long int i = ulongval ();
+- if (i != ((long int) (sizeof (char))))
+- return 1;
+- fprintf (f, "%lu", i);
+- }
+- /* Do not output a trailing newline, as this causes \r\n confusion
+- on some platforms. */
+- return ferror (f) || fclose (f) != 0;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_sizeof_char=`cat conftest.val`
+-else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-if test "$ac_cv_type_char" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (char)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_char=0
+- fi
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.val
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+-$as_echo "$ac_cv_sizeof_char" >&6; }
+-
+-
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
@@ -5615,7 +5529,10 @@
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_CHAR $ac_cv_sizeof_char
+-_ACEOF
+ ac_cv_type_char=no
+fi
@@ -5639,7 +5556,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -7211,10 +6577,11 @@
+@@ -7195,10 +6561,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5652,7 +5569,7 @@
test_array [0] = 0
;
-@@ -7227,14 +6594,13 @@
+@@ -7211,14 +6578,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5669,7 +5586,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -7248,10 +6614,11 @@
+@@ -7232,10 +6598,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5682,7 +5599,7 @@
test_array [0] = 0
;
-@@ -7264,21 +6631,20 @@
+@@ -7248,21 +6615,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5707,7 +5624,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -7292,7 +6658,7 @@
+@@ -7276,7 +6642,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -5716,7 +5633,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -7302,10 +6668,11 @@
+@@ -7286,10 +6652,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5729,7 +5646,7 @@
test_array [0] = 0
;
-@@ -7318,14 +6685,13 @@
+@@ -7302,14 +6669,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5746,7 +5663,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -7339,10 +6705,11 @@
+@@ -7323,10 +6689,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5759,7 +5676,7 @@
test_array [0] = 0
;
-@@ -7355,21 +6722,20 @@
+@@ -7339,21 +6706,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5784,7 +5701,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -7383,7 +6749,7 @@
+@@ -7367,7 +6733,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -5793,7 +5710,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -7403,10 +6769,11 @@
+@@ -7387,10 +6753,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5806,7 +5723,7 @@
test_array [0] = 0
;
-@@ -7419,21 +6786,20 @@
+@@ -7403,21 +6770,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -5831,7 +5748,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -7442,17 +6808,15 @@
+@@ -7426,17 +6792,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
@@ -5855,7 +5772,7 @@
fi ;;
esac
else
-@@ -7463,8 +6827,9 @@
+@@ -7447,8 +6811,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -5867,7 +5784,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -7474,22 +6839,20 @@
+@@ -7458,22 +6823,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -5895,7 +5812,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -7502,64 +6865,113 @@
+@@ -7486,64 +6849,113 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6033,7 +5950,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -7570,10 +6982,11 @@
+@@ -7554,10 +6966,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6046,7 +5963,7 @@
test_array [0] = 0
;
-@@ -7586,14 +6999,13 @@
+@@ -7570,14 +6983,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6063,7 +5980,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -7607,10 +7019,11 @@
+@@ -7591,10 +7003,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6076,7 +5993,7 @@
test_array [0] = 0
;
-@@ -7623,21 +7036,20 @@
+@@ -7607,21 +7020,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6101,7 +6018,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -7651,7 +7063,7 @@
+@@ -7635,7 +7047,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -6110,7 +6027,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -7661,10 +7073,11 @@
+@@ -7645,10 +7057,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6123,7 +6040,7 @@
test_array [0] = 0
;
-@@ -7677,14 +7090,13 @@
+@@ -7661,14 +7074,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6140,7 +6057,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -7698,10 +7110,11 @@
+@@ -7682,10 +7094,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6153,7 +6070,7 @@
test_array [0] = 0
;
-@@ -7714,21 +7127,20 @@
+@@ -7698,21 +7111,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6178,7 +6095,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -7742,7 +7154,7 @@
+@@ -7726,7 +7138,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -6187,7 +6104,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -7762,10 +7174,11 @@
+@@ -7746,10 +7158,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6200,7 +6117,7 @@
test_array [0] = 0
;
-@@ -7778,21 +7191,20 @@
+@@ -7762,21 +7175,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6225,7 +6142,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -7801,17 +7213,15 @@
+@@ -7785,17 +7197,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
@@ -6249,7 +6166,7 @@
fi ;;
esac
else
-@@ -7822,8 +7232,9 @@
+@@ -7806,8 +7216,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6261,7 +6178,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -7833,22 +7244,20 @@
+@@ -7817,22 +7228,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -6289,7 +6206,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -7861,64 +7270,113 @@
+@@ -7845,64 +7254,113 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6427,7 +6344,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -7929,10 +7387,11 @@
+@@ -7913,10 +7371,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6440,7 +6357,7 @@
test_array [0] = 0
;
-@@ -7945,14 +7404,13 @@
+@@ -7929,14 +7388,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6457,7 +6374,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -7966,10 +7424,11 @@
+@@ -7950,10 +7408,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6470,7 +6387,7 @@
test_array [0] = 0
;
-@@ -7982,21 +7441,20 @@
+@@ -7966,21 +7425,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6495,7 +6412,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -8010,7 +7468,7 @@
+@@ -7994,7 +7452,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -6504,7 +6421,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -8020,10 +7478,11 @@
+@@ -8004,10 +7462,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6517,7 +6434,7 @@
test_array [0] = 0
;
-@@ -8036,14 +7495,13 @@
+@@ -8020,14 +7479,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6534,7 +6451,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -8057,10 +7515,11 @@
+@@ -8041,10 +7499,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6547,7 +6464,7 @@
test_array [0] = 0
;
-@@ -8073,21 +7532,20 @@
+@@ -8057,21 +7516,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6572,7 +6489,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -8101,7 +7559,7 @@
+@@ -8085,7 +7543,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -6581,7 +6498,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -8121,10 +7579,11 @@
+@@ -8105,10 +7563,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6594,7 +6511,7 @@
test_array [0] = 0
;
-@@ -8137,21 +7596,20 @@
+@@ -8121,21 +7580,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6619,7 +6536,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -8160,17 +7618,15 @@
+@@ -8144,17 +7602,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
@@ -6643,7 +6560,7 @@
fi ;;
esac
else
-@@ -8181,8 +7637,9 @@
+@@ -8165,8 +7621,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6655,7 +6572,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -8192,22 +7649,20 @@
+@@ -8176,22 +7633,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -6683,7 +6600,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -8220,201 +7675,56 @@
+@@ -8204,97 +7659,56 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -6741,132 +6658,28 @@
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
--_ACEOF
--
--
--
--{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
--$as_echo_n "checking for uint_t... " >&6; }
--if test "${ac_cv_type_uint_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_type_uint_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (uint_t))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((uint_t)))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_uint_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
--$as_echo "$ac_cv_type_uint_t" >&6; }
--if test "x$ac_cv_type_uint_t" = x""yes; then
-- :
--else
cat >>confdefs.h <<_ACEOF
--#define uint_t unsigned int
+-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
--fi
--{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
--$as_echo_n "checking for int8_t... " >&6; }
--if test "${ac_cv_type_int8_t+set}" = set; then
+-
+-{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
+-$as_echo_n "checking for uint_t... " >&6; }
+-if test "${ac_cv_type_uint_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+if test "${ac_cv_type_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_type_int8_t=no
+- ac_cv_type_uint_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -6877,7 +6690,7 @@
-int
-main ()
-{
--if (sizeof (int8_t))
+-if (sizeof (uint_t))
- return 0;
- ;
- return 0;
@@ -6904,7 +6717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8422,115 +7732,14 @@
+@@ -8302,11 +7716,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -6912,118 +6725,16 @@
int
main ()
{
--if (sizeof ((int8_t)))
+-if (sizeof ((uint_t)))
- return 0;
-- ;
+if ((ac__type_new_ *) 0)
- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_int8_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
--$as_echo "$ac_cv_type_int8_t" >&6; }
--if test "x$ac_cv_type_int8_t" = x""yes; then
-- :
--else
--
--cat >>confdefs.h <<_ACEOF
--#define int8_t char
--_ACEOF
--
--fi
--
--{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
--$as_echo_n "checking for uint8_t... " >&6; }
--if test "${ac_cv_type_uint8_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_type_uint8_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (uint8_t))
-- return 0;
-- ;
++ return 0;
+if (sizeof (ac__type_new_))
- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof ((uint8_t)))
-- return 0;
++ return 0;
;
return 0;
}
-@@ -8541,54 +7750,41 @@
+@@ -8317,54 +7734,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7042,43 +6753,43 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_uint8_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_long_long=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--
+- ac_cv_type_uint_t=yes
+ ac_cv_type_long_long=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
--$as_echo "$ac_cv_type_uint8_t" >&6; }
--if test "x$ac_cv_type_uint8_t" = x""yes; then
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
+-$as_echo "$ac_cv_type_uint_t" >&6; }
+-if test "x$ac_cv_type_uint_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
--#define uint8_t unsigned char
+-#define uint_t unsigned int
-_ACEOF
-
--fi
+ fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
--{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
--$as_echo_n "checking for int16_t... " >&6; }
--if test "${ac_cv_type_int16_t+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
+-$as_echo_n "checking for int8_t... " >&6; }
+-if test "${ac_cv_type_int8_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+# 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
@@ -7089,13 +6800,13 @@
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_type_int16_t=no
+- ac_cv_type_int8_t=no
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8596,11 +7792,13 @@
+@@ -8372,11 +7776,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7103,7 +6814,7 @@
int
main ()
{
--if (sizeof (int16_t))
+-if (sizeof (int8_t))
- return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
@@ -7111,7 +6822,7 @@
;
return 0;
}
-@@ -8611,30 +7809,33 @@
+@@ -8387,30 +7793,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7143,7 +6854,7 @@
int
main ()
{
--if (sizeof ((int16_t)))
+-if (sizeof ((int8_t)))
- return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
@@ -7151,7 +6862,7 @@
;
return 0;
}
-@@ -8645,66 +7846,50 @@
+@@ -8421,66 +7830,50 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7176,7 +6887,7 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_int16_t=yes
+- ac_cv_type_int8_t=yes
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
@@ -7197,24 +6908,24 @@
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
--$as_echo "$ac_cv_type_int16_t" >&6; }
--if test "x$ac_cv_type_int16_t" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
+-$as_echo "$ac_cv_type_int8_t" >&6; }
+-if test "x$ac_cv_type_int8_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
--#define int16_t short
+-#define int8_t char
-_ACEOF
-
-fi
-
--{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
--$as_echo_n "checking for uint16_t... " >&6; }
--if test "${ac_cv_type_uint16_t+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
+-$as_echo_n "checking for uint8_t... " >&6; }
+-if test "${ac_cv_type_uint8_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-- ac_cv_type_uint16_t=no
+- ac_cv_type_uint8_t=no
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7227,7 +6938,7 @@
int
main ()
{
--if (sizeof (uint16_t))
+-if (sizeof (uint8_t))
- return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+test_array [0] = 0
@@ -7235,7 +6946,7 @@
;
return 0;
}
-@@ -8715,30 +7900,33 @@
+@@ -8491,30 +7884,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7267,7 +6978,7 @@
int
main ()
{
--if (sizeof ((uint16_t)))
+-if (sizeof ((uint8_t)))
- return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+test_array [0] = 0
@@ -7275,7 +6986,7 @@
;
return 0;
}
-@@ -8749,68 +7937,60 @@
+@@ -8525,88 +7921,46 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7300,7 +7011,7 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_uint16_t=yes
+- ac_cv_type_uint8_t=yes
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
@@ -7322,35 +7033,66 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
--$as_echo "$ac_cv_type_uint16_t" >&6; }
--if test "x$ac_cv_type_uint16_t" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
+-$as_echo "$ac_cv_type_uint8_t" >&6; }
+-if test "x$ac_cv_type_uint8_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
--#define uint16_t unsigned short
+-#define uint8_t unsigned char
-_ACEOF
-
-fi
--
--if test $ac_cv_sizeof_int -eq 4 ; then
--{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
--$as_echo_n "checking for int32_t... " >&6; }
--if test "${ac_cv_type_int32_t+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
+-$as_echo_n "checking for int16_t... " >&6; }
+-if test "${ac_cv_type_int16_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-- ac_cv_type_int32_t=no
+- ac_cv_type_int16_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 (int16_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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -8614,11 +7968,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7358,15 +7100,15 @@
int
main ()
{
--if (sizeof (int32_t))
-- return 0;
+-if (sizeof ((int16_t)))
+- return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+test_array [0] = 0
+
;
return 0;
}
-@@ -8821,18 +8001,40 @@
+@@ -8629,194 +7985,136 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7384,15 +7126,43 @@
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_int16_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_hi=$ac_mid
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&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
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
+-$as_echo "$ac_cv_type_int16_t" >&6; }
+-if test "x$ac_cv_type_int16_t" = x""yes; then
+- :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define int16_t short
+-_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
+-$as_echo_n "checking for uint16_t... " >&6; }
+-if test "${ac_cv_type_uint16_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
@@ -7406,11 +7176,13 @@
+ ac_cv_sizeof_long_long=0
+ fi ;;
+esac
-+else
- cat >conftest.$ac_ext <<_ACEOF
+ else
+- ac_cv_type_uint16_t=no
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8840,81 +8042,110 @@
+ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7422,8 +7194,8 @@
int
main ()
{
--if (sizeof ((int32_t)))
-- return 0;
+-if (sizeof (uint16_t))
+- return 0;
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
@@ -7470,16 +7242,46 @@
- 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 ((uint16_t)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
-+ ac_status=$?
+ ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long_long=`cat conftest.val`
@@ -7489,7 +7291,7 @@
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_int32_t=yes
+- ac_cv_type_uint16_t=yes
+( exit $ac_status )
+if test "$ac_cv_type_long_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
@@ -7514,9 +7316,9 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.val
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
--$as_echo "$ac_cv_type_int32_t" >&6; }
--if test "x$ac_cv_type_int32_t" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
+-$as_echo "$ac_cv_type_uint16_t" >&6; }
+-if test "x$ac_cv_type_uint16_t" = x""yes; then
- :
-else
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
@@ -7525,28 +7327,62 @@
+
cat >>confdefs.h <<_ACEOF
--#define int32_t int
+-#define uint16_t unsigned short
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-fi
--{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
--$as_echo_n "checking for uint32_t... " >&6; }
--if test "${ac_cv_type_uint32_t+set}" = set; then
+
+-if test $ac_cv_sizeof_int -eq 4 ; then
+-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
+-$as_echo_n "checking for int32_t... " >&6; }
+-if test "${ac_cv_type_int32_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+
+{ echo "$as_me:$LINENO: checking for uint_t" >&5
+echo $ECHO_N "checking for uint_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_uint_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- ac_cv_type_uint32_t=no
+- ac_cv_type_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (int32_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -8824,11 +8122,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7554,8 +7390,8 @@
int
main ()
{
--if (sizeof (uint32_t))
-- return 0;
+-if (sizeof ((int32_t)))
+- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
@@ -7563,7 +7399,7 @@
;
return 0;
}
-@@ -8925,18 +8156,44 @@
+@@ -8839,88 +8140,44 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7581,37 +7417,91 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_int32_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_uint_t=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-
+ ac_cv_type_uint_t=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
+-$as_echo "$ac_cv_type_int32_t" >&6; }
+-if test "x$ac_cv_type_int32_t" = x""yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint_t" >&6; }
+if test $ac_cv_type_uint_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
+ :
+ else
+
+ cat >>confdefs.h <<_ACEOF
+-#define int32_t int
+#define uint_t unsigned int
-+_ACEOF
-+
-+fi
-+
+ _ACEOF
+
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+-$as_echo_n "checking for uint32_t... " >&6; }
+-if test "${ac_cv_type_uint32_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+{ echo "$as_me:$LINENO: checking for int8_t" >&5
+echo $ECHO_N "checking for int8_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_int8_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+- ac_cv_type_uint32_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof (uint32_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
-@@ -8944,11 +8201,14 @@
+@@ -8928,11 +8185,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7628,7 +7518,7 @@
;
return 0;
}
-@@ -8959,67 +8219,59 @@
+@@ -8943,67 +8203,59 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7715,7 +7605,7 @@
;
return 0;
}
-@@ -9030,18 +8282,44 @@
+@@ -9014,18 +8266,44 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7763,7 +7653,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9049,11 +8327,14 @@
+@@ -9033,11 +8311,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7780,7 +7670,7 @@
;
return 0;
}
-@@ -9064,66 +8345,59 @@
+@@ -9048,66 +8329,59 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7866,7 +7756,7 @@
;
return 0;
}
-@@ -9134,18 +8408,46 @@
+@@ -9118,18 +8392,46 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7916,7 +7806,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9153,11 +8455,14 @@
+@@ -9137,11 +8439,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7933,7 +7823,7 @@
;
return 0;
}
-@@ -9168,72 +8473,59 @@
+@@ -9152,72 +8457,59 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8025,7 +7915,7 @@
;
return 0;
}
-@@ -9244,18 +8536,45 @@
+@@ -9228,18 +8520,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8074,7 +7964,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9263,11 +8582,14 @@
+@@ -9247,11 +8566,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8091,7 +7981,7 @@
;
return 0;
}
-@@ -9278,66 +8600,59 @@
+@@ -9262,66 +8584,59 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8110,26 +8000,26 @@
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_int64_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_int32_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_int64_t=yes
+-
+ ac_cv_type_int32_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
-$as_echo "$ac_cv_type_int64_t" >&6; }
-if test "x$ac_cv_type_int64_t" = x""yes; then
@@ -8177,7 +8067,7 @@
;
return 0;
}
-@@ -9348,18 +8663,50 @@
+@@ -9332,18 +8647,50 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8231,7 +8121,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9367,11 +8714,14 @@
+@@ -9351,11 +8698,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8248,7 +8138,7 @@
;
return 0;
}
-@@ -9382,67 +8732,59 @@
+@@ -9366,67 +8716,59 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8267,26 +8157,26 @@
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_uint64_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_int64_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_uint64_t=yes
+-
+ ac_cv_type_int64_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
-$as_echo "$ac_cv_type_uint64_t" >&6; }
-if test "x$ac_cv_type_uint64_t" = x""yes; then
@@ -8335,7 +8225,7 @@
;
return 0;
}
-@@ -9453,18 +8795,45 @@
+@@ -9437,18 +8779,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8384,7 +8274,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9472,11 +8841,14 @@
+@@ -9456,11 +8825,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8401,7 +8291,7 @@
;
return 0;
}
-@@ -9487,39 +8859,30 @@
+@@ -9471,39 +8843,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8420,26 +8310,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_size_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_size_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--
+- ac_cv_type_size_t=yes
+ ac_cv_type_size_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
@@ -8449,7 +8339,7 @@
:
else
-@@ -9529,24 +8892,26 @@
+@@ -9513,24 +8876,26 @@
fi
@@ -8483,7 +8373,7 @@
;
return 0;
}
-@@ -9557,18 +8922,45 @@
+@@ -9541,18 +8906,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8532,7 +8422,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9576,11 +8968,14 @@
+@@ -9560,11 +8952,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8549,7 +8439,7 @@
;
return 0;
}
-@@ -9591,57 +8986,38 @@
+@@ -9575,57 +8970,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8617,7 +8507,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -9652,10 +9028,11 @@
+@@ -9636,10 +9012,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8630,7 +8520,7 @@
test_array [0] = 0
;
-@@ -9668,14 +9045,13 @@
+@@ -9652,14 +9029,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8647,7 +8537,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -9689,10 +9065,11 @@
+@@ -9673,10 +9049,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8660,7 +8550,7 @@
test_array [0] = 0
;
-@@ -9705,21 +9082,20 @@
+@@ -9689,21 +9066,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8685,7 +8575,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -9733,7 +9109,7 @@
+@@ -9717,7 +9093,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -8694,7 +8584,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -9743,10 +9119,11 @@
+@@ -9727,10 +9103,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8707,7 +8597,7 @@
test_array [0] = 0
;
-@@ -9759,14 +9136,13 @@
+@@ -9743,14 +9120,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8724,7 +8614,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -9780,10 +9156,11 @@
+@@ -9764,10 +9140,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8737,7 +8627,7 @@
test_array [0] = 0
;
-@@ -9796,21 +9173,20 @@
+@@ -9780,21 +9157,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8762,7 +8652,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -9824,7 +9200,7 @@
+@@ -9808,7 +9184,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -8771,7 +8661,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -9844,10 +9220,11 @@
+@@ -9828,10 +9204,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8784,7 +8674,7 @@
test_array [0] = 0
;
-@@ -9860,21 +9237,20 @@
+@@ -9844,21 +9221,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8809,7 +8699,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -9885,13 +9261,11 @@
+@@ -9869,13 +9245,11 @@
case $ac_lo in
?*) ac_cv_sizeof_off_t=$ac_lo;;
'') if test "$ac_cv_type_off_t" = yes; then
@@ -8826,7 +8716,7 @@
else
ac_cv_sizeof_off_t=0
fi ;;
-@@ -9904,8 +9278,9 @@
+@@ -9888,8 +9262,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8838,7 +8728,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -9915,22 +9290,20 @@
+@@ -9899,22 +9274,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -8866,7 +8756,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -9943,48 +9316,43 @@
+@@ -9927,48 +9300,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8926,7 +8816,7 @@
-@@ -9993,14 +9361,68 @@
+@@ -9977,14 +9345,68 @@
_ACEOF
@@ -8998,7 +8888,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -10011,10 +9433,11 @@
+@@ -9995,10 +9417,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9011,7 +8901,7 @@
test_array [0] = 0
;
-@@ -10027,14 +9450,13 @@
+@@ -10011,14 +9434,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9028,7 +8918,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -10048,10 +9470,11 @@
+@@ -10032,10 +9454,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9041,7 +8931,7 @@
test_array [0] = 0
;
-@@ -10064,21 +9487,20 @@
+@@ -10048,21 +9471,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9066,7 +8956,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -10092,7 +9514,7 @@
+@@ -10076,7 +9498,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -9075,7 +8965,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -10102,10 +9524,11 @@
+@@ -10086,10 +9508,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9088,7 +8978,7 @@
test_array [0] = 0
;
-@@ -10118,14 +9541,13 @@
+@@ -10102,14 +9525,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9105,7 +8995,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -10139,10 +9561,11 @@
+@@ -10123,10 +9545,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9118,7 +9008,7 @@
test_array [0] = 0
;
-@@ -10155,21 +9578,20 @@
+@@ -10139,21 +9562,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9143,7 +9033,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -10183,7 +9605,7 @@
+@@ -10167,7 +9589,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -9152,7 +9042,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -10203,10 +9625,11 @@
+@@ -10187,10 +9609,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9165,7 +9055,7 @@
test_array [0] = 0
;
-@@ -10219,21 +9642,20 @@
+@@ -10203,21 +9626,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9190,7 +9080,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -10244,13 +9666,11 @@
+@@ -10228,13 +9650,11 @@
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
'') if test "$ac_cv_type_size_t" = yes; then
@@ -9207,7 +9097,7 @@
else
ac_cv_sizeof_size_t=0
fi ;;
-@@ -10263,8 +9683,9 @@
+@@ -10247,8 +9667,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9219,7 +9109,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -10274,22 +9695,20 @@
+@@ -10258,22 +9679,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -9247,7 +9137,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -10302,64 +9721,113 @@
+@@ -10286,48 +9705,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9307,14 +9197,10 @@
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
--_ACEOF
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-+_ACEOF
-+
-+
+@@ -10336,14 +9750,68 @@
+ _ACEOF
+
+
+{ echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_ssize_t+set}" = set; then
@@ -9363,12 +9249,12 @@
+
+ ac_cv_type_ssize_t=no
+fi
-
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
-
++
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -9383,7 +9269,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -10370,10 +9838,11 @@
+@@ -10354,10 +9822,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9396,7 +9282,7 @@
test_array [0] = 0
;
-@@ -10386,14 +9855,13 @@
+@@ -10370,14 +9839,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9413,7 +9299,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -10407,10 +9875,11 @@
+@@ -10391,10 +9859,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9426,7 +9312,7 @@
test_array [0] = 0
;
-@@ -10423,21 +9892,20 @@
+@@ -10407,21 +9876,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9451,7 +9337,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -10451,7 +9919,7 @@
+@@ -10435,7 +9903,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -9460,7 +9346,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -10461,10 +9929,11 @@
+@@ -10445,10 +9913,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9473,7 +9359,7 @@
test_array [0] = 0
;
-@@ -10477,14 +9946,13 @@
+@@ -10461,14 +9930,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9490,7 +9376,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -10498,10 +9966,11 @@
+@@ -10482,10 +9950,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9503,7 +9389,7 @@
test_array [0] = 0
;
-@@ -10514,21 +9983,20 @@
+@@ -10498,21 +9967,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9528,7 +9414,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -10542,7 +10010,7 @@
+@@ -10526,7 +9994,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -9537,7 +9423,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -10562,10 +10030,11 @@
+@@ -10546,10 +10014,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9550,7 +9436,7 @@
test_array [0] = 0
;
-@@ -10578,21 +10047,20 @@
+@@ -10562,21 +10031,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9575,7 +9461,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -10603,13 +10071,11 @@
+@@ -10587,13 +10055,11 @@
case $ac_lo in
?*) ac_cv_sizeof_ssize_t=$ac_lo;;
'') if test "$ac_cv_type_ssize_t" = yes; then
@@ -9592,7 +9478,7 @@
else
ac_cv_sizeof_ssize_t=0
fi ;;
-@@ -10622,8 +10088,9 @@
+@@ -10606,8 +10072,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9604,7 +9490,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -10633,22 +10100,20 @@
+@@ -10617,22 +10084,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -9632,7 +9518,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -10661,48 +10126,43 @@
+@@ -10645,48 +10110,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9692,7 +9578,7 @@
-@@ -10712,46 +10172,11 @@
+@@ -10696,46 +10156,11 @@
@@ -9742,7 +9628,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10759,11 +10184,14 @@
+@@ -10743,11 +10168,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9759,7 +9645,7 @@
;
return 0;
}
-@@ -10774,39 +10202,30 @@
+@@ -10758,39 +10186,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9807,7 +9693,7 @@
:
else
-@@ -10816,46 +10235,11 @@
+@@ -10800,46 +10219,11 @@
fi
@@ -9857,7 +9743,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10863,11 +10247,14 @@
+@@ -10847,11 +10231,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9874,7 +9760,7 @@
;
return 0;
}
-@@ -10878,39 +10265,30 @@
+@@ -10862,39 +10249,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9922,7 +9808,7 @@
:
else
-@@ -10920,46 +10298,11 @@
+@@ -10904,46 +10282,11 @@
fi
@@ -9972,7 +9858,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10967,11 +10310,14 @@
+@@ -10951,11 +10294,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9989,7 +9875,7 @@
;
return 0;
}
-@@ -10982,39 +10328,30 @@
+@@ -10966,39 +10312,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10037,7 +9923,7 @@
:
else
-@@ -11026,23 +10363,23 @@
+@@ -11010,23 +10347,23 @@
if test x"$ac_cv_type_long_long" != x"yes";then
@@ -10068,7 +9954,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -11079,21 +10416,20 @@
+@@ -11063,21 +10400,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10093,7 +9979,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_immediate_structures=no
-@@ -11102,8 +10438,8 @@
+@@ -11086,8 +10422,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -10104,7 +9990,7 @@
if test x"$libreplace_cv_immediate_structures" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -11127,8 +10463,8 @@
+@@ -11111,8 +10447,8 @@
fi
done
if test x"$tallocdir" = "x"; then
@@ -10115,7 +10001,7 @@
{ (exit 1); exit 1; }; }
fi
TALLOC_OBJ="talloc.o"
-@@ -11140,14 +10476,68 @@
+@@ -11124,14 +10460,68 @@
TALLOC_LIBS=""
@@ -10187,7 +10073,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -11158,10 +10548,11 @@
+@@ -11142,10 +10532,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10200,7 +10086,7 @@
test_array [0] = 0
;
-@@ -11174,14 +10565,13 @@
+@@ -11158,14 +10549,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10217,7 +10103,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -11195,10 +10585,11 @@
+@@ -11179,10 +10569,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10230,7 +10116,7 @@
test_array [0] = 0
;
-@@ -11211,21 +10602,20 @@
+@@ -11195,21 +10586,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10255,7 +10141,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -11239,7 +10629,7 @@
+@@ -11223,7 +10613,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -10264,7 +10150,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -11249,10 +10639,11 @@
+@@ -11233,10 +10623,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10277,7 +10163,7 @@
test_array [0] = 0
;
-@@ -11265,14 +10656,13 @@
+@@ -11249,14 +10640,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10294,7 +10180,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -11286,10 +10676,11 @@
+@@ -11270,10 +10660,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10307,7 +10193,7 @@
test_array [0] = 0
;
-@@ -11302,21 +10693,20 @@
+@@ -11286,21 +10677,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10332,7 +10218,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -11330,7 +10720,7 @@
+@@ -11314,7 +10704,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -10341,7 +10227,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -11350,10 +10740,11 @@
+@@ -11334,10 +10724,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10354,7 +10240,7 @@
test_array [0] = 0
;
-@@ -11366,21 +10757,20 @@
+@@ -11350,21 +10741,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10379,7 +10265,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -11391,13 +10781,11 @@
+@@ -11375,13 +10765,11 @@
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
'') if test "$ac_cv_type_size_t" = yes; then
@@ -10396,7 +10282,7 @@
else
ac_cv_sizeof_size_t=0
fi ;;
-@@ -11410,8 +10798,9 @@
+@@ -11394,8 +10782,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10408,7 +10294,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -11421,22 +10810,20 @@
+@@ -11405,22 +10794,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -10436,7 +10322,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -11449,48 +10836,43 @@
+@@ -11433,64 +10820,113 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10466,40 +10352,33 @@
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- if test "$ac_cv_type_size_t" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++if test "$ac_cv_type_size_t" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (size_t)
++See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
++See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_size_t=0
- fi
- fi
--rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--$as_echo "$ac_cv_sizeof_size_t" >&6; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
++fi
++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
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
-
-
-
-@@ -11499,14 +10881,68 @@
- _ACEOF
-
-
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
++_ACEOF
++
++
+{ echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
+if test "${ac_cv_type_void_p+set}" = set; then
@@ -10544,16 +10423,41 @@
+ ac_cv_type_void_p=yes
+else
+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-( exit $ac_status )
+-if test "$ac_cv_type_size_t" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_size_t=0
+- fi
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.val
+ ac_cv_type_void_p=no
-+fi
-+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+-_ACEOF
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
-+
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -10568,7 +10472,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -11517,10 +10953,11 @@
+@@ -11501,10 +10937,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10581,7 +10485,7 @@
test_array [0] = 0
;
-@@ -11533,14 +10970,13 @@
+@@ -11517,14 +10954,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10598,7 +10502,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -11554,10 +10990,11 @@
+@@ -11538,10 +10974,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10611,7 +10515,7 @@
test_array [0] = 0
;
-@@ -11570,21 +11007,20 @@
+@@ -11554,21 +10991,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10636,7 +10540,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -11598,7 +11034,7 @@
+@@ -11582,7 +11018,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -10645,7 +10549,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -11608,10 +11044,11 @@
+@@ -11592,10 +11028,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10658,7 +10562,7 @@
test_array [0] = 0
;
-@@ -11624,14 +11061,13 @@
+@@ -11608,14 +11045,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10675,7 +10579,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -11645,10 +11081,11 @@
+@@ -11629,10 +11065,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10688,7 +10592,7 @@
test_array [0] = 0
;
-@@ -11661,21 +11098,20 @@
+@@ -11645,21 +11082,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10713,7 +10617,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -11689,7 +11125,7 @@
+@@ -11673,7 +11109,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -10722,7 +10626,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -11709,10 +11145,11 @@
+@@ -11693,10 +11129,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10735,7 +10639,7 @@
test_array [0] = 0
;
-@@ -11725,21 +11162,20 @@
+@@ -11709,21 +11146,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10760,7 +10664,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -11750,13 +11186,11 @@
+@@ -11734,13 +11170,11 @@
case $ac_lo in
?*) ac_cv_sizeof_void_p=$ac_lo;;
'') if test "$ac_cv_type_void_p" = yes; then
@@ -10777,7 +10681,7 @@
else
ac_cv_sizeof_void_p=0
fi ;;
-@@ -11769,8 +11203,9 @@
+@@ -11753,8 +11187,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10789,7 +10693,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -11780,22 +11215,20 @@
+@@ -11764,22 +11199,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -10817,7 +10721,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -11808,48 +11241,43 @@
+@@ -11792,48 +11225,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10877,7 +10781,7 @@
-@@ -11860,16 +11288,16 @@
+@@ -11844,16 +11272,16 @@
if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
@@ -10904,7 +10808,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -12068,10 +11496,10 @@
+@@ -12052,10 +11480,10 @@
if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
# Add -Wdeclaration-after-statement if compiler supports it
@@ -10918,7 +10822,7 @@
else
-@@ -12105,32 +11533,29 @@
+@@ -12089,32 +11517,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10957,7 +10861,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -12147,18 +11572,18 @@
+@@ -12131,18 +11556,18 @@
fi
@@ -10981,7 +10885,7 @@
else
-@@ -12192,32 +11617,29 @@
+@@ -12176,32 +11601,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11020,7 +10924,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -12234,8 +11656,8 @@
+@@ -12218,8 +11640,8 @@
fi
@@ -11031,7 +10935,7 @@
if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
fi
-@@ -12274,15 +11696,15 @@
+@@ -12258,15 +11680,15 @@
#################################################
# check for a shared memory profiling support
@@ -11051,7 +10955,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_PROFILE 1
-@@ -12291,14 +11713,14 @@
+@@ -12275,14 +11697,14 @@
samba_cv_WITH_PROFILE=yes
;;
*)
@@ -11070,7 +10974,7 @@
fi
-@@ -12317,12 +11739,11 @@
+@@ -12301,12 +11723,11 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -11086,7 +10990,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -12351,29 +11772,17 @@
+@@ -12335,29 +11756,17 @@
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -11118,7 +11022,7 @@
fi
if test "${ac_cv_path_install+set}" = set; then
-@@ -12386,8 +11795,8 @@
+@@ -12370,8 +11779,8 @@
INSTALL=$ac_install_sh
fi
fi
@@ -11129,7 +11033,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -12401,10 +11810,10 @@
+@@ -12385,10 +11794,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11143,7 +11047,7 @@
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -12417,7 +11826,7 @@
+@@ -12401,7 +11810,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
@@ -11152,7 +11056,7 @@
break 2
fi
done
-@@ -12428,11 +11837,11 @@
+@@ -12412,11 +11821,11 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -11168,7 +11072,7 @@
fi
-@@ -12441,10 +11850,10 @@
+@@ -12425,10 +11834,10 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
@@ -11182,7 +11086,7 @@
else
case $PERL in
[\\/]* | ?:[\\/]*)
-@@ -12459,7 +11868,7 @@
+@@ -12443,7 +11852,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -11191,7 +11095,7 @@
break 2
fi
done
-@@ -12471,11 +11880,11 @@
+@@ -12455,11 +11864,11 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -11207,7 +11111,7 @@
fi
-@@ -12483,10 +11892,10 @@
+@@ -12467,10 +11876,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -11221,7 +11125,7 @@
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -12499,7 +11908,7 @@
+@@ -12483,7 +11892,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -11230,7 +11134,7 @@
break 2
fi
done
-@@ -12510,11 +11919,11 @@
+@@ -12494,11 +11903,11 @@
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -11246,7 +11150,7 @@
fi
-@@ -12523,10 +11932,10 @@
+@@ -12507,10 +11916,10 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -11260,7 +11164,7 @@
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -12539,7 +11948,7 @@
+@@ -12523,7 +11932,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
@@ -11269,7 +11173,7 @@
break 2
fi
done
-@@ -12550,11 +11959,11 @@
+@@ -12534,11 +11943,11 @@
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -11285,7 +11189,7 @@
fi
if test "x$ac_ct_AR" = x; then
-@@ -12562,8 +11971,12 @@
+@@ -12546,8 +11955,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11300,7 +11204,7 @@
ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
-@@ -12574,10 +11987,10 @@
+@@ -12558,10 +11971,10 @@
LD=ld
@@ -11314,7 +11218,7 @@
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -12586,17 +11999,17 @@
+@@ -12570,17 +11983,17 @@
ac_cv_prog_gnu_ld=no
fi
fi
@@ -11338,7 +11242,7 @@
if test -n "$ac_cv_gnu_ld_date"; then
if test "$ac_cv_gnu_ld_date" -lt 20030217; then
ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-@@ -12605,21 +12018,21 @@
+@@ -12589,21 +12002,21 @@
ac_cv_gnu_ld_version_script=yes
fi
else
@@ -11372,7 +11276,7 @@
if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
fi
-@@ -12632,16 +12045,16 @@
+@@ -12616,16 +12029,16 @@
if test "x$CC" != xcc; then
@@ -11395,7 +11299,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -12667,21 +12080,19 @@
+@@ -12651,21 +12064,19 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11421,7 +11325,7 @@
(exit $ac_status); };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-@@ -12692,11 +12103,10 @@
+@@ -12676,11 +12087,10 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11435,7 +11339,7 @@
(exit $ac_status); }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
-@@ -12704,21 +12114,19 @@
+@@ -12688,21 +12098,19 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11461,7 +11365,7 @@
(exit $ac_status); };
then
# cc works too.
-@@ -12736,11 +12144,11 @@
+@@ -12720,11 +12128,11 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -11477,7 +11381,7 @@
cat >>confdefs.h <<\_ACEOF
#define NO_MINUS_C_MINUS_O 1
-@@ -12755,10 +12163,10 @@
+@@ -12739,10 +12147,10 @@
fi
@@ -11491,7 +11395,7 @@
else
-@@ -12792,32 +12200,29 @@
+@@ -12776,32 +12184,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11530,7 +11434,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -12833,15 +12238,15 @@
+@@ -12817,15 +12222,15 @@
export LDFLAGS;
fi
@@ -11551,7 +11455,7 @@
else
-@@ -12875,32 +12280,29 @@
+@@ -12859,32 +12264,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11590,7 +11494,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -12916,15 +12318,15 @@
+@@ -12900,15 +12302,15 @@
export LDFLAGS;
fi
@@ -11611,7 +11515,7 @@
else
-@@ -12958,32 +12360,29 @@
+@@ -12942,32 +12344,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11650,7 +11554,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -12999,18 +12398,18 @@
+@@ -12983,18 +12382,18 @@
export LDFLAGS;
fi
@@ -11674,7 +11578,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -13034,21 +12433,20 @@
+@@ -13018,21 +12417,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11699,7 +11603,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_volatile=no
-@@ -13056,8 +12454,8 @@
+@@ -13040,8 +12438,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -11710,7 +11614,7 @@
if test x"$samba_cv_volatile" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -13071,20 +12469,18 @@
+@@ -13055,20 +12453,18 @@
# and don't truncate the values to INT_MAX
# a runtime test is needed here
@@ -11737,7 +11641,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13118,42 +12514,39 @@
+@@ -13102,42 +12498,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11790,7 +11694,7 @@
PIDL_ARGS="$PIDL_ARGS --uint-enums"
fi
-@@ -13162,8 +12555,8 @@
+@@ -13146,8 +12539,8 @@
saved_CFLAGS="$CFLAGS";
c99_init=no
if test x"$c99_init" = x"no"; then
@@ -11801,7 +11705,7 @@
CFLAGS="$saved_CFLAGS";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13188,33 +12581,32 @@
+@@ -13172,33 +12565,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11844,7 +11748,7 @@
CFLAGS="$saved_CFLAGS -AC99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13239,33 +12631,32 @@
+@@ -13223,33 +12615,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11887,7 +11791,7 @@
CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13290,33 +12681,32 @@
+@@ -13274,33 +12665,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11930,7 +11834,7 @@
CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13341,33 +12731,32 @@
+@@ -13325,33 +12715,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11973,7 +11877,7 @@
CFLAGS="$saved_CFLAGS -c99"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13392,26 +12781,25 @@
+@@ -13376,26 +12765,25 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12007,7 +11911,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -13432,41 +12820,41 @@
+@@ -13416,41 +12804,41 @@
else
CFLAGS="$saved_CFLAGS"
saved_CFLAGS=""
@@ -12071,7 +11975,7 @@
case "$host_os" in
*irix6*)
-@@ -13516,8 +12904,8 @@
+@@ -13500,8 +12888,8 @@
#
# CRAY Unicos has broken const handling
*unicos*)
@@ -12082,7 +11986,7 @@
CPPFLAGS="$CPPFLAGS -Dconst="
;;
-@@ -13526,8 +12914,8 @@
+@@ -13510,8 +12898,8 @@
# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
#
*aix4*)
@@ -12093,7 +11997,7 @@
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
cat >>confdefs.h <<\_ACEOF
-@@ -13553,12 +12941,12 @@
+@@ -13537,12 +12925,12 @@
case `uname -r` in
5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
@@ -12110,7 +12014,7 @@
if test "$ac_cv_c_compiler_gnu" = yes; then
${CC-cc} -v >conftest.c 2>&1
ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
-@@ -13655,8 +13043,8 @@
+@@ -13639,8 +13027,8 @@
#
*sysv4*)
if test $host = mips-sni-sysv4 ; then
@@ -12121,7 +12025,7 @@
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
if test "$cross_compiling" = yes; then
-@@ -13684,32 +13072,29 @@
+@@ -13668,32 +13056,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12160,7 +12064,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -13726,16 +13111,37 @@
+@@ -13710,16 +13095,37 @@
LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
LIBS="`getconf LFS64_LIBS` $LIBS"
fi
@@ -12202,7 +12106,7 @@
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
if test "$cross_compiling" = yes; then
-@@ -13791,32 +13197,29 @@
+@@ -13775,32 +13181,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12241,7 +12145,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -13840,8 +13243,8 @@
+@@ -13824,8 +13227,8 @@
_ACEOF
fi
@@ -12252,7 +12156,7 @@
;;
#
-@@ -13860,8 +13263,8 @@
+@@ -13844,8 +13247,8 @@
;;
*hurd*)
@@ -12263,7 +12167,7 @@
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
if test "$cross_compiling" = yes; then
-@@ -13889,32 +13292,29 @@
+@@ -13873,32 +13276,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12302,7 +12206,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -13933,8 +13333,8 @@
+@@ -13917,8 +13317,8 @@
_ACEOF
fi
@@ -12313,7 +12217,7 @@
;;
esac
-@@ -13958,10 +13358,10 @@
+@@ -13942,10 +13342,10 @@
LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
@@ -12327,7 +12231,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -13986,21 +13386,20 @@
+@@ -13970,21 +13370,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12352,7 +12256,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=void
-@@ -14008,18 +13407,18 @@
+@@ -13992,18 +13391,18 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -12376,7 +12280,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -14039,8 +13438,8 @@
+@@ -14023,8 +13422,8 @@
rm -f conftest*
fi
@@ -12387,7 +12291,7 @@
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -14054,46 +13453,11 @@
+@@ -14038,46 +13437,11 @@
fi
@@ -12437,7 +12341,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14101,11 +13465,14 @@
+@@ -14085,11 +13449,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -12454,7 +12358,7 @@
;
return 0;
}
-@@ -14116,39 +13483,30 @@
+@@ -14100,39 +13467,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12502,7 +12406,7 @@
:
else
-@@ -14158,46 +13516,11 @@
+@@ -14142,46 +13500,11 @@
fi
@@ -12552,7 +12456,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14205,11 +13528,14 @@
+@@ -14189,11 +13512,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -12569,7 +12473,7 @@
;
return 0;
}
-@@ -14220,39 +13546,30 @@
+@@ -14204,39 +13530,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12617,7 +12521,7 @@
:
else
-@@ -14262,46 +13579,11 @@
+@@ -14246,46 +13563,11 @@
fi
@@ -12667,7 +12571,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14309,11 +13591,14 @@
+@@ -14293,11 +13575,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -12684,7 +12588,7 @@
;
return 0;
}
-@@ -14324,39 +13609,30 @@
+@@ -14308,39 +13593,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12703,26 +12607,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_size_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_size_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--
+- ac_cv_type_size_t=yes
+ ac_cv_type_size_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
@@ -12732,7 +12636,7 @@
:
else
-@@ -14366,46 +13642,11 @@
+@@ -14350,46 +13626,11 @@
fi
@@ -12782,7 +12686,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14413,11 +13654,14 @@
+@@ -14397,11 +13638,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -12799,7 +12703,7 @@
;
return 0;
}
-@@ -14428,39 +13672,30 @@
+@@ -14412,39 +13656,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12847,7 +12751,7 @@
:
else
-@@ -14470,10 +13705,10 @@
+@@ -14454,10 +13689,10 @@
fi
@@ -12861,7 +12765,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -14498,21 +13733,20 @@
+@@ -14482,21 +13717,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12886,7 +12790,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -14538,21 +13772,20 @@
+@@ -14522,21 +13756,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12911,31 +12815,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_stat_st_rdev=no
-@@ -14563,166 +13796,27 @@
+@@ -14547,9 +13780,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_RDEV 1
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ST_RDEV 1
--_ACEOF
--
--fi
--
--
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
++echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
++if test $ac_cv_member_struct_stat_st_rdev = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_RDEV 1
+@@ -14563,46 +13796,11 @@
+ fi
+
+
-{ $as_echo "$as_me:$LINENO: checking for ino_t" >&5
-$as_echo_n "checking for ino_t... " >&6; }
--if test "${ac_cv_type_ino_t+set}" = set; then
++{ echo "$as_me:$LINENO: checking for ino_t" >&5
++echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_ino_t+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- ac_cv_type_ino_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -12971,40 +12875,44 @@
- 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 ()
--{
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -14610,11 +13808,14 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef ino_t ac__type_new_;
+ int
+ main ()
+ {
-if (sizeof ((ino_t)))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+@@ -14625,39 +13826,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ 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
@@ -13014,32 +12922,39 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++ ac_cv_type_ino_t=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ ac_cv_type_ino_t=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
-$as_echo "$ac_cv_type_ino_t" >&6; }
-if test "x$ac_cv_type_ino_t" = x""yes; then
-- :
--else
--
--cat >>confdefs.h <<_ACEOF
--#define ino_t unsigned
--_ACEOF
--
--fi
--
++{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
++echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
++if test $ac_cv_type_ino_t = yes; then
+ :
+ else
+
+@@ -14667,46 +13859,11 @@
+
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for loff_t" >&5
-$as_echo_n "checking for loff_t... " >&6; }
--if test "${ac_cv_type_loff_t+set}" = set; then
++{ echo "$as_me:$LINENO: checking for loff_t" >&5
++echo $ECHO_N "checking for loff_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_loff_t+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- ac_cv_type_loff_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -13075,35 +12990,14 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
-+if test $ac_cv_member_struct_stat_st_rdev = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_ST_RDEV 1
-+_ACEOF
-+
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking for ino_t" >&5
-+echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
-+if test "${ac_cv_type_ino_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14730,11 +13824,14 @@
+@@ -14714,11 +13871,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+typedef ino_t ac__type_new_;
++typedef loff_t ac__type_new_;
int
main ()
{
@@ -13116,7 +13010,7 @@
;
return 0;
}
-@@ -14745,66 +13842,59 @@
+@@ -14729,39 +13889,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13143,14 +13037,14 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_type_ino_t=yes
++ ac_cv_type_loff_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_cv_type_ino_t=no
++ ac_cv_type_loff_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -13158,99 +13052,63 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
-$as_echo "$ac_cv_type_loff_t" >&6; }
-if test "x$ac_cv_type_loff_t" = x""yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
-+if test $ac_cv_type_ino_t = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
++echo "${ECHO_T}$ac_cv_type_loff_t" >&6; }
++if test $ac_cv_type_loff_t = yes; then
:
else
- cat >>confdefs.h <<_ACEOF
--#define loff_t off_t
-+#define ino_t unsigned
- _ACEOF
+@@ -14771,46 +13922,11 @@
fi
-{ $as_echo "$as_me:$LINENO: checking for offset_t" >&5
-$as_echo_n "checking for offset_t... " >&6; }
--if test "${ac_cv_type_offset_t+set}" = set; then
++{ echo "$as_me:$LINENO: checking for offset_t" >&5
++echo $ECHO_N "checking for offset_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_offset_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+{ echo "$as_me:$LINENO: checking for loff_t" >&5
-+echo $ECHO_N "checking for loff_t... $ECHO_C" >&6; }
-+if test "${ac_cv_type_loff_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_type_offset_t=no
-cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef loff_t ac__type_new_;
- int
- main ()
- {
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
-if (sizeof (offset_t))
- return 0;
-+if ((ac__type_new_ *) 0)
-+ return 0;
-+if (sizeof (ac__type_new_))
-+ return 0;
- ;
- return 0;
- }
-@@ -14815,18 +13905,44 @@
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- ;
+- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+ ac_cv_type_loff_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_type_loff_t=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5
-+echo "${ECHO_T}$ac_cv_type_loff_t" >&6; }
-+if test $ac_cv_type_loff_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for offset_t" >&5
-+echo $ECHO_N "checking for offset_t... $ECHO_C" >&6; }
-+if test "${ac_cv_type_offset_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+- (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
-@@ -14834,11 +13950,14 @@
+@@ -14818,11 +13934,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13267,7 +13125,7 @@
;
return 0;
}
-@@ -14849,39 +13968,30 @@
+@@ -14833,39 +13952,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13315,7 +13173,7 @@
:
else
-@@ -14892,10 +14002,10 @@
+@@ -14876,10 +13986,10 @@
fi
@@ -13329,7 +13187,7 @@
else
if test "$cross_compiling" = yes; then
ac_cv_func_memcmp_working=no
-@@ -14945,39 +14055,36 @@
+@@ -14929,39 +14039,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13377,7 +13235,7 @@
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-@@ -14998,11 +14105,11 @@
+@@ -14982,11 +14089,11 @@
for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp
do
@@ -13393,7 +13251,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -15055,42 +14162,35 @@
+@@ -15039,42 +14146,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13446,7 +13304,7 @@
_ACEOF
fi
-@@ -15102,21 +14202,20 @@
+@@ -15086,21 +14186,20 @@
for ac_header in stdbool.h stdint.h sys/select.h
do
@@ -13477,7 +13335,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15132,33 +14231,32 @@
+@@ -15116,33 +14215,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13518,7 +13376,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15172,52 +14270,51 @@
+@@ -15156,52 +14254,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13592,7 +13450,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -15226,24 +14323,21 @@
+@@ -15210,24 +14307,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13625,7 +13483,7 @@
_ACEOF
fi
-@@ -15253,21 +14347,20 @@
+@@ -15237,21 +14331,20 @@
for ac_header in setjmp.h
do
@@ -13656,7 +13514,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15283,33 +14376,32 @@
+@@ -15267,33 +14360,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13697,7 +13555,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15323,52 +14415,51 @@
+@@ -15307,52 +14399,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13771,7 +13629,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -15377,24 +14468,21 @@
+@@ -15361,24 +14452,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13804,7 +13662,7 @@
_ACEOF
fi
-@@ -15403,17 +14491,17 @@
+@@ -15387,17 +14475,17 @@
if test "${ac_cv_header_stdint_h+set}" = set; then
@@ -13829,7 +13687,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15429,33 +14517,32 @@
+@@ -15413,33 +14501,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13870,7 +13728,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15469,52 +14556,51 @@
+@@ -15453,52 +14540,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13944,7 +13802,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -15523,18 +14609,18 @@
+@@ -15507,18 +14593,18 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13969,7 +13827,7 @@
ac_config_commands="$ac_config_commands rm-stdint.h"
else
-@@ -15546,17 +14632,17 @@
+@@ -15530,17 +14616,17 @@
if test "${ac_cv_header_stdbool_h+set}" = set; then
@@ -13994,7 +13852,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15572,33 +14658,32 @@
+@@ -15556,33 +14642,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14035,7 +13893,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15612,52 +14697,51 @@
+@@ -15596,52 +14681,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14109,7 +13967,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -15666,18 +14750,18 @@
+@@ -15650,18 +14734,18 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14134,7 +13992,7 @@
ac_config_commands="$ac_config_commands rm-stdbool.h"
else
-@@ -15689,52 +14773,11 @@
+@@ -15673,52 +14757,11 @@
@@ -14190,7 +14048,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15748,11 +14791,14 @@
+@@ -15732,11 +14775,14 @@
#endif
@@ -14207,7 +14065,7 @@
;
return 0;
}
-@@ -15763,39 +14809,30 @@
+@@ -15747,39 +14793,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14255,7 +14113,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_BOOL 1
-@@ -15804,52 +14841,11 @@
+@@ -15788,52 +14825,11 @@
fi
@@ -14311,7 +14169,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15863,11 +14859,14 @@
+@@ -15847,11 +14843,14 @@
#endif
@@ -14328,7 +14186,7 @@
;
return 0;
}
-@@ -15878,39 +14877,30 @@
+@@ -15862,39 +14861,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14376,7 +14234,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE__Bool 1
-@@ -15919,10 +14909,10 @@
+@@ -15903,10 +14893,10 @@
fi
@@ -14390,7 +14248,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -15942,39 +14932,36 @@
+@@ -15926,39 +14916,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14438,7 +14296,7 @@
if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -15988,21 +14975,20 @@
+@@ -15972,21 +14959,20 @@
for ac_header in sys/syslog.h syslog.h
do
@@ -14469,7 +14327,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16018,33 +15004,32 @@
+@@ -16002,33 +14988,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14510,7 +14368,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16058,52 +15043,51 @@
+@@ -16042,52 +15027,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14584,7 +14442,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -16112,24 +15096,21 @@
+@@ -16096,24 +15080,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14617,7 +14475,7 @@
_ACEOF
fi
-@@ -16140,21 +15121,20 @@
+@@ -16124,21 +15105,20 @@
for ac_header in sys/time.h time.h
do
@@ -14648,7 +14506,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16170,33 +15150,32 @@
+@@ -16154,33 +15134,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14689,7 +14547,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16210,52 +15189,51 @@
+@@ -16194,52 +15173,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14763,7 +14621,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -16264,24 +15242,21 @@
+@@ -16248,24 +15226,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14796,7 +14654,7 @@
_ACEOF
fi
-@@ -16292,21 +15267,20 @@
+@@ -16276,21 +15251,20 @@
for ac_header in stdarg.h vararg.h
do
@@ -14827,7 +14685,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16322,33 +15296,32 @@
+@@ -16306,33 +15280,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14868,7 +14726,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16362,52 +15335,51 @@
+@@ -16346,52 +15319,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14942,7 +14800,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -16416,24 +15388,21 @@
+@@ -16400,24 +15372,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -14975,7 +14833,7 @@
_ACEOF
fi
-@@ -16444,21 +15413,20 @@
+@@ -16428,21 +15397,20 @@
for ac_header in sys/mount.h mntent.h
do
@@ -15006,7 +14864,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16474,33 +15442,32 @@
+@@ -16458,33 +15426,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15047,7 +14905,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16514,52 +15481,51 @@
+@@ -16498,52 +15465,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15121,7 +14979,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -16568,24 +15534,21 @@
+@@ -16552,24 +15518,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -15154,7 +15012,7 @@
_ACEOF
fi
-@@ -16595,21 +15558,20 @@
+@@ -16579,21 +15542,20 @@
for ac_header in stropts.h
do
@@ -15185,7 +15043,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16625,33 +15587,32 @@
+@@ -16609,33 +15571,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15226,7 +15084,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16665,52 +15626,51 @@
+@@ -16649,52 +15610,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15300,7 +15158,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -16719,24 +15679,21 @@
+@@ -16703,24 +15663,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -15333,7 +15191,7 @@
_ACEOF
fi
-@@ -16753,11 +15710,11 @@
+@@ -16737,11 +15694,11 @@
for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
do
@@ -15349,7 +15207,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -16810,42 +15767,35 @@
+@@ -16794,42 +15751,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15402,7 +15260,7 @@
_ACEOF
fi
-@@ -16859,11 +15809,11 @@
+@@ -16843,11 +15793,11 @@
for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
do
@@ -15418,7 +15276,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -16916,42 +15866,35 @@
+@@ -16900,42 +15850,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15471,7 +15329,7 @@
_ACEOF
fi
-@@ -16965,11 +15908,11 @@
+@@ -16949,11 +15892,11 @@
for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
do
@@ -15487,7 +15345,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17022,42 +15965,35 @@
+@@ -17006,42 +15949,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15540,7 +15398,7 @@
_ACEOF
fi
-@@ -17071,11 +16007,11 @@
+@@ -17055,11 +15991,11 @@
for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp
do
@@ -15556,7 +15414,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17128,42 +16064,35 @@
+@@ -17112,42 +16048,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15609,7 +15467,7 @@
_ACEOF
fi
-@@ -17172,11 +16101,11 @@
+@@ -17156,11 +16085,11 @@
for ac_func in isatty
do
@@ -15625,7 +15483,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17229,52 +16158,45 @@
+@@ -17213,52 +16142,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15691,7 +15549,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -17298,21 +16220,20 @@
+@@ -17282,21 +16204,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15716,7 +15574,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_setresuid_decl=no
-@@ -17320,8 +16241,8 @@
+@@ -17304,8 +16225,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -15727,7 +15585,7 @@
if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -17331,10 +16252,10 @@
+@@ -17315,10 +16236,10 @@
fi
@@ -15741,7 +15599,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -17358,21 +16279,20 @@
+@@ -17342,21 +16263,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15766,7 +15624,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_setresgid_decl=no
-@@ -17380,8 +16300,8 @@
+@@ -17364,8 +16284,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -15777,7 +15635,7 @@
if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -17391,10 +16311,10 @@
+@@ -17375,10 +16295,10 @@
fi
@@ -15791,7 +15649,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -17418,21 +16338,20 @@
+@@ -17402,21 +16322,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15816,7 +15674,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_errno_decl=no
-@@ -17440,8 +16359,8 @@
+@@ -17424,8 +16343,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -15827,7 +15685,7 @@
if test x"$ac_cv_have_errno_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -17451,10 +16370,10 @@
+@@ -17435,10 +16354,10 @@
fi
@@ -15841,7 +15699,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -17487,39 +16406,36 @@
+@@ -17471,39 +16390,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15889,7 +15747,7 @@
if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -17532,21 +16448,20 @@
+@@ -17516,21 +16432,20 @@
for ac_header in stdio.h strings.h
do
@@ -15920,7 +15778,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -17562,33 +16477,32 @@
+@@ -17546,33 +16461,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15961,7 +15819,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -17602,52 +16516,51 @@
+@@ -17586,52 +16500,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16035,7 +15893,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -17656,34 +16569,31 @@
+@@ -17640,34 +16553,31 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -16081,7 +15939,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17709,21 +16619,20 @@
+@@ -17693,21 +16603,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16106,7 +15964,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_snprintf=no
-@@ -17731,9 +16640,9 @@
+@@ -17715,9 +16624,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16119,7 +15977,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_SNPRINTF 1
-@@ -17747,10 +16656,10 @@
+@@ -17731,10 +16640,10 @@
fi
@@ -16133,7 +15991,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17776,21 +16685,20 @@
+@@ -17760,21 +16669,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16158,7 +16016,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_vsnprintf=no
-@@ -17798,9 +16706,9 @@
+@@ -17782,9 +16690,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16171,7 +16029,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_VSNPRINTF 1
-@@ -17814,10 +16722,10 @@
+@@ -17798,10 +16706,10 @@
fi
@@ -16185,7 +16043,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17843,21 +16751,20 @@
+@@ -17827,21 +16735,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16210,7 +16068,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_asprintf=no
-@@ -17865,9 +16772,9 @@
+@@ -17849,9 +16756,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16223,7 +16081,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_ASPRINTF 1
-@@ -17881,10 +16788,10 @@
+@@ -17865,10 +16772,10 @@
fi
@@ -16237,7 +16095,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -17910,21 +16817,20 @@
+@@ -17894,21 +16801,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16262,7 +16120,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_vasprintf=no
-@@ -17932,9 +16838,9 @@
+@@ -17916,9 +16822,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16275,7 +16133,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_VASPRINTF 1
-@@ -17956,11 +16862,11 @@
+@@ -17940,11 +16846,11 @@
for ac_func in snprintf vsnprintf asprintf vasprintf
do
@@ -16291,7 +16149,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -18013,52 +16919,45 @@
+@@ -17997,52 +16903,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16357,7 +16215,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -18110,39 +17009,36 @@
+@@ -18094,39 +16993,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16405,7 +16263,7 @@
if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18152,10 +17048,10 @@
+@@ -18136,10 +17032,10 @@
fi
@@ -16419,7 +16277,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -18180,35 +17076,31 @@
+@@ -18164,35 +17060,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16462,7 +16320,7 @@
if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18218,10 +17110,10 @@
+@@ -18202,10 +17094,10 @@
fi
if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
@@ -16476,7 +16334,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -18246,35 +17138,31 @@
+@@ -18230,35 +17122,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16519,7 +16377,7 @@
if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18284,10 +17172,10 @@
+@@ -18268,10 +17156,10 @@
fi
fi
@@ -16533,7 +16391,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -18311,21 +17199,20 @@
+@@ -18295,21 +17183,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16558,7 +16416,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_HAVE_FUNCTION_MACRO=no
-@@ -18333,8 +17220,8 @@
+@@ -18317,8 +17204,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16569,7 +16427,7 @@
if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18342,10 +17229,10 @@
+@@ -18326,10 +17213,10 @@
_ACEOF
else
@@ -16583,7 +16441,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -18369,21 +17256,20 @@
+@@ -18353,21 +17240,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16608,7 +16466,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_HAVE_func_MACRO=no
-@@ -18391,8 +17277,8 @@
+@@ -18375,8 +17261,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16619,7 +16477,7 @@
if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18406,21 +17292,20 @@
+@@ -18390,21 +17276,20 @@
for ac_header in sys/param.h limits.h
do
@@ -16650,7 +16508,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18436,33 +17321,32 @@
+@@ -18420,33 +17305,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16691,7 +16549,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18476,52 +17360,51 @@
+@@ -18460,52 +17344,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16765,7 +16623,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -18530,24 +17413,21 @@
+@@ -18514,24 +17397,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -16798,7 +16656,7 @@
_ACEOF
fi
-@@ -18555,46 +17435,11 @@
+@@ -18539,46 +17419,11 @@
done
@@ -16848,7 +16706,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18602,11 +17447,14 @@
+@@ -18586,11 +17431,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16865,7 +16723,7 @@
;
return 0;
}
-@@ -18617,39 +17465,30 @@
+@@ -18601,39 +17449,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16884,26 +16742,26 @@
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_comparison_fn_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_comparison_fn_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_comparison_fn_t=yes
+-
+ ac_cv_type_comparison_fn_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_comparison_fn_t" >&5
-$as_echo "$ac_cv_type_comparison_fn_t" >&6; }
-if test "x$ac_cv_type_comparison_fn_t" = x""yes; then
@@ -16913,7 +16771,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_COMPARISON_FN_T 1
-@@ -18659,10 +17498,10 @@
+@@ -18643,10 +17482,10 @@
@@ -16927,7 +16785,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -18686,21 +17525,20 @@
+@@ -18670,21 +17509,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16952,7 +16810,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_setenv_decl=no
-@@ -18708,8 +17546,8 @@
+@@ -18692,8 +17530,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16963,7 +16821,7 @@
if test x"$ac_cv_have_setenv_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -18722,11 +17560,11 @@
+@@ -18706,11 +17544,11 @@
for ac_func in setenv unsetenv
do
@@ -16979,7 +16837,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -18779,42 +17617,35 @@
+@@ -18763,42 +17601,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17032,7 +16890,7 @@
_ACEOF
fi
-@@ -18824,11 +17655,11 @@
+@@ -18808,11 +17639,11 @@
for ac_func in strnlen
do
@@ -17048,7 +16906,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -18881,42 +17712,35 @@
+@@ -18865,42 +17696,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17101,7 +16959,7 @@
_ACEOF
fi
-@@ -18930,11 +17754,11 @@
+@@ -18914,11 +17738,11 @@
for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
do
@@ -17117,7 +16975,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -18987,42 +17811,35 @@
+@@ -18971,42 +17795,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17170,7 +17028,7 @@
_ACEOF
fi
-@@ -19046,14 +17863,13 @@
+@@ -19030,14 +17847,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17187,7 +17045,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -19064,7 +17880,7 @@
+@@ -19048,7 +17864,7 @@
_ACEOF
else
@@ -17196,7 +17054,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19073,10 +17889,10 @@
+@@ -19057,10 +17873,10 @@
rm -f conftest.err conftest.$ac_ext
@@ -17210,7 +17068,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -19106,21 +17922,20 @@
+@@ -19090,21 +17906,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17235,7 +17093,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_sig_atomic_t=no
-@@ -19128,8 +17943,8 @@
+@@ -19112,8 +17927,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -17246,7 +17104,7 @@
if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -19139,10 +17954,10 @@
+@@ -19123,10 +17938,10 @@
fi
@@ -17260,7 +17118,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -19170,21 +17985,20 @@
+@@ -19154,21 +17969,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17285,7 +17143,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_HAVE_OPEN_O_DIRECT=no
-@@ -19192,8 +18006,8 @@
+@@ -19176,8 +17990,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -17296,7 +17154,7 @@
if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -19203,10 +18017,10 @@
+@@ -19187,10 +18001,10 @@
fi
@@ -17310,7 +17168,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -19230,21 +18044,20 @@
+@@ -19214,21 +18028,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17335,7 +17193,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_volatile=no
-@@ -19252,8 +18065,8 @@
+@@ -19236,8 +18049,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -17346,7 +17204,7 @@
if test x"$libreplace_cv_volatile" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -19270,11 +18083,11 @@
+@@ -19254,11 +18067,11 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -17362,7 +17220,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -19300,21 +18113,20 @@
+@@ -19284,21 +18097,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17387,7 +17245,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -19322,15 +18134,12 @@
+@@ -19306,15 +18118,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -17408,7 +17266,7 @@
_ACEOF
ac_header_dirent=$ac_hdr; break
-@@ -19339,10 +18148,10 @@
+@@ -19323,10 +18132,10 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -17422,7 +17280,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -19380,30 +18189,26 @@
+@@ -19364,30 +18173,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17458,7 +17316,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
-@@ -19418,8 +18223,8 @@
+@@ -19402,8 +18207,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -17469,7 +17327,7 @@
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -19427,10 +18232,10 @@
+@@ -19411,10 +18216,10 @@
fi
else
@@ -17483,7 +17341,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -19468,30 +18273,26 @@
+@@ -19452,30 +18257,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17519,7 +17377,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
-@@ -19506,8 +18307,8 @@
+@@ -19490,8 +18291,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -17530,7 +17388,7 @@
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -19526,21 +18327,20 @@
+@@ -19510,21 +18311,20 @@
for ac_header in fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h
do
@@ -17561,7 +17419,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19556,33 +18356,32 @@
+@@ -19540,33 +18340,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17602,7 +17460,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19596,52 +18395,51 @@
+@@ -19580,52 +18379,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17676,7 +17534,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -19650,24 +18448,21 @@
+@@ -19634,24 +18432,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -17709,7 +17567,7 @@
_ACEOF
fi
-@@ -19678,21 +18473,20 @@
+@@ -19662,21 +18457,20 @@
for ac_header in sys/acl.h acl/libacl.h
do
@@ -17740,7 +17598,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19708,33 +18502,32 @@
+@@ -19692,33 +18486,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17781,7 +17639,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19748,52 +18541,51 @@
+@@ -19732,52 +18525,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17855,7 +17713,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -19802,24 +18594,21 @@
+@@ -19786,24 +18578,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -17888,7 +17746,7 @@
_ACEOF
fi
-@@ -19831,21 +18620,20 @@
+@@ -19815,21 +18604,20 @@
for ac_header in sys/select.h
do
@@ -17919,7 +17777,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19861,33 +18649,32 @@
+@@ -19845,33 +18633,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17960,7 +17818,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19901,52 +18688,51 @@
+@@ -19885,52 +18672,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18034,7 +17892,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -19955,24 +18741,21 @@
+@@ -19939,24 +18725,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -18067,7 +17925,7 @@
_ACEOF
fi
-@@ -19985,21 +18768,20 @@
+@@ -19969,21 +18752,20 @@
for ac_header in sys/time.h utime.h
do
@@ -18098,7 +17956,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20015,33 +18797,32 @@
+@@ -19999,33 +18781,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18139,7 +17997,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20055,52 +18836,51 @@
+@@ -20039,52 +18820,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18213,7 +18071,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -20109,34 +18889,31 @@
+@@ -20093,34 +18873,31 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -18259,7 +18117,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -20163,21 +18940,20 @@
+@@ -20147,21 +18924,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18284,7 +18142,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_time=no
-@@ -20185,8 +18961,8 @@
+@@ -20169,8 +18945,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18295,7 +18153,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20199,11 +18975,11 @@
+@@ -20183,11 +18959,11 @@
for ac_func in utime utimes
do
@@ -18311,7 +18169,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -20256,42 +19032,35 @@
+@@ -20240,42 +19016,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18364,7 +18222,7 @@
_ACEOF
fi
-@@ -20299,10 +19068,10 @@
+@@ -20283,10 +19052,10 @@
# wait
@@ -18378,7 +18236,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -20335,21 +19104,20 @@
+@@ -20319,21 +19088,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18403,7 +18261,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_sys_wait_h=no
-@@ -20357,8 +19125,8 @@
+@@ -20341,8 +19109,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18414,7 +18272,7 @@
if test $ac_cv_header_sys_wait_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20372,21 +19140,20 @@
+@@ -20356,21 +19124,20 @@
for ac_header in sys/capability.h
do
@@ -18445,7 +18303,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20402,33 +19169,32 @@
+@@ -20386,33 +19153,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18486,7 +18344,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20442,52 +19208,51 @@
+@@ -20426,52 +19192,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18560,7 +18418,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -20496,24 +19261,21 @@
+@@ -20480,24 +19245,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -18593,7 +18451,7 @@
_ACEOF
fi
-@@ -20523,10 +19285,10 @@
+@@ -20507,10 +19269,10 @@
case "$host_os" in
*linux*)
@@ -18607,7 +18465,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -20559,21 +19321,20 @@
+@@ -20543,21 +19305,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18632,7 +18490,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
-@@ -20582,8 +19343,8 @@
+@@ -20566,8 +19327,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18643,7 +18501,7 @@
if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -20592,10 +19353,10 @@
+@@ -20576,10 +19337,10 @@
fi
@@ -18657,7 +18515,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -20626,21 +19387,20 @@
+@@ -20610,21 +19371,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18682,7 +18540,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes
-@@ -20649,8 +19409,8 @@
+@@ -20633,8 +19393,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18693,7 +18551,7 @@
if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -20671,21 +19431,20 @@
+@@ -20655,21 +19415,20 @@
for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h
do
@@ -18724,7 +18582,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20701,33 +19460,32 @@
+@@ -20685,33 +19444,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18765,7 +18623,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20741,52 +19499,51 @@
+@@ -20725,52 +19483,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18839,7 +18697,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -20795,24 +19552,21 @@
+@@ -20779,24 +19536,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -18872,7 +18730,7 @@
_ACEOF
fi
-@@ -20824,11 +19578,11 @@
+@@ -20808,11 +19562,11 @@
for ac_func in getpwnam_r getpwuid_r getpwent_r
do
@@ -18888,7 +18746,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -20881,52 +19635,45 @@
+@@ -20865,52 +19619,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18954,7 +18812,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -20953,21 +19700,20 @@
+@@ -20937,21 +19684,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18979,7 +18837,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_getpwent_r_decl=no
-@@ -20975,8 +19721,8 @@
+@@ -20959,8 +19705,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -18990,7 +18848,7 @@
if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -20985,10 +19731,10 @@
+@@ -20969,10 +19715,10 @@
fi
@@ -19004,7 +18862,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21019,14 +19765,13 @@
+@@ -21003,14 +19749,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19021,7 +18879,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -21035,7 +19780,7 @@
+@@ -21019,7 +19764,7 @@
ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
else
@@ -19030,7 +18888,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21046,8 +19791,8 @@
+@@ -21030,8 +19775,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -19041,7 +18899,7 @@
if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then
-@@ -21059,10 +19804,10 @@
+@@ -21043,10 +19788,10 @@
fi
@@ -19055,7 +18913,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21093,14 +19838,13 @@
+@@ -21077,14 +19822,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19072,7 +18930,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -21109,7 +19853,7 @@
+@@ -21093,7 +19837,7 @@
ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=yes
else
@@ -19081,7 +18939,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21120,8 +19864,8 @@
+@@ -21104,8 +19848,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -19092,7 +18950,7 @@
if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then
-@@ -21138,11 +19882,11 @@
+@@ -21122,11 +19866,11 @@
for ac_func in getgrnam_r getgrgid_r getgrent_r
do
@@ -19108,7 +18966,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21195,52 +19939,45 @@
+@@ -21179,52 +19923,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19174,7 +19032,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21267,21 +20004,20 @@
+@@ -21251,21 +19988,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19199,7 +19057,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_getgrent_r_decl=no
-@@ -21289,8 +20025,8 @@
+@@ -21273,8 +20009,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -19210,7 +19068,7 @@
if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -21299,10 +20035,10 @@
+@@ -21283,10 +20019,10 @@
fi
@@ -19224,7 +19082,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21333,14 +20069,13 @@
+@@ -21317,14 +20053,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19241,7 +19099,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -21349,7 +20084,7 @@
+@@ -21333,7 +20068,7 @@
ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
else
@@ -19250,7 +19108,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21360,8 +20095,8 @@
+@@ -21344,8 +20079,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -19261,7 +19119,7 @@
if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then
-@@ -21374,10 +20109,10 @@
+@@ -21358,10 +20093,10 @@
@@ -19275,7 +19133,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -21408,14 +20143,13 @@
+@@ -21392,14 +20127,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19292,7 +19150,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -21424,7 +20158,7 @@
+@@ -21408,7 +20142,7 @@
ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=yes
else
@@ -19301,7 +19159,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21435,8 +20169,8 @@
+@@ -21419,8 +20153,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -19312,7 +19170,7 @@
if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then
-@@ -21454,21 +20188,20 @@
+@@ -21438,21 +20172,20 @@
for ac_header in ctype.h locale.h
do
@@ -19343,7 +19201,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21484,33 +20217,32 @@
+@@ -21468,33 +20201,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19384,7 +19242,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21524,52 +20256,51 @@
+@@ -21508,52 +20240,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19458,7 +19316,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -21578,24 +20309,21 @@
+@@ -21562,24 +20293,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -19491,7 +19349,7 @@
_ACEOF
fi
-@@ -21607,21 +20335,20 @@
+@@ -21591,21 +20319,20 @@
for ac_header in fnmatch.h
do
@@ -19522,7 +19380,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21637,33 +20364,32 @@
+@@ -21621,33 +20348,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19563,7 +19421,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21677,52 +20403,51 @@
+@@ -21661,52 +20387,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19637,7 +19495,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -21731,24 +20456,21 @@
+@@ -21715,24 +20440,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -19670,7 +19528,7 @@
_ACEOF
fi
-@@ -21762,21 +20484,20 @@
+@@ -21746,21 +20468,20 @@
for ac_header in sys/ipc.h sys/mman.h sys/shm.h
do
@@ -19701,7 +19559,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21792,33 +20513,32 @@
+@@ -21776,33 +20497,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19742,7 +19600,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21832,52 +20552,51 @@
+@@ -21816,52 +20536,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19816,7 +19674,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -21886,24 +20605,21 @@
+@@ -21870,24 +20589,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -19849,7 +19707,7 @@
_ACEOF
fi
-@@ -21917,21 +20633,20 @@
+@@ -21901,21 +20617,20 @@
for ac_header in termios.h termio.h sys/termio.h
do
@@ -19880,7 +19738,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21947,33 +20662,32 @@
+@@ -21931,33 +20646,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19921,7 +19779,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21987,52 +20701,51 @@
+@@ -21971,52 +20685,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19995,7 +19853,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -22041,24 +20754,21 @@
+@@ -22025,24 +20738,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -20028,7 +19886,7 @@
_ACEOF
fi
-@@ -22071,10 +20781,10 @@
+@@ -22055,10 +20765,10 @@
LIBS=""
libreplace_cv_dlfcn=no
@@ -20042,7 +19900,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -22112,30 +20822,26 @@
+@@ -22096,30 +20806,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20078,7 +19936,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_dlopen+set}" = set; then
-@@ -22150,8 +20856,8 @@
+@@ -22134,8 +20840,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -20089,7 +19947,7 @@
ac_res=$ac_cv_search_dlopen
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -22162,21 +20868,20 @@
+@@ -22146,21 +20852,20 @@
for ac_header in dlfcn.h
do
@@ -20120,7 +19978,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22192,33 +20897,32 @@
+@@ -22176,33 +20881,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20161,7 +20019,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22232,52 +20936,51 @@
+@@ -22216,52 +20920,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20235,7 +20093,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -22286,24 +20989,21 @@
+@@ -22270,24 +20973,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -20268,7 +20126,7 @@
_ACEOF
fi
-@@ -22316,11 +21016,11 @@
+@@ -22300,11 +21000,11 @@
for ac_func in dlopen dlsym dlerror dlclose
do
@@ -20284,7 +20142,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22373,42 +21073,35 @@
+@@ -22357,42 +21057,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20337,7 +20195,7 @@
_ACEOF
else
-@@ -22418,10 +21111,10 @@
+@@ -22402,10 +21095,10 @@
libreplace_cv_shl=no
@@ -20351,7 +20209,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -22459,30 +21152,26 @@
+@@ -22443,30 +21136,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20387,7 +20245,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_shl_load+set}" = set; then
-@@ -22497,8 +21186,8 @@
+@@ -22481,8 +21170,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -20398,7 +20256,7 @@
ac_res=$ac_cv_search_shl_load
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -22508,21 +21197,20 @@
+@@ -22492,21 +21181,20 @@
for ac_header in dl.h
do
@@ -20429,7 +20287,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22538,33 +21226,32 @@
+@@ -22522,33 +21210,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20470,7 +20328,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22578,52 +21265,51 @@
+@@ -22562,52 +21249,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20544,7 +20402,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -22632,24 +21318,21 @@
+@@ -22616,24 +21302,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -20577,7 +20435,7 @@
_ACEOF
fi
-@@ -22661,11 +21344,11 @@
+@@ -22645,11 +21328,11 @@
for ac_func in shl_load shl_unload shl_findsym
do
@@ -20593,7 +20451,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22718,42 +21401,35 @@
+@@ -22702,42 +21385,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20646,7 +20504,7 @@
_ACEOF
else
-@@ -22762,10 +21438,10 @@
+@@ -22746,10 +21422,10 @@
done
@@ -20660,7 +20518,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22792,14 +21468,13 @@
+@@ -22776,14 +21452,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20677,7 +20535,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -22808,7 +21483,7 @@
+@@ -22792,7 +21467,7 @@
ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
else
@@ -20686,7 +20544,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22819,8 +21494,8 @@
+@@ -22803,8 +21478,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -20697,7 +20555,7 @@
if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then
-@@ -22841,10 +21516,10 @@
+@@ -22825,10 +21500,10 @@
LIBS="$save_LIBS"
@@ -20711,7 +20569,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22897,43 +21572,39 @@
+@@ -22881,43 +21556,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20766,7 +20624,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22986,36 +21657,32 @@
+@@ -22970,36 +21641,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20811,7 +20669,7 @@
libreplace_cv_HAVE_GETPASSPHRASE=yes
fi
-@@ -23033,10 +21700,10 @@
+@@ -23017,10 +21684,10 @@
LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
else
@@ -20825,7 +20683,7 @@
else
SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -23066,21 +21733,20 @@
+@@ -23050,21 +21717,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20850,7 +20708,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_REPLACE_GETPASS=no
-@@ -23090,8 +21756,8 @@
+@@ -23074,8 +21740,8 @@
CPPFLAGS="$SAVE_CPPFLAGS"
fi
@@ -20861,7 +20719,7 @@
if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -23103,10 +21769,10 @@
+@@ -23087,10 +21753,10 @@
fi
@@ -20875,7 +20733,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -23129,40 +21795,37 @@
+@@ -23113,40 +21779,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20924,7 +20782,7 @@
if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -23178,21 +21841,20 @@
+@@ -23162,21 +21825,20 @@
for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
do
@@ -20955,7 +20813,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23208,33 +21870,32 @@
+@@ -23192,33 +21854,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20996,7 +20854,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23248,52 +21909,51 @@
+@@ -23232,52 +21893,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21070,7 +20928,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -23302,24 +21962,21 @@
+@@ -23286,24 +21946,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -21103,7 +20961,7 @@
_ACEOF
fi
-@@ -23329,10 +21986,10 @@
+@@ -23313,10 +21970,10 @@
#######################################
# Check for mkdir mode
@@ -21117,7 +20975,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23362,21 +22019,20 @@
+@@ -23346,21 +22003,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21142,7 +21000,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_mkdir_has_mode="no"
-@@ -23384,8 +22040,8 @@
+@@ -23368,8 +22024,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -21153,7 +21011,7 @@
if test "$libreplace_cv_mkdir_has_mode" = "yes"
then
-@@ -23399,11 +22055,11 @@
+@@ -23383,11 +22039,11 @@
for ac_func in timegm
do
@@ -21169,7 +21027,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23456,42 +22112,35 @@
+@@ -23440,42 +22096,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21222,7 +21080,7 @@
_ACEOF
else
-@@ -23500,10 +22149,10 @@
+@@ -23484,10 +22133,10 @@
done
@@ -21236,7 +21094,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -23525,40 +22174,37 @@
+@@ -23509,40 +22158,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21285,7 +21143,7 @@
#
# try to replace with getdirentries() if needed
-@@ -23567,11 +22213,11 @@
+@@ -23551,11 +22197,11 @@
for ac_func in getdirentries
do
@@ -21301,7 +21159,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23624,51 +22270,44 @@
+@@ -23608,51 +22254,44 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21366,7 +21224,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23695,14 +22334,13 @@
+@@ -23679,14 +22318,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21383,7 +21241,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -23711,7 +22349,7 @@
+@@ -23695,7 +22333,7 @@
ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
else
@@ -21392,7 +21250,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23722,8 +22360,8 @@
+@@ -23706,8 +22344,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -21403,7 +21261,7 @@
if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then
-@@ -23736,10 +22374,10 @@
+@@ -23720,10 +22358,10 @@
@@ -21417,7 +21275,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23766,14 +22404,13 @@
+@@ -23750,14 +22388,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21434,7 +21292,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -23782,7 +22419,7 @@
+@@ -23766,7 +22403,7 @@
ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
else
@@ -21443,7 +21301,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23793,8 +22430,8 @@
+@@ -23777,8 +22414,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -21454,7 +21312,7 @@
if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then
-@@ -23806,20 +22443,18 @@
+@@ -23790,20 +22427,18 @@
fi
@@ -21481,7 +21339,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23839,40 +22474,37 @@
+@@ -23823,40 +22458,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21530,7 +21388,7 @@
fi
if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
-@@ -23896,11 +22528,11 @@
+@@ -23880,11 +22512,11 @@
for ac_func in getdents
do
@@ -21546,7 +21404,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23953,61 +22585,52 @@
+@@ -23937,61 +22569,52 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21624,7 +21482,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24028,40 +22651,37 @@
+@@ -24012,40 +22635,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21673,7 +21531,7 @@
fi
if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
-@@ -24078,16 +22698,16 @@
+@@ -24062,16 +22682,16 @@
libreplace_cv_READDIR_NEEDED=no
fi
@@ -21698,7 +21556,7 @@
fi
-@@ -24097,11 +22717,11 @@
+@@ -24081,11 +22701,11 @@
for ac_func in syslog printf memset memcpy
do
@@ -21714,7 +21572,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24154,47 +22774,40 @@
+@@ -24138,47 +22758,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21774,7 +21632,7 @@
{ (exit 1); exit 1; }; }
fi
done
-@@ -24219,21 +22832,20 @@
+@@ -24203,21 +22816,20 @@
for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
do
@@ -21805,7 +21663,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24249,33 +22861,32 @@
+@@ -24233,33 +22845,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21846,7 +21704,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24289,52 +22900,51 @@
+@@ -24273,52 +22884,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21920,7 +21778,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -24343,24 +22953,21 @@
+@@ -24327,24 +22937,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -21953,9 +21811,9 @@
_ACEOF
fi
-@@ -24373,21 +22980,20 @@
+@@ -24354,21 +22961,20 @@
- for ac_header in netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h
+ for ac_header in netinet/in_systm.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -21984,7 +21842,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24403,33 +23009,32 @@
+@@ -24384,33 +22990,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22025,7 +21883,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24443,52 +23048,51 @@
+@@ -24424,52 +23029,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22099,7 +21957,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -24497,24 +23101,21 @@
+@@ -24478,24 +23082,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -22132,8 +21990,249 @@
_ACEOF
fi
-@@ -24525,21 +23126,20 @@
+@@ -24505,11 +23106,11 @@
+ for ac_header in netinet/ip.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24532,21 +23133,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+@@ -24554,15 +23154,12 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -24573,21 +23170,20 @@
+
+ for ac_header in netinet/tcp.h netinet/in_ip.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24603,33 +23199,32 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24643,52 +23238,51 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to samba-technical at samba.org ##
+@@ -24697,24 +23291,21 @@
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -24725,21 +23316,20 @@
+
for ac_header in sys/sockio.h sys/un.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -22163,7 +22262,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24555,33 +23155,32 @@
+@@ -24755,33 +23345,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22204,7 +22303,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24595,52 +23194,51 @@
+@@ -24795,52 +23384,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22278,7 +22377,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -24649,24 +23247,21 @@
+@@ -24849,24 +23437,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -22311,7 +22410,7 @@
_ACEOF
fi
-@@ -24674,10 +23269,10 @@
+@@ -24874,10 +23459,10 @@
done
@@ -22325,7 +22424,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -24700,21 +23295,20 @@
+@@ -24900,21 +23485,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22350,7 +22449,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_USABLE_NET_IF_H=no
-@@ -24724,8 +23318,8 @@
+@@ -24924,8 +23508,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -22361,7 +22460,7 @@
if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
cat >>confdefs.h <<\_ACEOF
-@@ -24737,10 +23331,10 @@
+@@ -24937,10 +23521,10 @@
cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
@@ -22375,7 +22474,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24765,21 +23359,20 @@
+@@ -24965,21 +23549,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22400,7 +22499,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -24788,51 +23381,16 @@
+@@ -24988,51 +23571,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -22457,7 +22556,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24840,11 +23398,14 @@
+@@ -25040,11 +23588,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22474,7 +22573,7 @@
;
return 0;
}
-@@ -24855,39 +23416,30 @@
+@@ -25055,39 +23606,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22522,7 +22621,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_SOCKLEN_T 1
-@@ -24907,10 +23459,10 @@
+@@ -25107,10 +23649,10 @@
cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
@@ -22536,7 +22635,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24935,21 +23487,20 @@
+@@ -25135,21 +23677,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22561,7 +22660,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -24958,51 +23509,16 @@
+@@ -25158,51 +23699,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -22618,7 +22717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25010,11 +23526,14 @@
+@@ -25210,11 +23716,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22635,7 +22734,7 @@
;
return 0;
}
-@@ -25025,39 +23544,30 @@
+@@ -25225,39 +23734,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22683,7 +22782,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_SA_FAMILY_T 1
-@@ -25077,10 +23587,10 @@
+@@ -25277,10 +23777,10 @@
cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
@@ -22697,7 +22796,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25105,21 +23615,20 @@
+@@ -25305,21 +23805,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22722,7 +22821,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -25128,51 +23637,16 @@
+@@ -25328,51 +23827,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -22779,7 +22878,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25180,11 +23654,14 @@
+@@ -25380,11 +23844,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22796,7 +22895,7 @@
;
return 0;
}
-@@ -25195,39 +23672,30 @@
+@@ -25395,39 +23862,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22844,7 +22943,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_ADDRINFO 1
-@@ -25247,10 +23715,10 @@
+@@ -25447,10 +23905,10 @@
cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
@@ -22858,7 +22957,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25275,21 +23743,20 @@
+@@ -25475,21 +23933,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22883,7 +22982,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -25298,51 +23765,16 @@
+@@ -25498,51 +23955,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -22940,7 +23039,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25350,11 +23782,14 @@
+@@ -25550,11 +23972,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22957,7 +23056,7 @@
;
return 0;
}
-@@ -25365,39 +23800,30 @@
+@@ -25565,39 +23990,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22976,26 +23075,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_struct_sockaddr=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_struct_sockaddr=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--
+- ac_cv_type_struct_sockaddr=yes
+ ac_cv_type_struct_sockaddr=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr" >&5
-$as_echo "$ac_cv_type_struct_sockaddr" >&6; }
-if test "x$ac_cv_type_struct_sockaddr" = x""yes; then
@@ -23005,7 +23104,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SOCKADDR 1
-@@ -25417,10 +23843,10 @@
+@@ -25617,10 +24033,10 @@
cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
@@ -23019,7 +23118,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25449,21 +23875,20 @@
+@@ -25649,21 +24065,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23044,7 +23143,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -25472,51 +23897,16 @@
+@@ -25672,51 +24087,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -23101,7 +23200,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25524,11 +23914,14 @@
+@@ -25724,11 +24104,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -23118,7 +23217,7 @@
;
return 0;
}
-@@ -25539,39 +23932,30 @@
+@@ -25739,39 +24122,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23166,7 +23265,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-@@ -25591,10 +23975,10 @@
+@@ -25791,10 +24165,10 @@
cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
@@ -23180,7 +23279,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25623,21 +24007,20 @@
+@@ -25823,21 +24197,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23205,7 +23304,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "ac_cv_type_$cv=no"
-@@ -25646,51 +24029,16 @@
+@@ -25846,51 +24219,16 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_foo=`eval echo \\$ac_cv_type_$cv`
@@ -23262,7 +23361,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25698,11 +24046,14 @@
+@@ -25898,11 +24236,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -23279,7 +23378,7 @@
;
return 0;
}
-@@ -25713,39 +24064,30 @@
+@@ -25913,39 +24254,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23298,26 +23397,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_struct_sockaddr_in6=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_struct_sockaddr_in6=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_struct_sockaddr_in6=yes
+-
+ ac_cv_type_struct_sockaddr_in6=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
-$as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
-if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
@@ -23327,7 +23426,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SOCKADDR_IN6 1
-@@ -25764,10 +24106,10 @@
+@@ -25964,10 +24296,10 @@
if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
@@ -23341,7 +23440,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25797,21 +24139,20 @@
+@@ -25997,21 +24329,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23366,7 +23465,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -25842,21 +24183,20 @@
+@@ -26042,21 +24373,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23391,7 +23490,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_sockaddr_storage_ss_family=no
-@@ -25867,9 +24207,9 @@
+@@ -26067,9 +24397,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23404,7 +23503,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_SS_FAMILY 1
-@@ -25879,10 +24219,10 @@
+@@ -26079,10 +24409,10 @@
if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
@@ -23418,7 +23517,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25912,21 +24252,20 @@
+@@ -26112,21 +24442,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23443,7 +23542,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -25957,21 +24296,20 @@
+@@ -26157,21 +24486,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23468,7 +23567,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_sockaddr_storage___ss_family=no
-@@ -25982,9 +24320,9 @@
+@@ -26182,9 +24510,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23481,7 +23580,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE___SS_FAMILY 1
-@@ -25995,10 +24333,10 @@
+@@ -26195,10 +24523,10 @@
fi
fi
@@ -23495,7 +23594,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26028,14 +24366,13 @@
+@@ -26228,14 +24556,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23512,7 +23611,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -26044,7 +24381,7 @@
+@@ -26244,7 +24571,7 @@
libreplace_cv_HAVE_SOCK_SIN_LEN=yes
else
@@ -23521,7 +23620,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -26055,8 +24392,8 @@
+@@ -26255,8 +24582,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23532,7 +23631,7 @@
if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -26067,10 +24404,10 @@
+@@ -26267,10 +24594,10 @@
############################################
# check for unix domain sockets
@@ -23546,7 +23645,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26103,14 +24440,13 @@
+@@ -26303,14 +24630,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23563,7 +23662,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -26119,7 +24455,7 @@
+@@ -26319,7 +24645,7 @@
libreplace_cv_HAVE_UNIXSOCKET=yes
else
@@ -23572,7 +23671,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -26130,8 +24466,8 @@
+@@ -26330,8 +24656,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23583,7 +23682,7 @@
if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -26143,11 +24479,11 @@
+@@ -26343,11 +24669,11 @@
for ac_func in connect
do
@@ -23599,7 +23698,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26200,42 +24536,35 @@
+@@ -26400,42 +24726,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23652,7 +23751,7 @@
_ACEOF
fi
-@@ -26251,10 +24580,10 @@
+@@ -26451,10 +24770,10 @@
@@ -23666,7 +23765,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26284,38 +24613,34 @@
+@@ -26484,38 +24803,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23712,7 +23811,7 @@
if test $ac_cv_lib_ext_nsl_s_connect = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_CONNECT 1
-@@ -26350,10 +24675,10 @@
+@@ -26550,10 +24865,10 @@
@@ -23726,7 +23825,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26383,38 +24708,34 @@
+@@ -26583,38 +24898,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23772,7 +23871,7 @@
if test $ac_cv_lib_ext_nsl_connect = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_CONNECT 1
-@@ -26449,10 +24770,10 @@
+@@ -26649,10 +24960,10 @@
@@ -23786,7 +23885,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26482,38 +24803,34 @@
+@@ -26682,38 +24993,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23832,7 +23931,7 @@
if test $ac_cv_lib_ext_socket_connect = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_CONNECT 1
-@@ -26548,10 +24865,10 @@
+@@ -26748,10 +25055,10 @@
@@ -23846,7 +23945,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26581,38 +24898,34 @@
+@@ -26781,38 +25088,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23892,7 +23991,7 @@
if test $ac_cv_lib_ext_inet_connect = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_CONNECT 1
-@@ -26654,11 +24967,11 @@
+@@ -26854,11 +25157,11 @@
for ac_func in gethostbyname
do
@@ -23908,7 +24007,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26711,42 +25024,35 @@
+@@ -26911,42 +25214,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23961,7 +24060,7 @@
_ACEOF
fi
-@@ -26762,10 +25068,10 @@
+@@ -26962,10 +25258,10 @@
@@ -23975,7 +24074,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26795,38 +25101,34 @@
+@@ -26995,38 +25291,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24021,7 +24120,7 @@
if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GETHOSTBYNAME 1
-@@ -26861,10 +25163,10 @@
+@@ -27061,10 +25353,10 @@
@@ -24035,7 +24134,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26894,38 +25196,34 @@
+@@ -27094,38 +25386,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24081,7 +24180,7 @@
if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GETHOSTBYNAME 1
-@@ -26960,10 +25258,10 @@
+@@ -27160,10 +25448,10 @@
@@ -24095,7 +24194,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26993,38 +25291,34 @@
+@@ -27193,38 +25481,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24141,7 +24240,7 @@
if test $ac_cv_lib_ext_socket_gethostbyname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GETHOSTBYNAME 1
-@@ -27065,11 +25359,11 @@
+@@ -27265,11 +25549,11 @@
for ac_func in if_nametoindex
do
@@ -24157,7 +24256,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27122,42 +25416,35 @@
+@@ -27322,42 +25606,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24210,7 +24309,7 @@
_ACEOF
fi
-@@ -27173,10 +25460,10 @@
+@@ -27373,10 +25650,10 @@
@@ -24224,7 +24323,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27206,38 +25493,34 @@
+@@ -27406,38 +25683,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24270,7 +24369,7 @@
if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_IF_NAMETOINDEX 1
-@@ -27282,11 +25565,11 @@
+@@ -27482,11 +25755,11 @@
for ac_func in socketpair
do
@@ -24286,7 +24385,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27339,42 +25622,35 @@
+@@ -27539,42 +25812,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24339,7 +24438,7 @@
_ACEOF
else
-@@ -27383,10 +25659,10 @@
+@@ -27583,10 +25849,10 @@
done
@@ -24353,7 +24452,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -27417,48 +25693,45 @@
+@@ -27617,48 +25883,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24414,7 +24513,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27511,42 +25784,35 @@
+@@ -27711,42 +25974,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24467,7 +24566,7 @@
_ACEOF
else
-@@ -27566,11 +25832,11 @@
+@@ -27766,11 +26022,11 @@
for ac_func in inet_aton
do
@@ -24483,7 +24582,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27623,42 +25889,35 @@
+@@ -27823,42 +26079,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24536,7 +24635,7 @@
_ACEOF
else
-@@ -27670,11 +25929,11 @@
+@@ -27870,11 +26119,11 @@
for ac_func in inet_ntop
do
@@ -24552,7 +24651,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27727,42 +25986,35 @@
+@@ -27927,42 +26176,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24605,7 +24704,7 @@
_ACEOF
else
-@@ -27774,11 +26026,11 @@
+@@ -27974,11 +26216,11 @@
for ac_func in inet_pton
do
@@ -24621,7 +24720,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27831,42 +26083,35 @@
+@@ -28031,42 +26273,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24674,7 +24773,7 @@
_ACEOF
else
-@@ -27875,10 +26120,10 @@
+@@ -28075,10 +26310,10 @@
done
@@ -24688,7 +24787,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27921,35 +26166,31 @@
+@@ -28121,35 +26356,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24731,7 +24830,7 @@
if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -27978,21 +26219,20 @@
+@@ -28178,21 +26409,20 @@
for ac_header in ifaddrs.h
do
@@ -24762,7 +24861,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28008,33 +26248,32 @@
+@@ -28208,33 +26438,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24803,7 +24902,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28048,52 +26287,51 @@
+@@ -28248,52 +26477,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24877,7 +24976,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -28102,24 +26340,21 @@
+@@ -28302,24 +26530,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -24910,7 +25009,7 @@
_ACEOF
fi
-@@ -28127,10 +26362,10 @@
+@@ -28327,10 +26552,10 @@
done
@@ -24924,7 +25023,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28156,21 +26391,20 @@
+@@ -28356,21 +26581,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24949,7 +25048,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -28197,21 +26431,20 @@
+@@ -28397,21 +26621,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24974,7 +25073,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_sockaddr_sa_len=no
-@@ -28222,9 +26455,9 @@
+@@ -28422,9 +26645,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -24987,7 +25086,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-@@ -28238,10 +26471,10 @@
+@@ -28438,10 +26661,10 @@
fi
@@ -25001,7 +25100,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28279,21 +26512,20 @@
+@@ -28479,21 +26702,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25026,7 +25125,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
libreplace_cv_HAVE_GETIFADDRS=no
-@@ -28301,8 +26533,8 @@
+@@ -28501,8 +26723,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -25037,7 +25136,7 @@
if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -28324,10 +26556,10 @@
+@@ -28524,10 +26746,10 @@
##################
# look for a method of finding the list of network interfaces
iface=no;
@@ -25051,7 +25150,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -28357,39 +26589,36 @@
+@@ -28557,39 +26779,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25099,7 +25198,7 @@
if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
iface=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -28402,10 +26631,10 @@
+@@ -28602,10 +26821,10 @@
if test $iface = no; then
@@ -25113,7 +25212,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -28436,39 +26665,36 @@
+@@ -28636,39 +26855,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25161,7 +25260,7 @@
if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
iface=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -28480,10 +26706,10 @@
+@@ -28680,10 +26896,10 @@
if test $iface = no; then
@@ -25175,7 +25274,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -28513,39 +26739,36 @@
+@@ -28713,39 +26929,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25223,7 +25322,7 @@
if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
iface=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -28556,10 +26779,10 @@
+@@ -28756,10 +26969,10 @@
fi
if test $iface = no; then
@@ -25237,7 +25336,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -28589,39 +26812,36 @@
+@@ -28789,39 +27002,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25285,7 +25384,7 @@
if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
iface=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -28631,10 +26851,10 @@
+@@ -28831,10 +27041,10 @@
fi
fi
@@ -25299,7 +25398,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28674,26 +26894,23 @@
+@@ -28875,26 +27085,23 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25331,7 +25430,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -28701,13 +26918,12 @@
+@@ -28902,13 +27109,12 @@
fi
@@ -25347,7 +25446,7 @@
if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -28746,21 +26962,20 @@
+@@ -28947,21 +27153,20 @@
for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
do
@@ -25378,7 +25477,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28776,33 +26991,32 @@
+@@ -28977,33 +27182,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25419,7 +25518,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28816,52 +27030,51 @@
+@@ -29017,52 +27221,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25493,7 +25592,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -28870,24 +27083,21 @@
+@@ -29071,24 +27274,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -25526,7 +25625,7 @@
_ACEOF
fi
-@@ -28902,21 +27112,20 @@
+@@ -29103,21 +27303,20 @@
for ac_header in unistd.h utime.h grp.h sys/id.h memory.h alloca.h
do
@@ -25557,7 +25656,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28932,33 +27141,32 @@
+@@ -29133,33 +27332,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25598,7 +25697,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28972,52 +27180,51 @@
+@@ -29173,52 +27371,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25672,7 +25771,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29026,24 +27233,21 @@
+@@ -29227,24 +27424,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -25705,7 +25804,7 @@
_ACEOF
fi
-@@ -29056,21 +27260,20 @@
+@@ -29257,21 +27451,20 @@
for ac_header in limits.h float.h pthread.h libintl.h
do
@@ -25736,7 +25835,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29086,33 +27289,32 @@
+@@ -29287,33 +27480,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25777,7 +25876,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29126,52 +27328,51 @@
+@@ -29327,52 +27519,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25851,7 +25950,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29180,24 +27381,21 @@
+@@ -29381,24 +27572,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -25884,7 +25983,7 @@
_ACEOF
fi
-@@ -29209,21 +27407,20 @@
+@@ -29410,21 +27598,20 @@
for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
do
@@ -25915,7 +26014,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29239,33 +27436,32 @@
+@@ -29440,33 +27627,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25956,7 +26055,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29279,52 +27475,51 @@
+@@ -29480,52 +27666,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26030,7 +26129,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29333,24 +27528,21 @@
+@@ -29534,24 +27719,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26063,7 +26162,7 @@
_ACEOF
fi
-@@ -29366,21 +27558,20 @@
+@@ -29567,21 +27749,20 @@
for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h
do
@@ -26094,7 +26193,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29396,33 +27587,32 @@
+@@ -29597,33 +27778,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26135,7 +26234,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29436,52 +27626,51 @@
+@@ -29637,52 +27817,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26209,7 +26308,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29490,24 +27679,21 @@
+@@ -29691,24 +27870,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26242,7 +26341,7 @@
_ACEOF
fi
-@@ -29523,21 +27709,20 @@
+@@ -29724,21 +27900,20 @@
for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
do
@@ -26273,7 +26372,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29553,33 +27738,32 @@
+@@ -29754,33 +27929,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26314,7 +26413,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29593,52 +27777,51 @@
+@@ -29794,52 +27968,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26388,7 +26487,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29647,24 +27830,21 @@
+@@ -29848,24 +28021,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26421,7 +26520,7 @@
_ACEOF
fi
-@@ -29679,21 +27859,20 @@
+@@ -29880,21 +28050,20 @@
for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
do
@@ -26452,7 +26551,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29709,33 +27888,32 @@
+@@ -29910,33 +28079,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26493,7 +26592,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29749,52 +27927,51 @@
+@@ -29950,52 +28118,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26567,7 +26666,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29803,24 +27980,21 @@
+@@ -30004,24 +28171,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26600,7 +26699,7 @@
_ACEOF
fi
-@@ -29834,21 +28008,20 @@
+@@ -30035,21 +28199,20 @@
for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
do
@@ -26631,7 +26730,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29864,33 +28037,32 @@
+@@ -30065,33 +28228,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26672,7 +26771,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29904,52 +28076,51 @@
+@@ -30105,52 +28267,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26746,7 +26845,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -29958,24 +28129,21 @@
+@@ -30159,24 +28320,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26779,7 +26878,7 @@
_ACEOF
fi
-@@ -29985,21 +28153,20 @@
+@@ -30186,21 +28344,20 @@
for ac_header in sys/sysmacros.h
do
@@ -26810,7 +26909,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30015,33 +28182,32 @@
+@@ -30216,33 +28373,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26851,7 +26950,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30055,52 +28221,51 @@
+@@ -30256,52 +28412,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -26925,7 +27024,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30109,24 +28274,21 @@
+@@ -30310,24 +28465,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -26958,7 +27057,7 @@
_ACEOF
fi
-@@ -30137,21 +28299,20 @@
+@@ -30338,21 +28490,20 @@
for ac_header in sys/syslog.h syslog.h
do
@@ -26989,7 +27088,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30167,33 +28328,32 @@
+@@ -30368,33 +28519,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27030,7 +27129,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30207,52 +28367,51 @@
+@@ -30408,52 +28558,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27104,7 +27203,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30261,24 +28420,21 @@
+@@ -30462,24 +28611,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -27137,7 +27236,7 @@
_ACEOF
fi
-@@ -30289,21 +28445,20 @@
+@@ -30490,21 +28636,20 @@
for ac_header in langinfo.h locale.h
do
@@ -27168,7 +27267,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30319,33 +28474,32 @@
+@@ -30520,33 +28665,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27209,7 +27308,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30359,52 +28513,51 @@
+@@ -30560,52 +28704,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27283,7 +27382,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30413,24 +28566,21 @@
+@@ -30614,24 +28757,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -27316,7 +27415,7 @@
_ACEOF
fi
-@@ -30440,21 +28590,20 @@
+@@ -30641,21 +28781,20 @@
for ac_header in xfs/libxfs.h
do
@@ -27347,7 +27446,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30470,33 +28619,32 @@
+@@ -30671,33 +28810,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27388,7 +27487,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30510,52 +28658,51 @@
+@@ -30711,52 +28849,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27462,7 +27561,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30564,24 +28711,21 @@
+@@ -30765,24 +28902,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -27495,7 +27594,7 @@
_ACEOF
fi
-@@ -30591,21 +28735,20 @@
+@@ -30792,21 +28926,20 @@
for ac_header in netgroup.h
do
@@ -27526,7 +27625,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30621,33 +28764,32 @@
+@@ -30822,33 +28955,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27567,7 +27666,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30661,52 +28803,51 @@
+@@ -30862,52 +28994,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27641,7 +27740,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30715,24 +28856,21 @@
+@@ -30916,24 +29047,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -27674,7 +27773,7 @@
_ACEOF
fi
-@@ -30743,11 +28881,11 @@
+@@ -30944,11 +29072,11 @@
for ac_header in rpcsvc/yp_prot.h
do
@@ -27690,7 +27789,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30769,21 +28907,20 @@
+@@ -30970,21 +29098,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27715,7 +27814,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -30791,15 +28928,12 @@
+@@ -30992,15 +29119,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -27736,7 +27835,7 @@
_ACEOF
fi
-@@ -30811,21 +28945,20 @@
+@@ -31012,21 +29136,20 @@
for ac_header in sys/mode.h
do
@@ -27767,7 +27866,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30841,33 +28974,32 @@
+@@ -31042,33 +29165,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27808,7 +27907,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30881,52 +29013,51 @@
+@@ -31082,52 +29204,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27882,7 +27981,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -30935,24 +29066,21 @@
+@@ -31136,24 +29257,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -27915,7 +28014,7 @@
_ACEOF
fi
-@@ -30966,21 +29094,20 @@
+@@ -31167,21 +29285,20 @@
for ac_header in CoreFoundation/CFStringEncodingConverter.h
do
@@ -27946,7 +28045,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30996,33 +29123,32 @@
+@@ -31197,33 +29314,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -27987,7 +28086,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31036,52 +29162,51 @@
+@@ -31237,52 +29353,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28061,7 +28160,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31090,45 +29215,41 @@
+@@ -31291,45 +29406,41 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -28124,7 +28223,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31144,33 +29265,32 @@
+@@ -31345,33 +29456,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28165,7 +28264,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31184,52 +29304,51 @@
+@@ -31385,52 +29495,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28239,7 +28338,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31238,24 +29357,21 @@
+@@ -31439,24 +29548,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -28272,7 +28371,7 @@
_ACEOF
fi
-@@ -31275,21 +29391,20 @@
+@@ -31476,21 +29582,20 @@
for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
do
@@ -28303,7 +28402,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31305,33 +29420,32 @@
+@@ -31506,33 +29611,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28344,7 +28443,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31345,52 +29459,51 @@
+@@ -31546,52 +29650,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28418,7 +28517,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31399,24 +29512,21 @@
+@@ -31600,24 +29703,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -28451,7 +28550,7 @@
_ACEOF
fi
-@@ -31467,21 +29577,20 @@
+@@ -31668,21 +29768,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28476,7 +28575,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_shadow_h=no
-@@ -31500,21 +29609,20 @@
+@@ -31701,21 +29800,20 @@
for ac_header in shadow.h
do
@@ -28507,7 +28606,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31530,33 +29638,32 @@
+@@ -31731,33 +29829,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28548,7 +28647,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31570,52 +29677,51 @@
+@@ -31771,52 +29868,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28622,7 +28721,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31624,24 +29730,21 @@
+@@ -31825,24 +29921,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -28655,7 +28754,7 @@
_ACEOF
fi
-@@ -31655,21 +29758,20 @@
+@@ -31856,21 +29949,20 @@
for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
do
@@ -28686,7 +28785,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31685,33 +29787,32 @@
+@@ -31886,33 +29978,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28727,7 +28826,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31725,52 +29826,51 @@
+@@ -31926,52 +30017,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28801,7 +28900,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31779,24 +29879,21 @@
+@@ -31980,24 +30070,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -28834,7 +28933,7 @@
_ACEOF
fi
-@@ -31807,21 +29904,20 @@
+@@ -32008,21 +30095,20 @@
for ac_header in syscall.h sys/syscall.h
do
@@ -28865,7 +28964,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31837,33 +29933,32 @@
+@@ -32038,33 +30124,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28906,7 +29005,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31877,52 +29972,51 @@
+@@ -32078,52 +30163,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -28980,7 +29079,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -31931,24 +30025,21 @@
+@@ -32132,24 +30216,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -29013,7 +29112,7 @@
_ACEOF
fi
-@@ -31963,21 +30054,20 @@
+@@ -32164,21 +30245,20 @@
for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
do
@@ -29044,7 +29143,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31993,33 +30083,32 @@
+@@ -32194,33 +30274,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29085,7 +29184,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32033,52 +30122,51 @@
+@@ -32234,52 +30313,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29159,7 +29258,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -32087,24 +30175,21 @@
+@@ -32288,24 +30366,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -29192,7 +29291,7 @@
_ACEOF
fi
-@@ -32115,21 +30200,20 @@
+@@ -32316,21 +30391,20 @@
for ac_header in sys/ea.h sys/proplist.h
do
@@ -29223,7 +29322,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32145,33 +30229,32 @@
+@@ -32346,33 +30420,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29264,7 +29363,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32185,52 +30268,51 @@
+@@ -32386,52 +30459,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29338,7 +29437,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -32239,24 +30321,21 @@
+@@ -32440,24 +30512,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -29371,7 +29470,7 @@
_ACEOF
fi
-@@ -32268,21 +30347,20 @@
+@@ -32469,21 +30538,20 @@
for ac_header in sys/cdefs.h glob.h
do
@@ -29402,7 +29501,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32298,33 +30376,32 @@
+@@ -32499,33 +30567,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29443,7 +29542,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32338,52 +30415,51 @@
+@@ -32539,52 +30606,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29517,7 +29616,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -32392,24 +30468,21 @@
+@@ -32593,24 +30659,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -29550,7 +29649,7 @@
_ACEOF
fi
-@@ -32423,21 +30496,20 @@
+@@ -32624,21 +30687,20 @@
for ac_header in utmp.h utmpx.h lastlog.h
do
@@ -29581,7 +29680,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32453,33 +30525,32 @@
+@@ -32654,33 +30716,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29622,7 +29721,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32493,52 +30564,51 @@
+@@ -32694,52 +30755,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29696,7 +29795,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -32547,24 +30617,21 @@
+@@ -32748,24 +30808,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -29729,7 +29828,7 @@
_ACEOF
fi
-@@ -32572,14 +30639,68 @@
+@@ -32773,14 +30830,68 @@
done
@@ -29801,7 +29900,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -32590,10 +30711,11 @@
+@@ -32791,10 +30902,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29814,7 +29913,7 @@
test_array [0] = 0
;
-@@ -32606,14 +30728,13 @@
+@@ -32807,14 +30919,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29831,7 +29930,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -32627,10 +30748,11 @@
+@@ -32828,10 +30939,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29844,7 +29943,7 @@
test_array [0] = 0
;
-@@ -32643,21 +30765,20 @@
+@@ -32844,21 +30956,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29869,7 +29968,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -32671,7 +30792,7 @@
+@@ -32872,7 +30983,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -29878,7 +29977,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -32681,10 +30802,11 @@
+@@ -32882,10 +30993,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29891,7 +29990,7 @@
test_array [0] = 0
;
-@@ -32697,14 +30819,13 @@
+@@ -32898,14 +31010,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29908,7 +30007,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -32718,10 +30839,11 @@
+@@ -32919,10 +31030,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29921,7 +30020,7 @@
test_array [0] = 0
;
-@@ -32734,21 +30856,20 @@
+@@ -32935,21 +31047,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29946,7 +30045,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -32762,7 +30883,7 @@
+@@ -32963,7 +31074,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -29955,7 +30054,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -32782,10 +30903,11 @@
+@@ -32983,10 +31094,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29968,7 +30067,7 @@
test_array [0] = 0
;
-@@ -32798,21 +30920,20 @@
+@@ -32999,21 +31111,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -29993,7 +30092,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -32823,13 +30944,11 @@
+@@ -33024,13 +31135,11 @@
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
'') if test "$ac_cv_type_int" = yes; then
@@ -30010,7 +30109,7 @@
else
ac_cv_sizeof_int=0
fi ;;
-@@ -32842,8 +30961,9 @@
+@@ -33043,8 +31152,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30022,7 +30121,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -32853,22 +30973,20 @@
+@@ -33054,22 +31164,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -30050,7 +30149,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -32881,48 +30999,43 @@
+@@ -33082,48 +31190,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30110,7 +30209,7 @@
-@@ -32931,14 +31044,68 @@
+@@ -33132,14 +31235,68 @@
_ACEOF
@@ -30182,7 +30281,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -32949,10 +31116,11 @@
+@@ -33150,10 +31307,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30195,7 +30294,7 @@
test_array [0] = 0
;
-@@ -32965,14 +31133,13 @@
+@@ -33166,14 +31324,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30212,7 +30311,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -32986,10 +31153,11 @@
+@@ -33187,10 +31344,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30225,7 +30324,7 @@
test_array [0] = 0
;
-@@ -33002,21 +31170,20 @@
+@@ -33203,21 +31361,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30250,7 +30349,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -33030,7 +31197,7 @@
+@@ -33231,7 +31388,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -30259,7 +30358,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -33040,10 +31207,11 @@
+@@ -33241,10 +31398,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30272,7 +30371,7 @@
test_array [0] = 0
;
-@@ -33056,14 +31224,13 @@
+@@ -33257,14 +31415,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30289,7 +30388,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -33077,10 +31244,11 @@
+@@ -33278,10 +31435,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30302,7 +30401,7 @@
test_array [0] = 0
;
-@@ -33093,21 +31261,20 @@
+@@ -33294,21 +31452,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30327,7 +30426,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -33121,7 +31288,7 @@
+@@ -33322,7 +31479,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -30336,7 +30435,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -33141,10 +31308,11 @@
+@@ -33342,10 +31499,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30349,7 +30448,7 @@
test_array [0] = 0
;
-@@ -33157,21 +31325,20 @@
+@@ -33358,21 +31516,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30374,7 +30473,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -33182,13 +31349,11 @@
+@@ -33383,13 +31540,11 @@
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
'') if test "$ac_cv_type_long" = yes; then
@@ -30391,7 +30490,7 @@
else
ac_cv_sizeof_long=0
fi ;;
-@@ -33201,8 +31366,9 @@
+@@ -33402,8 +31557,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30403,7 +30502,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -33212,22 +31378,20 @@
+@@ -33413,22 +31569,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -30431,7 +30530,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -33240,48 +31404,43 @@
+@@ -33441,48 +31595,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30491,7 +30590,7 @@
-@@ -33290,14 +31449,68 @@
+@@ -33491,14 +31640,68 @@
_ACEOF
@@ -30563,7 +30662,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -33308,10 +31521,11 @@
+@@ -33509,10 +31712,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30576,7 +30675,7 @@
test_array [0] = 0
;
-@@ -33324,14 +31538,13 @@
+@@ -33525,14 +31729,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30593,7 +30692,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -33345,10 +31558,11 @@
+@@ -33546,10 +31749,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30606,7 +30705,7 @@
test_array [0] = 0
;
-@@ -33361,21 +31575,20 @@
+@@ -33562,21 +31766,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30631,7 +30730,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -33389,7 +31602,7 @@
+@@ -33590,7 +31793,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -30640,7 +30739,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -33399,10 +31612,11 @@
+@@ -33600,10 +31803,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30653,7 +30752,7 @@
test_array [0] = 0
;
-@@ -33415,14 +31629,13 @@
+@@ -33616,14 +31820,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30670,7 +30769,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -33436,10 +31649,11 @@
+@@ -33637,10 +31840,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30683,7 +30782,7 @@
test_array [0] = 0
;
-@@ -33452,21 +31666,20 @@
+@@ -33653,21 +31857,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30708,7 +30807,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -33480,7 +31693,7 @@
+@@ -33681,7 +31884,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -30717,7 +30816,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -33500,10 +31713,11 @@
+@@ -33701,10 +31904,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30730,7 +30829,7 @@
test_array [0] = 0
;
-@@ -33516,21 +31730,20 @@
+@@ -33717,21 +31921,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30755,7 +30854,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -33541,13 +31754,11 @@
+@@ -33742,13 +31945,11 @@
case $ac_lo in
?*) ac_cv_sizeof_long_long=$ac_lo;;
'') if test "$ac_cv_type_long_long" = yes; then
@@ -30772,7 +30871,7 @@
else
ac_cv_sizeof_long_long=0
fi ;;
-@@ -33560,8 +31771,9 @@
+@@ -33761,8 +31962,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30784,7 +30883,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -33571,22 +31783,20 @@
+@@ -33772,22 +31974,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -30812,7 +30911,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -33599,48 +31809,43 @@
+@@ -33800,48 +32000,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30872,7 +30971,7 @@
-@@ -33649,14 +31854,68 @@
+@@ -33850,14 +32045,68 @@
_ACEOF
@@ -30944,7 +31043,7 @@
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
-@@ -33667,10 +31926,11 @@
+@@ -33868,10 +32117,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30957,7 +31056,7 @@
test_array [0] = 0
;
-@@ -33683,14 +31943,13 @@
+@@ -33884,14 +32134,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -30974,7 +31073,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -33704,10 +31963,11 @@
+@@ -33905,10 +32154,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30987,7 +31086,7 @@
test_array [0] = 0
;
-@@ -33720,21 +31980,20 @@
+@@ -33921,21 +32171,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31012,7 +31111,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
-@@ -33748,7 +32007,7 @@
+@@ -33949,7 +32198,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -31021,7 +31120,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -33758,10 +32017,11 @@
+@@ -33959,10 +32208,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31034,7 +31133,7 @@
test_array [0] = 0
;
-@@ -33774,14 +32034,13 @@
+@@ -33975,14 +32225,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31051,7 +31150,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -33795,10 +32054,11 @@
+@@ -33996,10 +32245,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31064,7 +31163,7 @@
test_array [0] = 0
;
-@@ -33811,21 +32071,20 @@
+@@ -34012,21 +32262,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31089,7 +31188,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -33839,7 +32098,7 @@
+@@ -34040,7 +32289,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
@@ -31098,7 +31197,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
-@@ -33859,10 +32118,11 @@
+@@ -34060,10 +32309,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31111,7 +31210,7 @@
test_array [0] = 0
;
-@@ -33875,21 +32135,20 @@
+@@ -34076,21 +32326,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31136,7 +31235,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -33900,13 +32159,11 @@
+@@ -34101,13 +32350,11 @@
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
'') if test "$ac_cv_type_short" = yes; then
@@ -31153,7 +31252,7 @@
else
ac_cv_sizeof_short=0
fi ;;
-@@ -33919,8 +32176,9 @@
+@@ -34120,8 +32367,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31165,7 +31264,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -33930,22 +32188,20 @@
+@@ -34131,22 +32379,20 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
@@ -31193,7 +31292,7 @@
return ferror (f) || fclose (f) != 0;
;
-@@ -33958,48 +32214,43 @@
+@@ -34159,48 +32405,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31253,7 +31352,7 @@
-@@ -34009,10 +32260,10 @@
+@@ -34210,10 +32451,10 @@
@@ -31267,7 +31366,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34084,21 +32335,20 @@
+@@ -34285,21 +32526,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31292,7 +31391,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_const=no
-@@ -34106,20 +32356,20 @@
+@@ -34307,20 +32547,20 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -31319,52 +31418,67 @@
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
-@@ -34142,21 +32392,20 @@
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+@@ -34334,174 +32574,8 @@
+ typedef int foo_t;
+ static $ac_kw foo_t static_foo () {return 0; }
+ $ac_kw foo_t foo () {return 0; }
+-#endif
+-
+-_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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
- else
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_c_inline=$ac_kw
+-else
- $as_echo "$as_me: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-@@ -34167,8 +32416,8 @@
- done
-
- fi
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- test "$ac_cv_c_inline" != no && break
+-done
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
- case $ac_cv_c_inline in
-@@ -34186,78 +32435,28 @@
- ;;
- esac
-
-
+-
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
+- case $ac_cv_c_inline in
+- no) ac_val=;;
+- *) ac_val=$ac_cv_c_inline;;
+- esac
+- cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+- ;;
+-esac
+-
+-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
+-if test "${ac_cv_c_bigendian+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
@@ -31406,8 +31520,7 @@
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -31418,6 +31531,136 @@
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+- #include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+- && LITTLE_ENDIAN)
+- bogus endian macros
+- #endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- # It does; now see whether it defined to BIG_ENDIAN or not.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+- #include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if BYTE_ORDER != BIG_ENDIAN
+- not big endian
+- #endif
++#endif
+
+- ;
+- return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -34509,52 +32583,71 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- ac_cv_c_bigendian=yes
++ ac_cv_c_inline=$ac_kw
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_c_bigendian=no
++
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++ test "$ac_cv_c_inline" != no && break
++done
+
+ fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+- cat >conftest.$ac_ext <<_ACEOF
++
++case $ac_cv_c_inline in
++ inline | yes) ;;
++ *)
++ case $ac_cv_c_inline in
++ no) ac_val=;;
++ *) ac_val=$ac_cv_c_inline;;
++ esac
++ cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++ ;;
++esac
++
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -31425,16 +31668,14 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <sys/types.h>
-- #include <sys/param.h>
+-#include <limits.h>
++#include <sys/types.h>
+#include <sys/param.h>
int
main ()
{
--#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-- && LITTLE_ENDIAN)
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
- bogus endian macros
- #endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
@@ -31444,7 +31685,7 @@
;
return 0;
-@@ -34269,34 +32468,33 @@
+@@ -34566,33 +32659,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31462,30 +31703,32 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
+- # It does; now see whether it defined to _BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
++ # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <sys/types.h>
-- #include <sys/param.h>
+-#include <limits.h>
++#include <sys/types.h>
+#include <sys/param.h>
int
main ()
{
- #if BYTE_ORDER != BIG_ENDIAN
+-#ifndef _BIG_ENDIAN
- not big endian
- #endif
++#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
;
return 0;
-@@ -34308,21 +32506,20 @@
+@@ -34604,21 +32697,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31510,7 +31753,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_bigendian=no
-@@ -34330,69 +32527,29 @@
+@@ -34626,44 +32718,29 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
@@ -31524,45 +31767,9 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
-- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <limits.h>
--
--int
--main ()
--{
--#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-- bogus endian macros
-- #endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- # It does; now see whether it defined to _BIG_ENDIAN or not.
+- # Compile a test program.
+- if test "$cross_compiling" = yes; then
+- # Try to guess by grepping values from an object file.
- cat >conftest.$ac_ext <<_ACEOF
+ # It does not; compile a test program.
+if test "$cross_compiling" = yes; then
@@ -31574,7 +31781,21 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--#include <limits.h>
+-short int ascii_mm[] =
+- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+- short int ascii_ii[] =
+- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+- int use_ascii (int i) {
+- return ascii_mm[i] + ascii_ii[i];
+- }
+- short int ebcdic_ii[] =
+- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+- short int ebcdic_mm[] =
+- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+- int use_ebcdic (int i) {
+- return ebcdic_mm[i] + ebcdic_ii[i];
+- }
+- extern int foo;
-
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
@@ -31585,15 +31806,12 @@
int
main ()
{
--#ifndef _BIG_ENDIAN
-- not big endian
-- #endif
--
+-return use_ascii (foo) == use_ebcdic (foo);
+ _ascii (); _ebcdic ();
;
return 0;
}
-@@ -34403,101 +32560,30 @@
+@@ -34674,31 +32751,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31611,84 +31829,6 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
-+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_c_bigendian=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+ if test "$ac_cv_c_bigendian" = unknown; then
-+ ac_cv_c_bigendian=no
-+ else
-+ # finding both strings is unlikely to happen, but who knows?
-+ ac_cv_c_bigendian=unknown
-+ fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- fi
-- if test $ac_cv_c_bigendian = unknown; then
-- # Compile a test program.
-- if test "$cross_compiling" = yes; then
-- # Try to guess by grepping values from an object file.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--short int ascii_mm[] =
-- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-- short int ascii_ii[] =
-- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-- int use_ascii (int i) {
-- return ascii_mm[i] + ascii_ii[i];
-- }
-- short int ebcdic_ii[] =
-- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-- short int ebcdic_mm[] =
-- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-- int use_ebcdic (int i) {
-- return ebcdic_mm[i] + ebcdic_ii[i];
-- }
-- extern int foo;
--
--int
--main ()
--{
--return use_ascii (foo) == use_ebcdic (foo);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
- ac_cv_c_bigendian=yes
- fi
@@ -31700,13 +31840,24 @@
- ac_cv_c_bigendian=unknown
- fi
- fi
++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++ ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if test "$ac_cv_c_bigendian" = unknown; then
++ ac_cv_c_bigendian=no
++ else
++ # finding both strings is unlikely to happen, but who knows?
++ ac_cv_c_bigendian=unknown
++ fi
++fi
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -34516,14 +32602,14 @@
+@@ -34717,14 +32793,14 @@
main ()
{
@@ -31729,7 +31880,7 @@
;
return 0;
-@@ -34535,68 +32621,61 @@
+@@ -34736,68 +32812,61 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31824,7 +31975,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34621,21 +32700,20 @@
+@@ -34822,21 +32891,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31849,7 +32000,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_char_unsigned=yes
-@@ -34643,8 +32721,8 @@
+@@ -34844,8 +32912,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -31860,7 +32011,7 @@
if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
cat >>confdefs.h <<\_ACEOF
#define __CHAR_UNSIGNED__ 1
-@@ -34653,10 +32731,10 @@
+@@ -34854,10 +32922,10 @@
fi
@@ -31874,7 +32025,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34681,21 +32759,20 @@
+@@ -34882,21 +32950,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -31899,7 +32050,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=void
-@@ -34703,18 +32780,18 @@
+@@ -34904,18 +32971,18 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -31923,7 +32074,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34734,8 +32811,8 @@
+@@ -34935,8 +33002,8 @@
rm -f conftest*
fi
@@ -31934,7 +32085,7 @@
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -34749,46 +32826,11 @@
+@@ -34950,46 +33017,11 @@
fi
@@ -31984,7 +32135,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34796,11 +32838,14 @@
+@@ -34997,11 +33029,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32001,7 +32152,7 @@
;
return 0;
}
-@@ -34811,39 +32856,30 @@
+@@ -35012,39 +33047,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32049,7 +32200,7 @@
:
else
-@@ -34853,46 +32889,11 @@
+@@ -35054,46 +33080,11 @@
fi
@@ -32099,7 +32250,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34900,11 +32901,14 @@
+@@ -35101,11 +33092,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32116,7 +32267,7 @@
;
return 0;
}
-@@ -34915,39 +32919,30 @@
+@@ -35116,39 +33110,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32164,7 +32315,7 @@
:
else
-@@ -34957,46 +32952,11 @@
+@@ -35158,46 +33143,11 @@
fi
@@ -32214,7 +32365,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35004,11 +32964,14 @@
+@@ -35205,11 +33155,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32231,7 +32382,7 @@
;
return 0;
}
-@@ -35019,39 +32982,30 @@
+@@ -35220,39 +33173,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32250,26 +32401,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_size_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_size_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_size_t=yes
+-
+ ac_cv_type_size_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
@@ -32279,7 +32430,7 @@
:
else
-@@ -35061,46 +33015,11 @@
+@@ -35262,46 +33206,11 @@
fi
@@ -32329,7 +32480,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35108,11 +33027,14 @@
+@@ -35309,11 +33218,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32346,7 +32497,7 @@
;
return 0;
}
-@@ -35123,39 +33045,30 @@
+@@ -35324,39 +33236,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32394,7 +32545,7 @@
:
else
-@@ -35165,10 +33078,10 @@
+@@ -35366,10 +33269,10 @@
fi
@@ -32408,7 +32559,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35193,21 +33106,20 @@
+@@ -35394,21 +33297,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32433,7 +32584,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -35233,21 +33145,20 @@
+@@ -35434,21 +33336,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32458,7 +32609,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_stat_st_rdev=no
-@@ -35258,9 +33169,9 @@
+@@ -35459,9 +33360,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -32471,7 +32622,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_STAT_ST_RDEV 1
-@@ -35274,10 +33185,10 @@
+@@ -35475,10 +33376,10 @@
fi
@@ -32485,7 +32636,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35303,21 +33214,20 @@
+@@ -35504,21 +33405,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32510,7 +32661,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_dirent_d_off=no
-@@ -35325,8 +33235,8 @@
+@@ -35526,8 +33426,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -32521,7 +32672,7 @@
if test $ac_cv_dirent_d_off = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35335,46 +33245,11 @@
+@@ -35536,46 +33436,11 @@
fi
@@ -32571,7 +32722,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35382,11 +33257,14 @@
+@@ -35583,11 +33448,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32588,7 +32739,7 @@
;
return 0;
}
-@@ -35397,39 +33275,30 @@
+@@ -35598,39 +33466,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32607,26 +32758,26 @@
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_ssize_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_ssize_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--
+- ac_cv_type_ssize_t=yes
+ ac_cv_type_ssize_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
@@ -32636,7 +32787,7 @@
:
else
-@@ -35439,46 +33308,11 @@
+@@ -35640,46 +33499,11 @@
fi
@@ -32686,7 +32837,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35486,11 +33320,14 @@
+@@ -35687,11 +33511,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32703,7 +32854,7 @@
;
return 0;
}
-@@ -35501,39 +33338,30 @@
+@@ -35702,39 +33529,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32751,7 +32902,7 @@
:
else
-@@ -35556,10 +33384,10 @@
+@@ -35757,10 +33575,10 @@
if test x$enable_cups != xno; then
# Extract the first word of "cups-config", so it can be a program name with args.
set dummy cups-config; ac_word=$2
@@ -32765,7 +32916,7 @@
else
case $CUPS_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -35574,7 +33402,7 @@
+@@ -35775,7 +33593,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -32774,7 +32925,7 @@
break 2
fi
done
-@@ -35586,11 +33414,11 @@
+@@ -35787,11 +33605,11 @@
fi
CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
if test -n "$CUPS_CONFIG"; then
@@ -32790,7 +32941,7 @@
fi
-@@ -35607,21 +33435,20 @@
+@@ -35808,21 +33626,20 @@
for ac_header in cups/cups.h cups/language.h
do
@@ -32821,7 +32972,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35637,33 +33464,32 @@
+@@ -35838,33 +33655,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32862,7 +33013,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35677,52 +33503,51 @@
+@@ -35878,52 +33694,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -32936,7 +33087,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -35731,24 +33556,21 @@
+@@ -35932,24 +33747,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -32969,7 +33120,7 @@
_ACEOF
fi
-@@ -35764,16 +33586,16 @@
+@@ -35965,16 +33777,16 @@
samba_cv_HAVE_CUPS=yes
else
@@ -32990,7 +33141,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -35792,18 +33614,18 @@
+@@ -35993,18 +33805,18 @@
_ACEOF
elif test x"$enable_iprint" = x"yes"; then
@@ -33014,7 +33165,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35835,35 +33657,31 @@
+@@ -36036,35 +33848,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33057,7 +33208,7 @@
if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -35874,10 +33692,10 @@
+@@ -36075,10 +33883,10 @@
#############################################
# check for fd passing struct via msg_control
@@ -33071,7 +33222,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35914,21 +33732,20 @@
+@@ -36115,21 +33923,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33096,7 +33247,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_msghdr_msg_control=no
-@@ -35936,8 +33753,8 @@
+@@ -36137,8 +33944,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33107,7 +33258,7 @@
if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -35948,10 +33765,10 @@
+@@ -36149,10 +33956,10 @@
#############################################
# check for fd passing struct via msg_acctrights
@@ -33121,7 +33272,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35985,21 +33802,20 @@
+@@ -36186,21 +33993,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33146,7 +33297,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_msghdr_msg_acctrights=no
-@@ -36007,8 +33823,8 @@
+@@ -36208,8 +34014,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33157,7 +33308,7 @@
if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36020,11 +33836,11 @@
+@@ -36221,11 +34027,11 @@
for ac_func in dirfd
do
@@ -33173,7 +33324,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -36077,42 +33893,35 @@
+@@ -36278,42 +34084,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33226,7 +33377,7 @@
_ACEOF
fi
-@@ -36122,10 +33931,10 @@
+@@ -36323,10 +34122,10 @@
default_shared_modules="$default_shared_modules vfs_syncops"
fi
@@ -33240,7 +33391,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36155,21 +33964,20 @@
+@@ -36356,21 +34155,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33265,7 +33416,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_sig_atomic_t=no
-@@ -36177,8 +33985,8 @@
+@@ -36378,8 +34176,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33276,7 +33427,7 @@
if test x"$samba_cv_sig_atomic_t" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36187,10 +33995,10 @@
+@@ -36388,10 +34186,10 @@
fi
@@ -33290,7 +33441,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36220,21 +34028,20 @@
+@@ -36421,21 +34219,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33315,7 +33466,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_struct_sigevent=no
-@@ -36242,18 +34049,18 @@
+@@ -36443,18 +34240,18 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33339,7 +33490,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -36279,21 +34086,20 @@
+@@ -36480,21 +34277,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33364,7 +33515,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -36320,21 +34126,20 @@
+@@ -36521,21 +34317,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33389,7 +33540,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
-@@ -36345,9 +34150,9 @@
+@@ -36546,9 +34341,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33402,7 +33553,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
-@@ -36355,10 +34160,10 @@
+@@ -36556,10 +34351,10 @@
fi
@@ -33416,7 +33567,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -36384,21 +34189,20 @@
+@@ -36585,21 +34380,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33441,7 +33592,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -36425,21 +34229,20 @@
+@@ -36626,21 +34420,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33466,7 +33617,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
-@@ -36450,9 +34253,9 @@
+@@ -36651,9 +34444,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33479,7 +33630,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-@@ -36463,10 +34266,10 @@
+@@ -36664,10 +34457,10 @@
fi
@@ -33493,7 +33644,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36506,21 +34309,20 @@
+@@ -36707,21 +34500,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33518,7 +33669,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_struct_timespec=no
-@@ -36528,8 +34330,8 @@
+@@ -36729,8 +34521,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33529,7 +33680,7 @@
if test x"$samba_cv_struct_timespec" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36540,10 +34342,10 @@
+@@ -36741,10 +34533,10 @@
# stupid headers have the functions but no declaration. grrrr.
@@ -33543,7 +33694,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36567,21 +34369,20 @@
+@@ -36768,21 +34560,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33568,7 +33719,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_errno_decl=no
-@@ -36589,8 +34390,8 @@
+@@ -36790,8 +34581,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33579,7 +33730,7 @@
if test x"$ac_cv_have_errno_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36600,10 +34401,10 @@
+@@ -36801,10 +34592,10 @@
fi
@@ -33593,7 +33744,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36627,21 +34428,20 @@
+@@ -36828,21 +34619,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33618,7 +33769,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_setresuid_decl=no
-@@ -36649,8 +34449,8 @@
+@@ -36850,8 +34640,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33629,7 +33780,7 @@
if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36660,10 +34460,10 @@
+@@ -36861,10 +34651,10 @@
fi
@@ -33643,7 +33794,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36687,21 +34487,20 @@
+@@ -36888,21 +34678,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33668,7 +33819,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_setresgid_decl=no
-@@ -36709,8 +34508,8 @@
+@@ -36910,8 +34699,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -33679,7 +33830,7 @@
if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36722,10 +34521,10 @@
+@@ -36923,10 +34712,10 @@
# and glibc has setresuid under linux but the function does
# nothing until kernel 2.1.44! very dumb.
@@ -33693,7 +33844,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -36746,39 +34545,36 @@
+@@ -36947,39 +34736,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33741,7 +33892,7 @@
if test x"$samba_cv_have_setresuid" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36789,10 +34585,10 @@
+@@ -36990,10 +34776,10 @@
# Do the same check for setresguid...
#
@@ -33755,7 +33906,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -36814,39 +34610,36 @@
+@@ -37015,39 +34801,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33803,7 +33954,7 @@
if test x"$samba_cv_have_setresgid" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36855,10 +34648,10 @@
+@@ -37056,10 +34839,10 @@
fi
@@ -33817,7 +33968,7 @@
else
if test "$cross_compiling" = yes; then
ac_cv_func_memcmp_working=no
-@@ -36908,39 +34701,36 @@
+@@ -37109,39 +34892,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33865,7 +34016,7 @@
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-@@ -36954,36 +34744,35 @@
+@@ -37155,36 +34935,35 @@
test "${with_readline+set}" != "set" && with_readline=yes
# test for where we get readline() from
@@ -33915,7 +34066,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36999,33 +34788,32 @@
+@@ -37200,33 +34979,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -33956,7 +34107,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37039,52 +34827,51 @@
+@@ -37240,52 +35018,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34030,7 +34181,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -37093,24 +34880,21 @@
+@@ -37294,24 +35071,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -34063,7 +34214,7 @@
_ACEOF
fi
-@@ -37120,21 +34904,20 @@
+@@ -37321,21 +35095,20 @@
for ac_header in readline/history.h
do
@@ -34094,7 +34245,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37150,33 +34933,32 @@
+@@ -37351,33 +35124,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34135,7 +34286,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37190,52 +34972,51 @@
+@@ -37391,52 +35163,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34209,7 +34360,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -37244,24 +35025,21 @@
+@@ -37445,24 +35216,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -34242,7 +34393,7 @@
_ACEOF
fi
-@@ -37273,21 +35051,20 @@
+@@ -37474,21 +35242,20 @@
for ac_header in readline.h readline/readline.h
do
@@ -34273,7 +34424,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37303,33 +35080,32 @@
+@@ -37504,33 +35271,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34314,7 +34465,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37343,52 +35119,51 @@
+@@ -37544,52 +35310,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34388,7 +34539,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -37397,32 +35172,29 @@
+@@ -37598,32 +35363,29 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -34433,7 +34584,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l${termlib} $LIBS"
-@@ -37454,49 +35226,42 @@
+@@ -37655,49 +35417,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34495,7 +34646,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $TERMLIBS $LIBS"
-@@ -37528,37 +35293,33 @@
+@@ -37729,37 +35484,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34541,7 +34692,7 @@
TERMLIBS="-lreadline $TERMLIBS"
cat >>confdefs.h <<\_ACEOF
-@@ -37576,12 +35337,12 @@
+@@ -37777,12 +35528,12 @@
;;
no)
@@ -34558,7 +34709,7 @@
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
# alternate readline path
-@@ -37597,21 +35358,20 @@
+@@ -37798,21 +35549,20 @@
for ac_header in readline.h history.h readline/readline.h
do
@@ -34589,7 +34740,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37627,33 +35387,32 @@
+@@ -37828,33 +35578,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34630,7 +34781,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37667,52 +35426,51 @@
+@@ -37868,52 +35617,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34704,7 +34855,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -37721,24 +35479,21 @@
+@@ -37922,24 +35670,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -34737,7 +34888,7 @@
_ACEOF
fi
-@@ -37748,21 +35503,20 @@
+@@ -37949,21 +35694,20 @@
for ac_header in readline/history.h
do
@@ -34768,7 +34919,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37778,33 +35532,32 @@
+@@ -37979,33 +35723,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34809,7 +34960,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37818,52 +35571,51 @@
+@@ -38019,52 +35762,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34883,7 +35034,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -37872,24 +35624,21 @@
+@@ -38073,24 +35815,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -34916,7 +35067,7 @@
_ACEOF
fi
-@@ -37901,21 +35650,20 @@
+@@ -38102,21 +35841,20 @@
for ac_header in readline.h readline/readline.h
do
@@ -34947,7 +35098,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37931,33 +35679,32 @@
+@@ -38132,33 +35870,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -34988,7 +35139,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37971,52 +35718,51 @@
+@@ -38172,52 +35909,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35062,7 +35213,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -38025,32 +35771,29 @@
+@@ -38226,32 +35962,29 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -35107,7 +35258,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l${termlib} $LIBS"
-@@ -38082,49 +35825,42 @@
+@@ -38283,49 +36016,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35169,7 +35320,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $TERMLIBS $LIBS"
-@@ -38156,37 +35892,33 @@
+@@ -38357,37 +36083,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35215,7 +35366,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-@@ -38210,8 +35942,8 @@
+@@ -38411,8 +36133,8 @@
;;
esac
else
@@ -35226,7 +35377,7 @@
fi
-@@ -38221,10 +35953,10 @@
+@@ -38422,10 +36144,10 @@
# The readline API changed slightly from readline3 to readline4, so
# code will generate warnings on one of them unless we have a few
# special cases.
@@ -35240,7 +35391,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $TERMLIBS $LIBS"
-@@ -38256,37 +35988,33 @@
+@@ -38457,37 +36179,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35286,7 +35437,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NEW_LIBREADLINE 1
-@@ -38296,10 +36024,10 @@
+@@ -38497,10 +36215,10 @@
# not all readline libs have rl_event_hook or history_list
@@ -35300,7 +35451,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -38326,21 +36054,20 @@
+@@ -38527,21 +36245,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35325,7 +35476,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_rl_event_hook=no
-@@ -38348,9 +36075,9 @@
+@@ -38549,9 +36266,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -35338,7 +35489,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_RL_EVENT_HOOK 1
-@@ -38366,10 +36093,10 @@
+@@ -38567,10 +36284,10 @@
fi
@@ -35352,7 +35503,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $TERMLIBS $LIBS"
-@@ -38401,37 +36128,33 @@
+@@ -38602,37 +36319,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35398,7 +35549,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_HISTORY_LIST 1
-@@ -38442,10 +36165,10 @@
+@@ -38643,10 +36356,10 @@
###############################################
# test for where we get yp_get_default_domain() from
@@ -35412,7 +35563,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -38483,30 +36206,26 @@
+@@ -38684,30 +36397,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35448,7 +35599,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-@@ -38521,8 +36240,8 @@
+@@ -38722,8 +36431,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -35459,7 +35610,7 @@
ac_res=$ac_cv_search_yp_get_default_domain
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -38532,11 +36251,11 @@
+@@ -38733,11 +36442,11 @@
for ac_func in yp_get_default_domain
do
@@ -35475,7 +35626,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -38589,42 +36308,35 @@
+@@ -38790,42 +36499,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35528,7 +35679,7 @@
_ACEOF
fi
-@@ -38635,11 +36347,11 @@
+@@ -38836,11 +36538,11 @@
for ac_func in execl
do
@@ -35544,7 +35695,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -38692,42 +36404,35 @@
+@@ -38893,42 +36595,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35597,7 +35748,7 @@
_ACEOF
fi
-@@ -38754,11 +36459,11 @@
+@@ -38955,11 +36650,11 @@
for ac_func in waitpid getcwd strdup strndup strnlen strerror chown fchown lchown chmod fchmod chroot link mknod mknod64
do
@@ -35613,7 +35764,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -38811,42 +36516,35 @@
+@@ -39012,42 +36707,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35666,7 +35817,7 @@
_ACEOF
fi
-@@ -38860,11 +36558,11 @@
+@@ -39061,11 +36749,11 @@
for ac_func in strtol strtoll strtoul strtoull strtouq __strtoull
do
@@ -35682,7 +35833,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -38917,42 +36615,35 @@
+@@ -39118,42 +36806,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35735,7 +35886,7 @@
_ACEOF
fi
-@@ -38965,11 +36656,11 @@
+@@ -39166,11 +36847,11 @@
for ac_func in fstat strchr utime utimes chflags
do
@@ -35751,7 +35902,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39022,42 +36713,35 @@
+@@ -39223,42 +36904,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35804,7 +35955,7 @@
_ACEOF
fi
-@@ -39072,11 +36756,11 @@
+@@ -39273,11 +36947,11 @@
for ac_func in getrlimit fsync fdatasync memset strlcpy strlcat setpgid
do
@@ -35820,7 +35971,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39129,42 +36813,35 @@
+@@ -39330,42 +37004,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35873,7 +36024,7 @@
_ACEOF
fi
-@@ -39179,11 +36856,11 @@
+@@ -39380,11 +37047,11 @@
for ac_func in memmove setsid glob strpbrk pipe crypt16 getauthuid
do
@@ -35889,7 +36040,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39236,42 +36913,35 @@
+@@ -39437,42 +37104,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -35942,7 +36093,7 @@
_ACEOF
fi
-@@ -39288,11 +36958,11 @@
+@@ -39489,11 +37149,11 @@
for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
do
@@ -35958,7 +36109,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39345,42 +37015,35 @@
+@@ -39546,42 +37206,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36011,7 +36162,7 @@
_ACEOF
fi
-@@ -39396,11 +37059,11 @@
+@@ -39597,11 +37250,11 @@
for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf realpath
do
@@ -36027,7 +36178,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39453,42 +37116,35 @@
+@@ -39654,42 +37307,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36080,7 +36231,7 @@
_ACEOF
fi
-@@ -39507,11 +37163,11 @@
+@@ -39708,11 +37354,11 @@
for ac_func in setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate chsize stat64 fstat64
do
@@ -36096,7 +36247,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39564,42 +37220,35 @@
+@@ -39765,42 +37411,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36149,7 +36300,7 @@
_ACEOF
fi
-@@ -39614,11 +37263,11 @@
+@@ -39815,11 +37454,11 @@
for ac_func in lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64
do
@@ -36165,7 +36316,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39671,42 +37320,35 @@
+@@ -39872,42 +37511,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36218,7 +36369,7 @@
_ACEOF
fi
-@@ -39721,11 +37363,11 @@
+@@ -39922,11 +37554,11 @@
for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf
do
@@ -36234,7 +36385,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39778,42 +37420,35 @@
+@@ -39979,42 +37611,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36287,7 +36438,7 @@
_ACEOF
fi
-@@ -39827,11 +37462,11 @@
+@@ -40028,11 +37653,11 @@
for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
do
@@ -36303,7 +36454,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39884,42 +37519,35 @@
+@@ -40085,42 +37710,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36356,7 +36507,7 @@
_ACEOF
fi
-@@ -39928,11 +37556,11 @@
+@@ -40129,11 +37747,11 @@
for ac_func in getpwent_r
do
@@ -36372,7 +36523,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -39985,42 +37613,35 @@
+@@ -40186,42 +37804,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36425,7 +36576,7 @@
_ACEOF
fi
-@@ -40030,11 +37651,11 @@
+@@ -40231,11 +37842,11 @@
for ac_func in getdents getdents64
do
@@ -36441,7 +36592,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40087,42 +37708,35 @@
+@@ -40288,42 +37899,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36494,7 +36645,7 @@
_ACEOF
fi
-@@ -40141,11 +37755,11 @@
+@@ -40342,11 +37946,11 @@
for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink
do
@@ -36510,7 +36661,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40198,42 +37812,35 @@
+@@ -40399,42 +38003,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36563,7 +36714,7 @@
_ACEOF
fi
-@@ -40244,11 +37851,11 @@
+@@ -40445,11 +38042,11 @@
for ac_func in syslog vsyslog timegm
do
@@ -36579,7 +36730,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40301,42 +37908,35 @@
+@@ -40502,42 +38099,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36632,7 +36783,7 @@
_ACEOF
fi
-@@ -40346,11 +37946,11 @@
+@@ -40547,11 +38137,11 @@
for ac_func in setlocale nl_langinfo
do
@@ -36648,7 +36799,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40403,42 +38003,35 @@
+@@ -40604,42 +38194,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36701,7 +36852,7 @@
_ACEOF
fi
-@@ -40447,11 +38040,11 @@
+@@ -40648,11 +38231,11 @@
for ac_func in nanosleep
do
@@ -36717,7 +36868,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40504,42 +38097,35 @@
+@@ -40705,42 +38288,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36770,7 +36921,7 @@
_ACEOF
fi
-@@ -40551,11 +38137,11 @@
+@@ -40752,11 +38328,11 @@
for ac_func in mlock munlock mlockall munlockall
do
@@ -36786,7 +36937,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40608,42 +38194,35 @@
+@@ -40809,42 +38385,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36839,7 +36990,7 @@
_ACEOF
fi
-@@ -40654,11 +38233,11 @@
+@@ -40855,11 +38424,11 @@
for ac_func in memalign posix_memalign hstrerror
do
@@ -36855,7 +37006,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40711,42 +38290,35 @@
+@@ -40912,42 +38481,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36908,7 +37059,7 @@
_ACEOF
fi
-@@ -40755,21 +38327,20 @@
+@@ -40956,21 +38518,20 @@
for ac_header in sys/mman.h
do
@@ -36939,7 +37090,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40785,33 +38356,32 @@
+@@ -40986,33 +38547,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -36980,7 +37131,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40825,52 +38395,51 @@
+@@ -41026,52 +38586,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37054,7 +37205,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -40879,24 +38448,21 @@
+@@ -41080,24 +38639,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -37087,7 +37238,7 @@
_ACEOF
fi
-@@ -40909,11 +38475,11 @@
+@@ -41110,11 +38666,11 @@
for ac_func in setbuffer shmget shm_open
do
@@ -37103,7 +37254,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40966,42 +38532,35 @@
+@@ -41167,42 +38723,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37156,7 +37307,7 @@
_ACEOF
fi
-@@ -41011,11 +38570,11 @@
+@@ -41212,11 +38761,11 @@
for ac_func in gettext dgettext
do
@@ -37172,7 +37323,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -41068,42 +38627,35 @@
+@@ -41269,42 +38818,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37225,7 +37376,7 @@
_ACEOF
fi
-@@ -41116,21 +38668,20 @@
+@@ -41317,21 +38859,20 @@
for ac_header in execinfo.h libexc.h libunwind.h
do
@@ -37256,7 +37407,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41146,33 +38697,32 @@
+@@ -41347,33 +38888,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37297,7 +37448,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41186,52 +38736,51 @@
+@@ -41387,52 +38927,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37371,7 +37522,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -41240,24 +38789,21 @@
+@@ -41441,24 +38980,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -37404,7 +37555,7 @@
_ACEOF
fi
-@@ -41265,10 +38811,10 @@
+@@ -41466,10 +39002,10 @@
done
# libexecinfo provides backtrace_symbols on FreeBSD
@@ -37418,7 +37569,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -41306,30 +38852,26 @@
+@@ -41507,30 +39043,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37454,7 +37605,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-@@ -41344,8 +38886,8 @@
+@@ -41545,8 +39077,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -37465,7 +37616,7 @@
ac_res=$ac_cv_search_backtrace_symbols
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -41355,11 +38897,11 @@
+@@ -41556,11 +39088,11 @@
for ac_func in backtrace_symbols
do
@@ -37481,7 +37632,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -41412,52 +38954,45 @@
+@@ -41613,52 +39145,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37547,7 +37698,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lexc $LIBS"
-@@ -41489,37 +39024,33 @@
+@@ -41690,37 +39215,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37593,7 +37744,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBEXC 1
_ACEOF
-@@ -41553,30 +39084,26 @@
+@@ -41754,30 +39275,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37629,7 +37780,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
echo $samba_cv_HAVE_GPFS
-@@ -41614,30 +39141,26 @@
+@@ -41815,30 +39332,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37665,7 +37816,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
echo $samba_cv_HAVE_GPFS
-@@ -41654,8 +39177,8 @@
+@@ -41855,8 +39368,8 @@
# Note that all the libunwind symbols in the API are defined to internal
# platform-specific version, so we must include libunwind.h before checking
# any of them.
@@ -37676,7 +37827,7 @@
save_LIBS=$LIBS
UNWIND_ARCH="unknown"
-@@ -41714,24 +39237,21 @@
+@@ -41915,24 +39428,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37707,7 +37858,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBUNWIND 1
-@@ -41744,21 +39264,20 @@
+@@ -41945,21 +39455,20 @@
for ac_header in libunwind-ptrace.h
do
@@ -37738,7 +37889,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41774,33 +39293,32 @@
+@@ -41975,33 +39484,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37779,7 +37930,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41814,52 +39332,51 @@
+@@ -42015,52 +39523,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37853,7 +38004,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -41868,34 +39385,31 @@
+@@ -42069,34 +39576,31 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -37899,7 +38050,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lunwind-ptrace $LIBS"
-@@ -41927,37 +39441,33 @@
+@@ -42128,37 +39632,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -37945,7 +38096,7 @@
LIBUNWIND_PTRACE="-lunwind-ptrace";
-@@ -41974,17 +39484,16 @@
+@@ -42175,17 +39675,16 @@
LIBS=$save_LIBS
else
@@ -37966,7 +38117,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -41993,21 +39502,20 @@
+@@ -42194,21 +39693,20 @@
for ac_header in sys/ptrace.h
do
@@ -37997,7 +38148,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42023,33 +39531,32 @@
+@@ -42224,33 +39722,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38038,7 +38189,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42063,52 +39570,51 @@
+@@ -42264,52 +39761,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38112,7 +38263,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -42117,32 +39623,29 @@
+@@ -42318,32 +39814,29 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -38155,7 +38306,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42179,24 +39682,21 @@
+@@ -42380,24 +39873,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38186,7 +38337,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_LINUX_PTRACE 1
-@@ -42204,17 +39704,16 @@
+@@ -42405,17 +39895,16 @@
else
@@ -38207,7 +38358,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -42230,11 +39729,11 @@
+@@ -42431,11 +39920,11 @@
for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
do
@@ -38223,7 +38374,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42287,42 +39786,35 @@
+@@ -42488,42 +39977,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38276,7 +38427,7 @@
_ACEOF
fi
-@@ -42337,11 +39829,11 @@
+@@ -42538,11 +40020,11 @@
for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
do
@@ -38292,7 +38443,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42394,42 +39886,35 @@
+@@ -42595,42 +40077,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38345,7 +38496,7 @@
_ACEOF
fi
-@@ -42439,11 +39924,11 @@
+@@ -42640,11 +40115,11 @@
for ac_func in __getcwd _getcwd
do
@@ -38361,7 +38512,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42496,42 +39981,35 @@
+@@ -42697,42 +40172,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38414,7 +38565,7 @@
_ACEOF
fi
-@@ -42542,11 +40020,11 @@
+@@ -42743,11 +40211,11 @@
for ac_func in __xstat __fxstat __lxstat
do
@@ -38430,7 +38581,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42599,42 +40077,35 @@
+@@ -42800,42 +40268,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38483,7 +38634,7 @@
_ACEOF
fi
-@@ -42648,11 +40119,11 @@
+@@ -42849,11 +40310,11 @@
for ac_func in _stat _lstat _fstat __stat __lstat __fstat
do
@@ -38499,7 +38650,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42705,42 +40176,35 @@
+@@ -42906,42 +40367,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38552,7 +38703,7 @@
_ACEOF
fi
-@@ -42756,11 +40220,11 @@
+@@ -42957,11 +40411,11 @@
for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
do
@@ -38568,7 +38719,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42813,42 +40277,35 @@
+@@ -43014,42 +40468,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38621,7 +38772,7 @@
_ACEOF
fi
-@@ -42862,11 +40319,11 @@
+@@ -43063,11 +40510,11 @@
for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
do
@@ -38637,7 +38788,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -42919,42 +40376,35 @@
+@@ -43120,42 +40567,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38690,7 +38841,7 @@
_ACEOF
fi
-@@ -42968,11 +40418,11 @@
+@@ -43169,11 +40609,11 @@
for ac_func in getdents __getdents _lseek __lseek _read __read
do
@@ -38706,7 +38857,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43025,42 +40475,35 @@
+@@ -43226,42 +40666,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38759,7 +38910,7 @@
_ACEOF
fi
-@@ -43073,11 +40516,11 @@
+@@ -43274,11 +40707,11 @@
for ac_func in getdirentries _write __write _fork __fork
do
@@ -38775,7 +38926,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43130,42 +40573,35 @@
+@@ -43331,42 +40764,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38828,7 +38979,7 @@
_ACEOF
fi
-@@ -43179,11 +40615,11 @@
+@@ -43380,11 +40806,11 @@
for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
do
@@ -38844,7 +38995,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43236,42 +40672,35 @@
+@@ -43437,42 +40863,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38897,7 +39048,7 @@
_ACEOF
fi
-@@ -43286,11 +40715,11 @@
+@@ -43487,11 +40906,11 @@
for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
do
@@ -38913,7 +39064,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43343,42 +40772,35 @@
+@@ -43544,42 +40963,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -38966,7 +39117,7 @@
_ACEOF
fi
-@@ -43392,11 +40814,11 @@
+@@ -43593,11 +41005,11 @@
for ac_func in pread _pread __pread pread64 _pread64 __pread64
do
@@ -38982,7 +39133,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43449,42 +40871,35 @@
+@@ -43650,42 +41062,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39035,7 +39186,7 @@
_ACEOF
fi
-@@ -43498,11 +40913,11 @@
+@@ -43699,11 +41104,11 @@
for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
do
@@ -39051,7 +39202,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43555,42 +40970,35 @@
+@@ -43756,42 +41161,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39104,7 +39255,7 @@
_ACEOF
fi
-@@ -43602,11 +41010,11 @@
+@@ -43803,11 +41201,11 @@
for ac_func in open64 _open64 __open64 creat64
do
@@ -39120,7 +39271,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43659,42 +41067,35 @@
+@@ -43860,42 +41258,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39173,7 +39324,7 @@
_ACEOF
fi
-@@ -43703,11 +41104,11 @@
+@@ -43904,11 +41295,11 @@
for ac_func in prctl
do
@@ -39189,7 +39340,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43760,42 +41161,35 @@
+@@ -43961,42 +41352,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39242,7 +39393,7 @@
_ACEOF
fi
-@@ -43827,14 +41221,13 @@
+@@ -44028,14 +41412,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39259,7 +39410,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -43845,7 +41238,7 @@
+@@ -44046,7 +41429,7 @@
_ACEOF
else
@@ -39268,7 +39419,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -43857,16 +41250,14 @@
+@@ -44058,16 +41441,14 @@
#
#
case "$host_os" in
@@ -39289,7 +39440,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43898,32 +41289,29 @@
+@@ -44099,32 +41480,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39328,7 +39479,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -43940,11 +41328,11 @@
+@@ -44141,11 +41519,11 @@
for ac_func in getgrouplist
do
@@ -39344,7 +39495,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -43997,42 +41385,35 @@
+@@ -44198,42 +41576,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39397,7 +39548,7 @@
_ACEOF
fi
-@@ -44046,8 +41427,8 @@
+@@ -44247,8 +41618,8 @@
#
if test x$ac_cv_func_stat64 = xno ; then
@@ -39408,7 +39559,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44074,34 +41455,30 @@
+@@ -44275,34 +41646,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39450,7 +39601,7 @@
if test x$ac_cv_func_stat64 = xyes ; then
cat >>confdefs.h <<\_ACEOF
-@@ -44112,8 +41489,8 @@
+@@ -44313,8 +41680,8 @@
fi
if test x$ac_cv_func_lstat64 = xno ; then
@@ -39461,7 +39612,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44140,34 +41517,30 @@
+@@ -44341,34 +41708,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39503,7 +39654,7 @@
if test x$ac_cv_func_lstat64 = xyes ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LSTAT64 Whether lstat64() is available
-@@ -44177,8 +41550,8 @@
+@@ -44378,8 +41741,8 @@
fi
if test x$ac_cv_func_fstat64 = xno ; then
@@ -39514,7 +39665,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44205,34 +41578,30 @@
+@@ -44406,34 +41769,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39556,10 +39707,60 @@
if test x$ac_cv_func_fstat64 = xyes ; then
cat >>confdefs.h <<\_ACEOF
-@@ -44254,10 +41623,10 @@
+@@ -44455,10 +41814,10 @@
+ # There is some conflicting standards weirdness about whether we should use
# "struct timespec" or "timespec_t". Linux doesn't have timespec_t, so we
# prefer struct timespec.
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has timespec timestamps" >&5
+-$as_echo_n "checking whether struct stat has timespec timestamps... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has timespec timestamps" >&5
++echo $ECHO_N "checking whether struct stat has timespec timestamps... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_timespec_hires+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -44502,21 +41861,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ samba_cv_stat_timespec_hires=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ samba_cv_stat_timespec_hires=no
+@@ -44525,8 +41883,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_timespec_hires" >&5
+-$as_echo "$samba_cv_stat_timespec_hires" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_timespec_hires" >&5
++echo "${ECHO_T}$samba_cv_stat_timespec_hires" >&6; }
+
+ if test x"$samba_cv_stat_timespec_hires" = x"yes" ; then
+
+@@ -44553,10 +41911,10 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps" >&5
-$as_echo_n "checking whether struct stat has sub-second timestamps... " >&6; }
+{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps" >&5
@@ -39570,7 +39771,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44304,21 +41673,20 @@
+@@ -44603,21 +41961,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39595,7 +39796,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_stat_hires=no
-@@ -44327,8 +41695,8 @@
+@@ -44626,8 +41983,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39606,21 +39807,21 @@
if test x"$samba_cv_stat_hires" = x"yes" ; then
-@@ -44353,10 +41721,10 @@
+@@ -44652,10 +42009,10 @@
fi
--{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec" >&5
--$as_echo_n "checking whether struct stat has sub-second timestamps without struct timespec... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec" >&5
-+echo $ECHO_N "checking whether struct stat has sub-second timestamps without struct timespec... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec suffixed nsec" >&5
+-$as_echo_n "checking whether struct stat has sub-second timestamps without struct timespec suffixed nsec... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec suffixed nsec" >&5
++echo $ECHO_N "checking whether struct stat has sub-second timestamps without struct timespec suffixed nsec... $ECHO_C" >&6; }
if test "${samba_cv_stat_hires_notimespec+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44403,21 +41771,20 @@
+@@ -44702,21 +42059,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39638,14 +39839,14 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- samba_cv_stat_hires=yes
+ samba_cv_stat_hires_notimespec=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- samba_cv_stat_hires=no
-@@ -44426,8 +41793,8 @@
+ samba_cv_stat_hires_notimespec=no
+@@ -44725,8 +42081,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39656,10 +39857,110 @@
if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
-@@ -44452,10 +41819,10 @@
+@@ -44751,10 +42107,10 @@
fi
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec suffixed _n" >&5
+-$as_echo_n "checking whether struct stat has sub-second timestamps without struct timespec suffixed _n... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps without struct timespec suffixed _n" >&5
++echo $ECHO_N "checking whether struct stat has sub-second timestamps without struct timespec suffixed _n... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_hires_notimespec_n+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -44801,21 +42157,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ samba_cv_stat_hires_notimespec_n=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ samba_cv_stat_hires_notimespec_n=no
+@@ -44824,8 +42179,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_hires_notimespec_n" >&5
+-$as_echo "$samba_cv_stat_hires_notimespec_n" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_hires_notimespec_n" >&5
++echo "${ECHO_T}$samba_cv_stat_hires_notimespec_n" >&6; }
+
+ if test x"$samba_cv_stat_hires_notimespec_n" = x"yes" ; then
+
+@@ -44850,10 +42205,10 @@
+
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps in st_uXtime" >&5
+-$as_echo_n "checking whether struct stat has sub-second timestamps in st_uXtime... " >&6; }
++{ echo "$as_me:$LINENO: checking whether struct stat has sub-second timestamps in st_uXtime" >&5
++echo $ECHO_N "checking whether struct stat has sub-second timestamps in st_uXtime... $ECHO_C" >&6; }
+ if test "${samba_cv_stat_hires_uxtime+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -44900,21 +42255,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ samba_cv_stat_hires_uxtime=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ samba_cv_stat_hires_uxtime=no
+@@ -44923,8 +42277,8 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_hires_uxtime" >&5
+-$as_echo "$samba_cv_stat_hires_uxtime" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_stat_hires_uxtime" >&5
++echo "${ECHO_T}$samba_cv_stat_hires_uxtime" >&6; }
+
+ if test x"$samba_cv_stat_hires_uxtime" = x"yes" ; then
+
+@@ -44949,10 +42303,10 @@
+
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking whether struct stat has st_birthtimespec" >&5
-$as_echo_n "checking whether struct stat has st_birthtimespec... " >&6; }
+{ echo "$as_me:$LINENO: checking whether struct stat has st_birthtimespec" >&5
@@ -39670,7 +39971,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44497,21 +41864,20 @@
+@@ -44994,21 +42348,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39694,8 +39995,8 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- samba_cv_stat_birthtimespec=no
-@@ -44520,8 +41886,8 @@
+ samba_cv_stat_st_birthtimespec=no
+@@ -45017,8 +42370,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39706,7 +40007,7 @@
if test x"$samba_cv_stat_st_birthtimespec" = x"yes" ; then
-@@ -44531,10 +41897,10 @@
+@@ -45028,10 +42381,10 @@
fi
@@ -39720,7 +40021,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44576,21 +41942,20 @@
+@@ -45073,21 +42426,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39744,8 +40045,8 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- samba_cv_stat_birthtimensec=no
-@@ -44599,8 +41964,8 @@
+ samba_cv_stat_st_birthtimensec=no
+@@ -45096,8 +42448,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39756,7 +40057,7 @@
if test x"$samba_cv_stat_st_birthtimensec" = x"yes" ; then
-@@ -44610,10 +41975,10 @@
+@@ -45107,10 +42459,10 @@
fi
@@ -39770,7 +40071,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44655,21 +42020,20 @@
+@@ -45152,21 +42504,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39794,8 +40095,8 @@
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- samba_cv_stat_birthtime=no
-@@ -44678,8 +42042,8 @@
+ samba_cv_stat_st_birthtime=no
+@@ -45175,8 +42526,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -39806,7 +40107,7 @@
if test x"$samba_cv_stat_st_birthtime" = x"yes" ; then
-@@ -44692,10 +42056,10 @@
+@@ -45189,10 +42540,10 @@
#####################################
# needed for SRV lookups
@@ -39820,7 +40121,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $LIBS"
-@@ -44727,37 +42091,33 @@
+@@ -45224,37 +42575,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39866,7 +40167,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
_ACEOF
-@@ -44767,10 +42127,10 @@
+@@ -45264,10 +42611,10 @@
fi
@@ -39880,7 +40181,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $LIBS"
-@@ -44802,37 +42162,33 @@
+@@ -45299,37 +42646,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39926,7 +40227,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
_ACEOF
-@@ -44842,10 +42198,10 @@
+@@ -45339,10 +42682,10 @@
fi
@@ -39940,7 +40241,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $LIBS"
-@@ -44877,37 +42233,33 @@
+@@ -45374,37 +42717,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -39986,7 +40287,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
_ACEOF
-@@ -44927,11 +42279,11 @@
+@@ -45424,11 +42763,11 @@
for ac_func in putprpwnam
do
@@ -40002,7 +40303,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -44984,42 +42336,35 @@
+@@ -45481,42 +42820,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40055,7 +40356,7 @@
_ACEOF
# putprpwnam was found in libc or existing $LIBS
-@@ -45044,10 +42389,10 @@
+@@ -45541,10 +42873,10 @@
;;
*)
# putprpwnam was not found, try adding libsecurity
@@ -40069,7 +40370,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsecurity $LIBS"
-@@ -45079,37 +42424,33 @@
+@@ -45576,37 +42908,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40115,7 +40416,7 @@
LIBS="-lsecurity $LIBS"
-@@ -45141,11 +42482,11 @@
+@@ -45638,11 +42966,11 @@
for ac_func in putprpwnam
do
@@ -40131,7 +40432,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -45198,42 +42539,35 @@
+@@ -45695,42 +43023,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40184,7 +40485,7 @@
_ACEOF
# putprpwnam was found in libc or existing $LIBS
-@@ -45258,10 +42592,10 @@
+@@ -45755,10 +43076,10 @@
;;
*)
# putprpwnam was not found, try adding libsec
@@ -40198,7 +40499,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsec $LIBS"
-@@ -45293,37 +42627,33 @@
+@@ -45790,37 +43111,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40244,7 +40545,7 @@
LIBS="-lsec $LIBS"
-@@ -45356,11 +42686,11 @@
+@@ -45853,11 +43170,11 @@
for ac_func in set_auth_parameters
do
@@ -40260,7 +40561,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -45413,42 +42743,35 @@
+@@ -45910,42 +43227,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40313,7 +40614,7 @@
_ACEOF
# set_auth_parameters was found in libc or existing $LIBS
-@@ -45473,10 +42796,10 @@
+@@ -45970,10 +43280,10 @@
;;
*)
# set_auth_parameters was not found, try adding libsecurity
@@ -40327,7 +40628,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsecurity $LIBS"
-@@ -45508,37 +42831,33 @@
+@@ -46005,37 +43315,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40373,7 +40674,7 @@
LIBS="-lsecurity $LIBS"
-@@ -45570,11 +42889,11 @@
+@@ -46067,11 +43373,11 @@
for ac_func in set_auth_parameters
do
@@ -40389,7 +40690,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -45627,42 +42946,35 @@
+@@ -46124,42 +43430,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40442,7 +40743,7 @@
_ACEOF
# set_auth_parameters was found in libc or existing $LIBS
-@@ -45687,10 +42999,10 @@
+@@ -46184,10 +43483,10 @@
;;
*)
# set_auth_parameters was not found, try adding libsec
@@ -40456,7 +40757,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsec $LIBS"
-@@ -45722,37 +43034,33 @@
+@@ -46219,37 +43518,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40502,7 +40803,7 @@
LIBS="-lsec $LIBS"
-@@ -45786,11 +43094,11 @@
+@@ -46283,11 +43578,11 @@
for ac_func in getspnam
do
@@ -40518,7 +40819,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -45843,42 +43151,35 @@
+@@ -46340,42 +43635,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40571,7 +40872,7 @@
_ACEOF
# getspnam was found in libc or existing $LIBS
-@@ -45903,10 +43204,10 @@
+@@ -46400,10 +43688,10 @@
;;
*)
# getspnam was not found, try adding libgen
@@ -40585,7 +40886,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgen $LIBS"
-@@ -45938,37 +43239,33 @@
+@@ -46435,37 +43723,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40631,7 +40932,7 @@
LIBS="-lgen $LIBS"
-@@ -46001,11 +43298,11 @@
+@@ -46498,11 +43782,11 @@
for ac_func in getspnam
do
@@ -40647,7 +40948,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -46058,42 +43355,35 @@
+@@ -46555,42 +43839,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40700,7 +41001,7 @@
_ACEOF
# getspnam was found in libc or existing $LIBS
-@@ -46118,10 +43408,10 @@
+@@ -46615,10 +43892,10 @@
;;
*)
# getspnam was not found, try adding libsecurity
@@ -40714,7 +41015,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsecurity $LIBS"
-@@ -46153,37 +43443,33 @@
+@@ -46650,37 +43927,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40760,7 +41061,7 @@
LIBS="-lsecurity $LIBS"
-@@ -46215,11 +43501,11 @@
+@@ -46712,11 +43985,11 @@
for ac_func in getspnam
do
@@ -40776,7 +41077,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -46272,42 +43558,35 @@
+@@ -46769,42 +44042,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40829,7 +41130,7 @@
_ACEOF
# getspnam was found in libc or existing $LIBS
-@@ -46332,10 +43611,10 @@
+@@ -46829,10 +44095,10 @@
;;
*)
# getspnam was not found, try adding libsec
@@ -40843,7 +41144,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsec $LIBS"
-@@ -46367,37 +43646,33 @@
+@@ -46864,37 +44130,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40889,7 +41190,7 @@
LIBS="-lsec $LIBS"
-@@ -46430,11 +43705,11 @@
+@@ -46927,11 +44189,11 @@
for ac_func in bigcrypt
do
@@ -40905,7 +41206,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -46487,42 +43762,35 @@
+@@ -46984,42 +44246,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -40958,7 +41259,7 @@
_ACEOF
# bigcrypt was found in libc or existing $LIBS
-@@ -46547,10 +43815,10 @@
+@@ -47044,10 +44299,10 @@
;;
*)
# bigcrypt was not found, try adding libsecurity
@@ -40972,7 +41273,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsecurity $LIBS"
-@@ -46582,37 +43850,33 @@
+@@ -47079,37 +44334,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41018,7 +41319,7 @@
LIBS="-lsecurity $LIBS"
-@@ -46644,11 +43908,11 @@
+@@ -47141,11 +44392,11 @@
for ac_func in bigcrypt
do
@@ -41034,7 +41335,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -46701,42 +43965,35 @@
+@@ -47198,42 +44449,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41087,7 +41388,7 @@
_ACEOF
# bigcrypt was found in libc or existing $LIBS
-@@ -46761,10 +44018,10 @@
+@@ -47258,10 +44502,10 @@
;;
*)
# bigcrypt was not found, try adding libsec
@@ -41101,7 +41402,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsec $LIBS"
-@@ -46796,37 +44053,33 @@
+@@ -47293,37 +44537,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41147,7 +41448,7 @@
LIBS="-lsec $LIBS"
-@@ -46859,11 +44112,11 @@
+@@ -47356,11 +44596,11 @@
for ac_func in getprpwnam
do
@@ -41163,7 +41464,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -46916,42 +44169,35 @@
+@@ -47413,42 +44653,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41216,7 +41517,7 @@
_ACEOF
# getprpwnam was found in libc or existing $LIBS
-@@ -46976,10 +44222,10 @@
+@@ -47473,10 +44706,10 @@
;;
*)
# getprpwnam was not found, try adding libsecurity
@@ -41230,7 +41531,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsecurity $LIBS"
-@@ -47011,37 +44257,33 @@
+@@ -47508,37 +44741,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41276,7 +41577,7 @@
LIBS="-lsecurity $LIBS"
-@@ -47073,11 +44315,11 @@
+@@ -47570,11 +44799,11 @@
for ac_func in getprpwnam
do
@@ -41292,7 +41593,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47130,42 +44372,35 @@
+@@ -47627,42 +44856,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41345,7 +41646,7 @@
_ACEOF
# getprpwnam was found in libc or existing $LIBS
-@@ -47190,10 +44425,10 @@
+@@ -47687,10 +44909,10 @@
;;
*)
# getprpwnam was not found, try adding libsec
@@ -41359,7 +41660,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsec $LIBS"
-@@ -47225,37 +44460,33 @@
+@@ -47722,37 +44944,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41405,7 +41706,7 @@
LIBS="-lsec $LIBS"
-@@ -47287,11 +44518,11 @@
+@@ -47784,11 +45002,11 @@
for ac_func in strsignal
do
@@ -41421,7 +41722,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47344,42 +44575,35 @@
+@@ -47841,42 +45059,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41474,7 +41775,7 @@
_ACEOF
fi
-@@ -47390,10 +44614,10 @@
+@@ -47887,10 +45098,10 @@
# Check if we have libattr
case "$host_os" in
*osf*)
@@ -41488,7 +41789,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -47431,30 +44655,26 @@
+@@ -47928,30 +45139,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41524,7 +41825,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_getproplist+set}" = set; then
-@@ -47469,8 +44689,8 @@
+@@ -47966,8 +45173,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -41535,7 +41836,7 @@
ac_res=$ac_cv_search_getproplist
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -47483,11 +44703,11 @@
+@@ -47980,11 +45187,11 @@
for ac_func in getproplist fgetproplist setproplist fsetproplist
do
@@ -41551,7 +41852,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47540,42 +44760,35 @@
+@@ -48037,42 +45244,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41604,7 +41905,7 @@
_ACEOF
fi
-@@ -47587,11 +44800,11 @@
+@@ -48084,11 +45284,11 @@
for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
do
@@ -41620,7 +41921,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47644,42 +44857,35 @@
+@@ -48141,42 +45341,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41673,7 +41974,7 @@
_ACEOF
fi
-@@ -47688,11 +44894,11 @@
+@@ -48185,11 +45378,11 @@
for ac_func in sizeof_proplist_entry
do
@@ -41689,7 +41990,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47745,42 +44951,35 @@
+@@ -48242,42 +45435,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41742,7 +42043,7 @@
_ACEOF
fi
-@@ -47788,10 +44987,10 @@
+@@ -48285,10 +45471,10 @@
;;
*)
@@ -41756,7 +42057,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -47829,30 +45028,26 @@
+@@ -48326,30 +45512,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41792,7 +42093,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_getxattr+set}" = set; then
-@@ -47867,8 +45062,8 @@
+@@ -48364,8 +45546,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -41803,7 +42104,7 @@
ac_res=$ac_cv_search_getxattr
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -47882,11 +45077,11 @@
+@@ -48379,11 +45561,11 @@
for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
do
@@ -41819,7 +42120,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -47939,42 +45134,35 @@
+@@ -48436,42 +45618,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41872,7 +42173,7 @@
_ACEOF
fi
-@@ -47988,11 +45176,11 @@
+@@ -48485,11 +45660,11 @@
for ac_func in getea fgetea lgetea listea flistea llistea
do
@@ -41888,7 +42189,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48045,42 +45233,35 @@
+@@ -48542,42 +45717,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -41941,7 +42242,7 @@
_ACEOF
fi
-@@ -48094,11 +45275,11 @@
+@@ -48591,11 +45759,11 @@
for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
do
@@ -41957,7 +42258,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48151,42 +45332,35 @@
+@@ -48648,42 +45816,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42010,7 +42311,7 @@
_ACEOF
fi
-@@ -48198,11 +45372,11 @@
+@@ -48695,11 +45856,11 @@
for ac_func in flistxattr removexattr lremovexattr fremovexattr
do
@@ -42026,7 +42327,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48255,42 +45429,35 @@
+@@ -48752,42 +45913,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42079,7 +42380,7 @@
_ACEOF
fi
-@@ -48301,11 +45468,11 @@
+@@ -48798,11 +45952,11 @@
for ac_func in setxattr lsetxattr fsetxattr
do
@@ -42095,7 +42396,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48358,42 +45525,35 @@
+@@ -48855,42 +46009,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42148,7 +42449,7 @@
_ACEOF
fi
-@@ -48405,11 +45565,11 @@
+@@ -48902,11 +46049,11 @@
for ac_func in attr_get attr_list attr_set attr_remove
do
@@ -42164,7 +42465,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48462,42 +45622,35 @@
+@@ -48959,42 +46106,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42217,7 +42518,7 @@
_ACEOF
fi
-@@ -48509,11 +45662,11 @@
+@@ -49006,11 +46146,11 @@
for ac_func in attr_getf attr_listf attr_setf attr_removef
do
@@ -42233,7 +42534,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48566,42 +45719,35 @@
+@@ -49063,42 +46203,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42286,7 +42587,7 @@
_ACEOF
fi
-@@ -48617,11 +45763,11 @@
+@@ -49114,11 +46247,11 @@
for ac_func in attropen
do
@@ -42302,7 +42603,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48674,42 +45820,35 @@
+@@ -49171,42 +46304,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42355,7 +42656,7 @@
_ACEOF
fi
-@@ -48721,10 +45860,10 @@
+@@ -49218,10 +46344,10 @@
########################################################
# Do xattr functions take additional options like on Darwin?
if test x"$ac_cv_func_getxattr" = x"yes" ; then
@@ -42369,7 +42670,7 @@
else
old_LIBS=$LIBS
-@@ -48759,21 +45898,20 @@
+@@ -49256,21 +46382,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42394,7 +42695,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
-@@ -48782,8 +45920,8 @@
+@@ -49279,8 +46404,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -42405,7 +42706,7 @@
if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -48808,11 +45946,11 @@
+@@ -49305,11 +46430,11 @@
for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
do
@@ -42421,7 +42722,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48865,42 +46003,35 @@
+@@ -49362,42 +46487,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42474,7 +42775,7 @@
_ACEOF
fi
-@@ -48911,11 +46042,11 @@
+@@ -49408,11 +46526,11 @@
for ac_func in extattr_get_fd extattr_get_file extattr_get_link
do
@@ -42490,7 +42791,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -48968,42 +46099,35 @@
+@@ -49465,42 +46583,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42543,7 +42844,7 @@
_ACEOF
fi
-@@ -49014,11 +46138,11 @@
+@@ -49511,11 +46622,11 @@
for ac_func in extattr_list_fd extattr_list_file extattr_list_link
do
@@ -42559,7 +42860,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -49071,42 +46195,35 @@
+@@ -49568,42 +46679,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42612,7 +42913,7 @@
_ACEOF
fi
-@@ -49117,11 +46234,11 @@
+@@ -49614,11 +46718,11 @@
for ac_func in extattr_set_fd extattr_set_file extattr_set_link
do
@@ -42628,7 +42929,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -49174,42 +46291,35 @@
+@@ -49671,42 +46775,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -42681,7 +42982,7 @@
_ACEOF
fi
-@@ -49275,10 +46385,10 @@
+@@ -49772,10 +46869,10 @@
if test "x$enable_pie" != xno
then
@@ -42695,7 +42996,7 @@
else
cat > conftest.c <<EOF
-@@ -49289,7 +46399,7 @@
+@@ -49786,7 +46883,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -42704,7 +43005,7 @@
(exit $ac_status); }; }
then
samba_cv_fpie=yes
-@@ -49299,8 +46409,8 @@
+@@ -49796,8 +46893,8 @@
rm -f conftest*
fi
@@ -42715,7 +43016,7 @@
if test x"${samba_cv_fpie}" = x"yes"
then
PIE_CFLAGS="-fPIE"
-@@ -49318,10 +46428,10 @@
+@@ -49815,10 +46912,10 @@
if test "x$enable_relro" != xno
then
@@ -42729,7 +43030,7 @@
else
cat > conftest.c <<EOF
-@@ -49332,7 +46442,7 @@
+@@ -49829,7 +46926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -42738,7 +43039,7 @@
(exit $ac_status); }; }
then
samba_cv_relro=yes
-@@ -49342,8 +46452,8 @@
+@@ -49839,8 +46936,8 @@
rm -f conftest*
fi
@@ -42749,7 +43050,7 @@
if test x"${samba_cv_relro}" = x"yes"
then
RELRO_LDFLAGS="-Wl,-z,relro"
-@@ -49371,16 +46481,19 @@
+@@ -49868,16 +46965,19 @@
# You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
@@ -42773,7 +43074,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -49640,10 +46753,10 @@
+@@ -50137,10 +47237,10 @@
;;
*dgux*) # Extract the first word of "groff", so it can be a program name with args.
set dummy groff; ac_word=$2
@@ -42787,7 +43088,7 @@
else
if test -n "$ROFF"; then
ac_cv_prog_ROFF="$ROFF" # Let the user override the test.
-@@ -49656,7 +46769,7 @@
+@@ -50153,7 +47253,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ROFF="groff -etpsR -Tascii -man"
@@ -42796,7 +43097,7 @@
break 2
fi
done
-@@ -49667,11 +46780,11 @@
+@@ -50164,11 +47264,11 @@
fi
ROFF=$ac_cv_prog_ROFF
if test -n "$ROFF"; then
@@ -42812,7 +43113,7 @@
fi
-@@ -49777,54 +46890,54 @@
+@@ -50274,54 +47374,54 @@
LDFLAGS="$LDFLAGS -L./bin"
fi
@@ -42907,7 +43208,7 @@
else
# try building a trivial shared library
-@@ -49839,8 +46952,8 @@
+@@ -50336,8 +47436,8 @@
fi
@@ -42918,7 +43219,7 @@
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
fi
-@@ -49855,10 +46968,10 @@
+@@ -50352,10 +47452,10 @@
SHLIBEXT="shared_libraries_disabled"
fi
@@ -42933,7 +43234,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -49899,10 +47012,10 @@
+@@ -50396,10 +47496,10 @@
################
@@ -42947,7 +43248,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -49923,85 +47036,47 @@
+@@ -50420,168 +47520,62 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43000,12 +43301,9 @@
- { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
-$as_echo_n "checking for intptr_t... " >&6; }
-+ { echo "$as_me:$LINENO: checking for intptr_t" >&5
-+echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_intptr_t+set}" = set; then
+-if test "${ac_cv_type_intptr_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-else
- ac_cv_type_intptr_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -43041,10 +43339,85 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof ((intptr_t)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_intptr_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-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_intptr_t" >&5
+-$as_echo "$ac_cv_type_intptr_t" >&6; }
+-if test "x$ac_cv_type_intptr_t" = x""yes; then
+- :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define intptr_t unsigned long long
+-_ACEOF
+-
+-fi
+-
+-else
+- { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
+-$as_echo_n "checking for intptr_t... " >&6; }
++ { echo "$as_me:$LINENO: checking for intptr_t" >&5
++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_type_intptr_t=no
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50009,11 +47084,14 @@
+ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43052,8 +43425,8 @@
int
main ()
{
--if (sizeof ((intptr_t)))
-- return 0;
+-if (sizeof (intptr_t))
+- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
@@ -43061,7 +43434,7 @@
;
return 0;
}
-@@ -50024,39 +47102,30 @@
+@@ -50592,18 +47586,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43079,87 +43452,38 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_intptr_t=yes
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_intptr_t=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
++else
+ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_intptr_t=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
--$as_echo "$ac_cv_type_intptr_t" >&6; }
--if test "x$ac_cv_type_intptr_t" = x""yes; then
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
+if test $ac_cv_type_intptr_t = yes; then
- :
- else
-
-@@ -50067,46 +47136,11 @@
- fi
-
- else
-- { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
--$as_echo_n "checking for intptr_t... " >&6; }
++ :
++else
++
++cat >>confdefs.h <<_ACEOF
++#define intptr_t unsigned long long
++_ACEOF
++
++fi
++
++else
+ { echo "$as_me:$LINENO: checking for intptr_t" >&5
+echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_intptr_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
++if test "${ac_cv_type_intptr_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_type_intptr_t=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--if (sizeof (intptr_t))
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
++else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50114,11 +47148,14 @@
+@@ -50611,11 +47632,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -43176,7 +43500,7 @@
;
return 0;
}
-@@ -50129,39 +47166,30 @@
+@@ -50626,39 +47650,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43224,7 +43548,7 @@
:
else
-@@ -50177,10 +47205,10 @@
+@@ -50674,10 +47689,10 @@
# Check if the compiler supports the LL prefix on long long integers.
# AIX needs this.
@@ -43238,7 +43562,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -50204,21 +47232,20 @@
+@@ -50701,21 +47716,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43263,7 +43587,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_compiler_supports_ll=no
-@@ -50226,8 +47253,8 @@
+@@ -50723,8 +47737,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -43274,7 +43598,7 @@
if test x"$samba_cv_compiler_supports_ll" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50237,10 +47264,10 @@
+@@ -50734,10 +47748,10 @@
fi
@@ -43288,7 +43612,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50261,39 +47288,36 @@
+@@ -50758,39 +47772,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43336,7 +43660,7 @@
if test x"$samba_cv_SIZEOF_TIME_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50302,10 +47326,10 @@
+@@ -50799,10 +47810,10 @@
fi
@@ -43350,7 +43674,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50327,39 +47351,36 @@
+@@ -50824,39 +47835,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43398,7 +43722,7 @@
if test x"$samba_cv_SIZEOF_OFF_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50368,10 +47389,10 @@
+@@ -50865,10 +47873,10 @@
fi
@@ -43412,7 +43736,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50397,39 +47418,36 @@
+@@ -50894,39 +47902,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43460,7 +43784,7 @@
if test x"$samba_cv_HAVE_OFF64_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50438,10 +47456,10 @@
+@@ -50935,10 +47940,10 @@
fi
@@ -43474,7 +43798,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50467,39 +47485,36 @@
+@@ -50964,39 +47969,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43522,7 +43846,7 @@
if test x"$samba_cv_SIZEOF_INO_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50508,10 +47523,10 @@
+@@ -51005,10 +48007,10 @@
fi
@@ -43536,7 +43860,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50537,39 +47552,36 @@
+@@ -51034,39 +48036,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43584,7 +43908,7 @@
if test x"$samba_cv_HAVE_INO64_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50578,10 +47590,10 @@
+@@ -51075,10 +48074,10 @@
fi
@@ -43598,7 +43922,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50607,39 +47619,36 @@
+@@ -51104,39 +48103,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43646,7 +43970,7 @@
if test x"$samba_cv_SIZEOF_DEV_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50648,10 +47657,10 @@
+@@ -51145,10 +48141,10 @@
fi
@@ -43660,7 +43984,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50677,39 +47686,36 @@
+@@ -51174,39 +48170,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43708,7 +44032,7 @@
if test x"$samba_cv_HAVE_DEV64_T" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50718,10 +47724,10 @@
+@@ -51215,10 +48208,10 @@
fi
@@ -43722,7 +44046,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -50750,21 +47756,20 @@
+@@ -51247,21 +48240,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43747,7 +44071,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_STRUCT_DIR64=no
-@@ -50772,8 +47777,8 @@
+@@ -51269,8 +48261,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -43758,7 +44082,7 @@
if test x"$samba_cv_HAVE_STRUCT_DIR64" = x"yes" && test x"$ac_cv_func_readdir64" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50782,10 +47787,10 @@
+@@ -51279,10 +48271,10 @@
fi
@@ -43772,7 +44096,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -50814,21 +47819,20 @@
+@@ -51311,21 +48303,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43797,7 +44121,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_STRUCT_DIRENT64=no
-@@ -50836,8 +47840,8 @@
+@@ -51333,8 +48324,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -43808,7 +44132,7 @@
if test x"$samba_cv_HAVE_STRUCT_DIRENT64" = x"yes" && test x"$ac_cv_func_readdir64" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50846,10 +47850,10 @@
+@@ -51343,10 +48334,10 @@
fi
@@ -43822,7 +44146,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50874,39 +47878,36 @@
+@@ -51371,39 +48362,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43870,7 +44194,7 @@
if test x"$samba_cv_HAVE_DEVICE_MAJOR_FN" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50915,10 +47916,10 @@
+@@ -51412,10 +48400,10 @@
fi
@@ -43884,7 +44208,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -50943,39 +47944,36 @@
+@@ -51440,39 +48428,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43932,7 +44256,7 @@
if test x"$samba_cv_HAVE_DEVICE_MINOR_FN" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50984,10 +47982,10 @@
+@@ -51481,10 +48466,10 @@
fi
@@ -43946,7 +44270,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -51012,39 +48010,36 @@
+@@ -51509,39 +48494,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -43994,7 +44318,7 @@
if test x"$samba_cv_HAVE_MAKEDEV" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -51053,10 +48048,10 @@
+@@ -51550,10 +48532,10 @@
fi
@@ -44008,7 +44332,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -51077,39 +48072,36 @@
+@@ -51574,39 +48556,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44056,7 +44380,7 @@
if test x"$samba_cv_HAVE_UNSIGNED_CHAR" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -51118,10 +48110,10 @@
+@@ -51615,10 +48594,10 @@
fi
@@ -44070,7 +44394,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51147,21 +48139,20 @@
+@@ -51644,21 +48623,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44095,7 +44419,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_SEEKDIR_RETURNS_VOID=no
-@@ -51169,8 +48160,8 @@
+@@ -51666,8 +48644,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -44106,7 +44430,7 @@
if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -51179,10 +48170,10 @@
+@@ -51676,10 +48654,10 @@
fi
@@ -44120,7 +44444,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51206,21 +48197,20 @@
+@@ -51703,21 +48681,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44145,7 +44469,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_FUNCTION_MACRO=no
-@@ -51228,8 +48218,8 @@
+@@ -51725,8 +48702,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -44156,7 +44480,7 @@
if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -51238,10 +48228,10 @@
+@@ -51735,10 +48712,10 @@
fi
@@ -44170,7 +44494,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51267,35 +48257,31 @@
+@@ -51764,35 +48741,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44213,7 +44537,7 @@
if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -51315,11 +48301,11 @@
+@@ -51812,11 +48785,11 @@
for ac_func in clock_gettime
do
@@ -44229,7 +44553,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -51372,42 +48358,35 @@
+@@ -51869,42 +48842,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44282,7 +44606,7 @@
_ACEOF
# clock_gettime was found in libc or existing $LIBS
-@@ -51419,8 +48398,8 @@
+@@ -51916,8 +48882,8 @@
_ACEOF
@@ -44293,7 +44617,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51455,24 +48434,21 @@
+@@ -51952,24 +48918,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44324,7 +44648,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_MONOTONIC 1
-@@ -51480,22 +48456,21 @@
+@@ -51977,22 +48940,21 @@
else
@@ -44352,7 +44676,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51530,24 +48505,21 @@
+@@ -52027,24 +48989,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44383,7 +44707,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_PROCESS_CPUTIME_ID 1
-@@ -51555,22 +48527,21 @@
+@@ -52052,22 +49011,21 @@
else
@@ -44411,7 +44735,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51605,24 +48576,21 @@
+@@ -52102,24 +49060,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44442,7 +44766,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_REALTIME 1
-@@ -51630,16 +48598,15 @@
+@@ -52127,16 +49082,15 @@
else
@@ -44462,7 +44786,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -51659,10 +48626,10 @@
+@@ -52156,10 +49110,10 @@
;;
*)
# clock_gettime was not found, try adding librt
@@ -44476,7 +44800,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-@@ -51694,37 +48661,33 @@
+@@ -52191,37 +49145,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44522,7 +44846,7 @@
LIBS="-lrt $LIBS"
-@@ -51735,8 +48698,8 @@
+@@ -52232,8 +49182,8 @@
_ACEOF
@@ -44533,7 +44857,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51771,24 +48734,21 @@
+@@ -52268,24 +49218,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44564,7 +44888,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_MONOTONIC 1
-@@ -51796,22 +48756,21 @@
+@@ -52293,22 +49240,21 @@
else
@@ -44592,7 +44916,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51846,24 +48805,21 @@
+@@ -52343,24 +49289,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44623,7 +44947,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_PROCESS_CPUTIME_ID 1
-@@ -51871,22 +48827,21 @@
+@@ -52368,22 +49311,21 @@
else
@@ -44651,7 +44975,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51921,24 +48876,21 @@
+@@ -52418,24 +49360,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44682,7 +45006,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CLOCK_REALTIME 1
-@@ -51946,16 +48898,15 @@
+@@ -52443,16 +49382,15 @@
else
@@ -44702,7 +45026,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -51982,10 +48933,10 @@
+@@ -52479,10 +49417,10 @@
fi
@@ -44716,7 +45040,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -52009,39 +48960,36 @@
+@@ -52506,39 +49444,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44764,7 +45088,7 @@
if test x"$samba_cv_HAVE_BROKEN_READDIR_NAME" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52050,10 +48998,10 @@
+@@ -52547,10 +49482,10 @@
fi
@@ -44778,7 +45102,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52078,21 +49026,20 @@
+@@ -52575,21 +49510,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44803,7 +45127,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UTIMBUF=no
-@@ -52100,8 +49047,8 @@
+@@ -52597,8 +49531,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -44814,7 +45138,7 @@
if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52121,11 +49068,11 @@
+@@ -52618,11 +49552,11 @@
for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
do
@@ -44830,7 +45154,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -52178,52 +49125,45 @@
+@@ -52675,52 +49609,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44896,7 +45220,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52248,21 +49188,20 @@
+@@ -52745,21 +49672,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44921,7 +45245,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_NAME=no
-@@ -52270,8 +49209,8 @@
+@@ -52767,8 +49693,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -44932,7 +45256,7 @@
if test x"$samba_cv_HAVE_UT_UT_NAME" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52280,10 +49219,10 @@
+@@ -52777,10 +49703,10 @@
fi
@@ -44946,7 +45270,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52308,21 +49247,20 @@
+@@ -52805,21 +49731,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -44971,7 +45295,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_USER=no
-@@ -52330,8 +49268,8 @@
+@@ -52827,8 +49752,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -44982,7 +45306,7 @@
if test x"$samba_cv_HAVE_UT_UT_USER" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52340,10 +49278,10 @@
+@@ -52837,10 +49762,10 @@
fi
@@ -44996,7 +45320,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52368,21 +49306,20 @@
+@@ -52865,21 +49790,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45021,7 +45345,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_ID=no
-@@ -52390,8 +49327,8 @@
+@@ -52887,8 +49811,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45032,7 +45356,7 @@
if test x"$samba_cv_HAVE_UT_UT_ID" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52400,10 +49337,10 @@
+@@ -52897,10 +49821,10 @@
fi
@@ -45046,7 +45370,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52428,21 +49365,20 @@
+@@ -52925,21 +49849,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45071,7 +45395,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_HOST=no
-@@ -52450,8 +49386,8 @@
+@@ -52947,8 +49870,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45082,7 +45406,7 @@
if test x"$samba_cv_HAVE_UT_UT_HOST" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52460,10 +49396,10 @@
+@@ -52957,10 +49880,10 @@
fi
@@ -45096,7 +45420,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52488,21 +49424,20 @@
+@@ -52985,21 +49908,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45121,7 +45445,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_TIME=no
-@@ -52510,8 +49445,8 @@
+@@ -53007,8 +49929,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45132,7 +45456,7 @@
if test x"$samba_cv_HAVE_UT_UT_TIME" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52520,10 +49455,10 @@
+@@ -53017,10 +49939,10 @@
fi
@@ -45146,7 +45470,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52548,21 +49483,20 @@
+@@ -53045,21 +49967,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45171,7 +45495,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_TV=no
-@@ -52570,8 +49504,8 @@
+@@ -53067,8 +49988,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45182,7 +45506,7 @@
if test x"$samba_cv_HAVE_UT_UT_TV" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52580,10 +49514,10 @@
+@@ -53077,10 +49998,10 @@
fi
@@ -45196,7 +45520,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52608,21 +49542,20 @@
+@@ -53105,21 +50026,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45221,7 +45545,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_TYPE=no
-@@ -52630,8 +49563,8 @@
+@@ -53127,8 +50047,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45232,7 +45556,7 @@
if test x"$samba_cv_HAVE_UT_UT_TYPE" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52640,10 +49573,10 @@
+@@ -53137,10 +50057,10 @@
fi
@@ -45246,7 +45570,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52668,21 +49601,20 @@
+@@ -53165,21 +50085,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45271,7 +45595,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_PID=no
-@@ -52690,8 +49622,8 @@
+@@ -53187,8 +50106,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45282,7 +45606,7 @@
if test x"$samba_cv_HAVE_UT_UT_PID" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52700,10 +49632,10 @@
+@@ -53197,10 +50116,10 @@
fi
@@ -45296,7 +45620,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52728,21 +49660,20 @@
+@@ -53225,21 +50144,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45321,7 +45645,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_EXIT=no
-@@ -52750,8 +49681,8 @@
+@@ -53247,8 +50165,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45332,7 +45656,7 @@
if test x"$samba_cv_HAVE_UT_UT_EXIT" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52760,10 +49691,10 @@
+@@ -53257,10 +50175,10 @@
fi
@@ -45346,7 +45670,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52788,21 +49719,20 @@
+@@ -53285,21 +50203,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45371,7 +45695,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_ADDR_V6=no
-@@ -52810,8 +49740,8 @@
+@@ -53307,8 +50224,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45382,7 +45706,7 @@
if test x"$samba_cv_HAVE_UT_UT_ADDR_V6" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52820,10 +49750,10 @@
+@@ -53317,10 +50234,10 @@
fi
@@ -45396,7 +45720,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52848,21 +49778,20 @@
+@@ -53345,21 +50262,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45421,7 +45745,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UT_UT_ADDR=no
-@@ -52870,8 +49799,8 @@
+@@ -53367,8 +50283,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45432,7 +45756,7 @@
if test x"$samba_cv_HAVE_UT_UT_ADDR" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52881,10 +49810,10 @@
+@@ -53378,10 +50294,10 @@
fi
if test x$ac_cv_func_pututline = xyes ; then
@@ -45446,7 +45770,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52909,21 +49838,20 @@
+@@ -53406,21 +50322,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45471,7 +45795,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_PUTUTLINE_RETURNS_UTMP=no
-@@ -52931,8 +49859,8 @@
+@@ -53428,8 +50343,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45482,7 +45806,7 @@
if test x"$samba_cv_PUTUTLINE_RETURNS_UTMP" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -52942,10 +49870,10 @@
+@@ -53439,10 +50354,10 @@
fi
fi
@@ -45496,7 +45820,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -52970,21 +49898,20 @@
+@@ -53467,21 +50382,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45521,7 +45845,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UX_UT_SYSLEN=no
-@@ -52992,8 +49919,8 @@
+@@ -53489,8 +50403,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -45532,7 +45856,7 @@
if test x"$samba_cv_HAVE_UX_UT_SYSLEN" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -53012,8 +49939,8 @@
+@@ -53509,8 +50423,8 @@
if test "${with_libiconv+set}" = set; then
withval=$with_libiconv;
if test "$withval" = "no" ; then
@@ -45543,7 +45867,7 @@
{ (exit 1); exit 1; }; }
else
if test "$withval" != "yes" ; then
-@@ -53060,8 +49987,8 @@
+@@ -53557,8 +50471,8 @@
export LDFLAGS LIBS CPPFLAGS
# Try to find iconv(3)
@@ -45554,7 +45878,7 @@
jm_cv_func_iconv="no"
jm_cv_lib_iconv=""
jm_cv_giconv=no
-@@ -53092,33 +50019,29 @@
+@@ -53589,33 +50503,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45593,7 +45917,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -53147,32 +50070,28 @@
+@@ -53644,32 +50554,28 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45631,7 +45955,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -53203,34 +50122,30 @@
+@@ -53700,34 +50606,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45671,7 +45995,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -53263,32 +50178,28 @@
+@@ -53760,32 +50662,28 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45709,7 +46033,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$jm_save_LIBS"
-@@ -53320,34 +50231,30 @@
+@@ -53817,34 +50715,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45749,7 +46073,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -53364,8 +50271,8 @@
+@@ -53861,8 +50755,8 @@
#define HAVE_GICONV 1
_ACEOF
@@ -45760,7 +46084,7 @@
ICONV_FOUND=yes
else
if test "$jm_cv_biconv" = yes; then
-@@ -53374,8 +50281,8 @@
+@@ -53871,8 +50765,8 @@
#define HAVE_BICONV 1
_ACEOF
@@ -45771,7 +46095,7 @@
ICONV_FOUND=yes
else
-@@ -53383,14 +50290,14 @@
+@@ -53880,14 +50774,14 @@
#define HAVE_ICONV 1
_ACEOF
@@ -45790,7 +46114,7 @@
fi
if test x"$ICONV_FOUND" = "xyes" ; then
-@@ -53427,8 +50334,8 @@
+@@ -53924,8 +50818,8 @@
# check for default dos charset name
for j in CP850 IBM850 ; do
@@ -45801,7 +46125,7 @@
if test "$cross_compiling" = yes; then
ICONV_CHARSET=cross
else
-@@ -53455,38 +50362,35 @@
+@@ -53952,38 +50846,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45848,7 +46172,7 @@
default_dos_charset="$ICONV_CHARSET"
if test x"$default_dos_charset" = x"$j"; then
-@@ -53497,8 +50401,8 @@
+@@ -53994,8 +50885,8 @@
# check for default display charset name
for j in ASCII 646 ; do
@@ -45859,7 +46183,7 @@
if test "$cross_compiling" = yes; then
ICONV_CHARSET=cross
else
-@@ -53525,38 +50429,35 @@
+@@ -54022,38 +50913,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45906,7 +46230,7 @@
default_display_charset="$ICONV_CHARSET"
if test x"$default_display_charset" = x"$j"; then
-@@ -53567,8 +50468,8 @@
+@@ -54064,8 +50952,8 @@
# check for default unix charset name
for j in UTF-8 UTF8 ; do
@@ -45917,7 +46241,7 @@
if test "$cross_compiling" = yes; then
ICONV_CHARSET=cross
else
-@@ -53595,38 +50496,35 @@
+@@ -54092,38 +50980,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -45964,7 +46288,7 @@
default_unix_charset="$ICONV_CHARSET"
if test x"$default_unix_charset" = x"$j"; then
-@@ -53664,10 +50562,10 @@
+@@ -54161,10 +51046,10 @@
default_display_charset="ASCII"
default_unix_charset="UTF-8"
samba_cv_HAVE_NATIVE_ICONV=yes
@@ -45979,7 +46303,7 @@
fi
if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes" ; then
-@@ -53726,9 +50624,9 @@
+@@ -54223,9 +51108,9 @@
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -45991,7 +46315,7 @@
Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&2;}
cat >>confdefs.h <<_ACEOF
-@@ -53748,10 +50646,10 @@
+@@ -54245,10 +51130,10 @@
fi
@@ -46005,7 +46329,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -53781,39 +50679,36 @@
+@@ -54278,39 +51163,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46053,7 +46377,7 @@
if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -53822,10 +50717,10 @@
+@@ -54319,10 +51201,10 @@
fi
@@ -46067,7 +46391,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -53855,39 +50750,36 @@
+@@ -54352,39 +51234,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46115,7 +46439,7 @@
if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -53896,10 +50788,10 @@
+@@ -54393,10 +51272,10 @@
fi
@@ -46129,7 +46453,7 @@
else
-@@ -53907,21 +50799,20 @@
+@@ -54404,21 +51283,20 @@
for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
do
@@ -46160,7 +46484,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -53937,33 +50828,32 @@
+@@ -54434,33 +51312,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46201,7 +46525,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -53977,52 +50867,51 @@
+@@ -54474,52 +51351,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46275,7 +46599,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -54031,24 +50920,21 @@
+@@ -54528,24 +51404,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -46308,7 +46632,7 @@
_ACEOF
fi
-@@ -54058,11 +50944,11 @@
+@@ -54555,11 +51428,11 @@
for ac_func in inotify_init
do
@@ -46324,7 +46648,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -54115,52 +51001,45 @@
+@@ -54612,52 +51485,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46390,7 +46714,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -54184,21 +51063,20 @@
+@@ -54681,21 +51547,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46415,7 +46739,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have___NR_inotify_init_decl=no
-@@ -54206,8 +51084,8 @@
+@@ -54703,8 +51568,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -46426,7 +46750,7 @@
if test x"$ac_cv_have___NR_inotify_init_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -54218,8 +51096,8 @@
+@@ -54715,8 +51580,8 @@
fi
@@ -46437,7 +46761,7 @@
if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then
-@@ -54243,21 +51121,20 @@
+@@ -54740,21 +51605,20 @@
for ac_header in fam.h
do
@@ -46468,7 +46792,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54273,33 +51150,32 @@
+@@ -54770,33 +51634,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46509,7 +46833,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54313,52 +51189,51 @@
+@@ -54810,52 +51673,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46583,7 +46907,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -54367,24 +51242,21 @@
+@@ -54864,24 +51726,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -46616,7 +46940,7 @@
_ACEOF
samba_cv_HAVE_FAM_H=yes
else
-@@ -54396,10 +51268,10 @@
+@@ -54893,10 +51752,10 @@
if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
# On IRIX, libfam requires libC, but other FAM implementations
# might not need it.
@@ -46630,7 +46954,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lfam $LIBS"
-@@ -54431,37 +51303,33 @@
+@@ -54928,37 +51787,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46676,7 +47000,7 @@
samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
else
samba_cv_HAVE_LIBFAM=no
-@@ -54479,10 +51347,10 @@
+@@ -54976,10 +51831,10 @@
@@ -46690,7 +47014,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -54512,38 +51380,34 @@
+@@ -55009,38 +51864,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46736,7 +47060,7 @@
if test $ac_cv_lib_ext_fam_FAMOpen2 = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_FAMOPEN2 1
-@@ -54588,14 +51452,13 @@
+@@ -55085,14 +51936,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46753,7 +47077,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -54606,7 +51469,7 @@
+@@ -55103,7 +51953,7 @@
_ACEOF
else
@@ -46762,7 +47086,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -54616,8 +51479,8 @@
+@@ -55113,8 +51963,8 @@
fi
if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
@@ -46773,7 +47097,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -54631,10 +51494,10 @@
+@@ -55128,10 +51978,10 @@
samba_dmapi_libs=""
if test x"$samba_dmapi_libs" = x"" ; then
@@ -46787,7 +47111,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldm $LIBS"
-@@ -54666,47 +51529,43 @@
+@@ -55163,47 +52013,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46846,7 +47170,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ljfsdm $LIBS"
-@@ -54738,47 +51597,43 @@
+@@ -55235,47 +52081,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46905,7 +47229,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lxdsm $LIBS"
-@@ -54810,47 +51665,43 @@
+@@ -55307,47 +52149,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -46964,7 +47288,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmapi $LIBS"
-@@ -54882,37 +51733,33 @@
+@@ -55379,37 +52217,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47010,7 +47334,7 @@
samba_dmapi_libs="-ldmapi"
fi
-@@ -54928,21 +51775,20 @@
+@@ -55425,21 +52259,20 @@
for ac_header in sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h
do
@@ -47041,7 +47365,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54958,33 +51804,32 @@
+@@ -55455,33 +52288,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47082,7 +47406,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54998,52 +51843,51 @@
+@@ -55495,52 +52327,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47156,7 +47480,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -55052,24 +51896,21 @@
+@@ -55549,24 +52380,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -47189,7 +47513,7 @@
_ACEOF
fi
-@@ -55126,26 +51967,23 @@
+@@ -55623,26 +52451,23 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47221,7 +47545,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -55154,7 +51992,6 @@
+@@ -55651,7 +52476,6 @@
fi
@@ -47229,7 +47553,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$samba_dmapi_save_LIBS"
-@@ -55163,8 +52000,8 @@
+@@ -55660,8 +52484,8 @@
if test x"$samba_dmapi_libs" = x"" ; then
# DMAPI detection failure actions begin
@@ -47240,7 +47564,7 @@
# DMAPI detection failure actions end
else
-@@ -55175,8 +52012,8 @@
+@@ -55672,8 +52496,8 @@
#define USE_DMAPI 1
_ACEOF
@@ -47251,7 +47575,7 @@
# DMAPI detection success actions end
fi
-@@ -55189,10 +52026,10 @@
+@@ -55686,10 +52510,10 @@
default_shared_modules="$default_shared_modules vfs_tsmsm"
fi
@@ -47265,7 +47589,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -55224,39 +52061,36 @@
+@@ -55721,39 +52545,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47313,7 +47637,7 @@
if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -55266,10 +52100,10 @@
+@@ -55763,10 +52584,10 @@
fi
@@ -47327,7 +47651,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55294,21 +52128,20 @@
+@@ -55791,21 +52612,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47352,7 +47676,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
-@@ -55316,8 +52149,8 @@
+@@ -55813,8 +52633,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47363,7 +47687,7 @@
if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -55330,17 +52163,17 @@
+@@ -55827,17 +52647,17 @@
# Check for POSIX capability support
if test "${ac_cv_header_sys_capability_h+set}" = set; then
@@ -47388,7 +47712,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55356,33 +52189,32 @@
+@@ -55853,33 +52673,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47429,7 +47753,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55396,52 +52228,51 @@
+@@ -55893,52 +52712,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47503,7 +47827,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -55450,18 +52281,18 @@
+@@ -55947,18 +52765,18 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -47528,7 +47852,7 @@
samba_cv_HAVE_SYS_CAPABILITY_H=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -55479,11 +52310,11 @@
+@@ -55976,11 +52794,11 @@
for ac_func in cap_get_proc
do
@@ -47544,7 +47868,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -55536,42 +52367,35 @@
+@@ -56033,42 +52851,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47597,7 +47921,7 @@
_ACEOF
# cap_get_proc was found in libc or existing $LIBS
-@@ -55596,10 +52420,10 @@
+@@ -56093,10 +52904,10 @@
;;
*)
# cap_get_proc was not found, try adding libcap
@@ -47611,7 +47935,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcap $LIBS"
-@@ -55631,37 +52455,33 @@
+@@ -56128,37 +52939,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47657,7 +47981,7 @@
LIBS="-lcap $LIBS"
-@@ -55690,10 +52510,10 @@
+@@ -56187,10 +52994,10 @@
@@ -47671,7 +47995,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -55725,40 +52545,37 @@
+@@ -56222,40 +53029,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47720,7 +48044,7 @@
if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
-@@ -55777,10 +52594,10 @@
+@@ -56274,10 +53078,10 @@
# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
#
@@ -47734,7 +48058,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55807,21 +52624,20 @@
+@@ -56304,21 +53108,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47759,7 +48083,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no
-@@ -55829,8 +52645,8 @@
+@@ -56326,8 +53129,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47770,7 +48094,7 @@
if test x"$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -55839,10 +52655,10 @@
+@@ -56336,10 +53139,10 @@
fi
@@ -47784,7 +48108,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55869,21 +52685,20 @@
+@@ -56366,21 +53169,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47809,7 +48133,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no
-@@ -55891,8 +52706,8 @@
+@@ -56388,8 +53190,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47820,7 +48144,7 @@
if test x"$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -55901,10 +52716,10 @@
+@@ -56398,10 +53200,10 @@
fi
@@ -47834,7 +48158,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55931,21 +52746,20 @@
+@@ -56428,21 +53230,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47859,7 +48183,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
-@@ -55953,8 +52767,8 @@
+@@ -56450,8 +53251,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47870,7 +48194,7 @@
if test x"$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -55963,10 +52777,10 @@
+@@ -56460,10 +53261,10 @@
fi
@@ -47884,7 +48208,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55993,21 +52807,20 @@
+@@ -56490,21 +53291,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47909,7 +48233,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no
-@@ -56015,8 +52828,8 @@
+@@ -56512,8 +53312,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47920,7 +48244,7 @@
if test x"$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -56026,10 +52839,10 @@
+@@ -56523,10 +53323,10 @@
fi
@@ -47934,7 +48258,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -56060,21 +52873,20 @@
+@@ -56557,21 +53357,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -47959,7 +48283,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=yes
-@@ -56082,8 +52894,8 @@
+@@ -56579,8 +53378,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -47970,7 +48294,7 @@
if test x"$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -56092,11 +52904,11 @@
+@@ -56589,11 +53388,11 @@
fi
@@ -47986,7 +48310,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -56112,44 +52924,41 @@
+@@ -56609,44 +53408,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48044,7 +48368,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56169,39 +52978,36 @@
+@@ -56666,39 +53462,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48092,7 +48416,7 @@
if test x"$samba_cv_HAVE_FTRUNCATE_EXTEND" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -56210,10 +53016,10 @@
+@@ -56707,10 +53500,10 @@
fi
@@ -48106,7 +48430,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56233,39 +53039,36 @@
+@@ -56730,39 +53523,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48154,7 +48478,7 @@
if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -56275,10 +53078,10 @@
+@@ -56772,10 +53562,10 @@
fi
@@ -48168,7 +48492,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -56302,36 +53105,32 @@
+@@ -56799,36 +53589,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48212,7 +48536,7 @@
if test x"$samba_cv_SYSCONF_SC_NGROUPS_MAX" = x"yes" ; then
-@@ -56342,10 +53141,10 @@
+@@ -56839,10 +53625,10 @@
fi
@@ -48226,7 +48550,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -56369,36 +53168,32 @@
+@@ -56866,36 +53652,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48270,7 +48594,7 @@
if test x"$samba_cv_SYSCONF_SC_NPROC_ONLN" = x"yes" ; then
-@@ -56409,10 +53204,10 @@
+@@ -56906,10 +53688,10 @@
fi
@@ -48284,7 +48608,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -56436,36 +53231,32 @@
+@@ -56933,36 +53715,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48328,7 +48652,7 @@
if test x"$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" = x"yes" ; then
-@@ -56476,10 +53267,10 @@
+@@ -56973,10 +53751,10 @@
fi
@@ -48342,7 +48666,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -56503,36 +53294,32 @@
+@@ -57000,36 +53778,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48386,7 +48710,7 @@
if test x"$samba_cv_SYSCONF_SC_PAGESIZE" = x"yes" ; then
-@@ -56545,11 +53332,11 @@
+@@ -57042,11 +53816,11 @@
for ac_func in getpagesize
do
@@ -48402,7 +48726,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -56602,42 +53389,35 @@
+@@ -57099,42 +53873,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48455,7 +48779,7 @@
_ACEOF
fi
-@@ -56649,10 +53429,10 @@
+@@ -57146,10 +53913,10 @@
seteuid=no;
if test $seteuid = no; then
@@ -48469,7 +48793,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56676,39 +53456,36 @@
+@@ -57173,39 +53940,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48517,7 +48841,7 @@
if test x"$samba_cv_USE_SETREUID" = x"yes"; then
seteuid=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -56721,10 +53498,10 @@
+@@ -57218,10 +53982,10 @@
# we check for setresuid second as it conflicts with AIO on Linux.
# see http://samba.org/~tridge/junkcode/aio_uid.c
if test $seteuid = no; then
@@ -48531,7 +48855,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56748,39 +53525,36 @@
+@@ -57245,39 +54009,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48579,7 +48903,7 @@
if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
seteuid=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -56791,10 +53565,10 @@
+@@ -57288,10 +54049,10 @@
fi
if test $seteuid = no; then
@@ -48593,7 +48917,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56818,39 +53592,36 @@
+@@ -57315,39 +54076,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48641,7 +48965,7 @@
if test x"$samba_cv_USE_SETEUID" = x"yes"; then
seteuid=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -56861,10 +53632,10 @@
+@@ -57358,10 +54116,10 @@
fi
if test $seteuid = no; then
@@ -48655,7 +48979,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -56888,39 +53659,36 @@
+@@ -57385,39 +54143,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48703,7 +49027,7 @@
if test x"$samba_cv_USE_SETUIDX" = x"yes"; then
seteuid=yes;
cat >>confdefs.h <<\_ACEOF
-@@ -56930,10 +53698,10 @@
+@@ -57427,10 +54182,10 @@
fi
fi
@@ -48717,7 +49041,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -56959,36 +53727,32 @@
+@@ -57456,36 +54211,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48761,7 +49085,7 @@
if test x"$samba_cv_DARWIN_INITGROUPS" = x"yes" ; then
-@@ -56998,10 +53762,10 @@
+@@ -57495,10 +54246,10 @@
fi
@@ -48775,7 +49099,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -57021,39 +53785,36 @@
+@@ -57518,39 +54269,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48823,7 +49147,7 @@
if test x"$samba_cv_HAVE_FCNTL_LOCK" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57062,10 +53823,10 @@
+@@ -57559,10 +54307,10 @@
fi
@@ -48837,7 +49161,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -57085,39 +53846,36 @@
+@@ -57582,39 +54330,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48885,7 +49209,7 @@
if test x"$samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57128,10 +53886,10 @@
+@@ -57625,10 +54370,10 @@
else
@@ -48899,7 +49223,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -57171,39 +53929,36 @@
+@@ -57668,39 +54413,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48947,7 +49271,7 @@
if test x"$samba_cv_HAVE_STRUCT_FLOCK64" = x"yes"; then
-@@ -57214,10 +53969,10 @@
+@@ -57711,10 +54453,10 @@
fi
fi
@@ -48961,7 +49285,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -57243,21 +53998,20 @@
+@@ -57740,21 +54482,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -48986,7 +49310,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_STAT_ST_BLOCKS=no
-@@ -57265,8 +54019,8 @@
+@@ -57762,8 +54503,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -48997,7 +49321,7 @@
if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57275,10 +54029,10 @@
+@@ -57772,10 +54513,10 @@
fi
@@ -49011,7 +49335,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -57304,21 +54058,20 @@
+@@ -57801,21 +54542,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49036,7 +49360,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_STAT_ST_BLKSIZE=no
-@@ -57326,8 +54079,8 @@
+@@ -57823,8 +54563,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -49047,7 +49371,7 @@
if test x"$samba_cv_HAVE_STAT_ST_BLKSIZE" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57336,10 +54089,10 @@
+@@ -57833,10 +54573,10 @@
fi
@@ -49061,7 +49385,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -57365,21 +54118,20 @@
+@@ -57862,21 +54602,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49086,7 +49410,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_STAT_ST_FLAGS=no
-@@ -57388,8 +54140,8 @@
+@@ -57885,8 +54624,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -49097,7 +49421,7 @@
if test x"$samba_cv_HAVE_STAT_ST_FLAGS" = x"yes"; then
-@@ -57399,10 +54151,10 @@
+@@ -57896,10 +54635,10 @@
fi
@@ -49111,7 +49435,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -57431,21 +54183,20 @@
+@@ -57928,21 +54667,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49136,7 +49460,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes
-@@ -57453,8 +54204,8 @@
+@@ -57950,8 +54688,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -49147,7 +49471,7 @@
if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57463,10 +54214,10 @@
+@@ -57960,10 +54698,10 @@
fi
@@ -49161,7 +49485,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -57501,39 +54252,36 @@
+@@ -57998,39 +54736,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49209,7 +49533,7 @@
if test x"$samba_cv_REALPATH_TAKES_NULL" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -57545,25 +54293,25 @@
+@@ -58042,25 +54777,25 @@
#################################################
# check for AFS clear-text auth support
samba_cv_WITH_AFS=no
@@ -49243,7 +49567,7 @@
fi
-@@ -57571,25 +54319,25 @@
+@@ -58068,25 +54803,25 @@
####################################################
# check for Linux-specific AFS fake-kaserver support
samba_cv_WITH_FAKE_KASERVER=no
@@ -49277,7 +49601,7 @@
fi
-@@ -57600,16 +54348,16 @@
+@@ -58097,16 +54832,16 @@
test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
# see if this box has the afs-headers in /usr/include/afs
@@ -49300,7 +49624,7 @@
fi
# check for afs.h
-@@ -57618,21 +54366,20 @@
+@@ -58115,21 +54850,20 @@
for ac_header in afs.h afs/afs.h
do
@@ -49331,7 +49655,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -57648,33 +54395,32 @@
+@@ -58145,33 +54879,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49372,7 +49696,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -57688,52 +54434,51 @@
+@@ -58185,52 +54918,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49446,7 +49770,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -57742,24 +54487,21 @@
+@@ -58239,24 +54971,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -49479,7 +49803,7 @@
_ACEOF
fi
-@@ -57769,11 +54511,11 @@
+@@ -58266,11 +54995,11 @@
if test x"$ac_cv_header_afs_h" = x"no" && test x"$ac_cv_header_afs_afs_h" = x"no"; then
if test x"$samba_cv_WITH_FAKE_KASERVER" = x"auto" ||
test x"$samba_cv_WITH_AFS" = x"auto"; then
@@ -49495,7 +49819,7 @@
{ (exit 1); exit 1; }; }
fi
else
-@@ -57795,25 +54537,25 @@
+@@ -58292,25 +55021,25 @@
#################################################
# check whether to compile AFS/NT ACL mapping module
samba_cv_WITH_VFS_AFSACL=no
@@ -49529,7 +49853,7 @@
fi
-@@ -57832,15 +54574,15 @@
+@@ -58329,15 +55058,15 @@
#################################################
# check for the DFS clear-text auth system
@@ -49549,7 +49873,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_DFS 1
-@@ -57848,13 +54590,13 @@
+@@ -58345,13 +55074,13 @@
;;
*)
@@ -49567,7 +49891,7 @@
fi
-@@ -57863,8 +54605,8 @@
+@@ -58360,8 +55089,8 @@
# Compile with LDAP support?
with_ldap_support=auto
@@ -49578,7 +49902,7 @@
# Check whether --with-ldap was given.
-@@ -57877,8 +54619,8 @@
+@@ -58374,8 +55103,8 @@
fi
@@ -49589,7 +49913,7 @@
SMBLDAP=""
-@@ -57896,21 +54638,20 @@
+@@ -58393,21 +55122,20 @@
for ac_header in ldap.h lber.h
do
@@ -49620,7 +49944,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -57926,33 +54667,32 @@
+@@ -58423,33 +55151,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49661,7 +49985,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -57966,52 +54706,51 @@
+@@ -58463,52 +55190,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49735,7 +50059,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -58020,24 +54759,21 @@
+@@ -58517,24 +55243,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -49768,7 +50092,7 @@
_ACEOF
fi
-@@ -58047,12 +54783,12 @@
+@@ -58544,12 +55267,12 @@
if test x"$ac_cv_header_ldap_h" != x"yes"; then
if test x"$with_ldap_support" = x"yes"; then
@@ -49785,7 +50109,7 @@
fi
with_ldap_support=no
-@@ -58063,54 +54799,18 @@
+@@ -58560,54 +55283,18 @@
# unsigned int in include/includes.h
case $host_os in
*hpux*)
@@ -49847,7 +50171,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -58119,11 +54819,14 @@
+@@ -58616,11 +55303,14 @@
/* end confdefs.h. */
#include <lber.h>
@@ -49864,7 +50188,7 @@
;
return 0;
}
-@@ -58134,47 +54837,38 @@
+@@ -58631,47 +55321,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49883,26 +50207,26 @@
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_ber_tag_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_type_ber_tag_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_type_ber_tag_t=yes
+-
+ ac_cv_type_ber_tag_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ber_tag_t" >&5
-$as_echo "$ac_cv_type_ber_tag_t" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_type_ber_tag_t" >&5
@@ -49923,7 +50247,7 @@
fi
with_ldap_support=no
fi
-@@ -58197,10 +54891,10 @@
+@@ -58694,10 +55375,10 @@
@@ -49937,7 +50261,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58230,38 +54924,34 @@
+@@ -58727,38 +55408,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -49983,7 +50307,7 @@
if test $ac_cv_lib_ext_lber_ber_scanf = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_BER_SCANF 1
-@@ -58296,10 +54986,10 @@
+@@ -58793,10 +55470,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -49997,7 +50321,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58352,35 +55042,31 @@
+@@ -58849,35 +55526,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50040,7 +50364,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ber_sockbuf_add_io = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -58390,10 +55076,10 @@
+@@ -58887,10 +55560,10 @@
fi
@@ -50054,7 +50378,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -58417,21 +55103,20 @@
+@@ -58914,21 +55587,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50079,7 +50403,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_LDAP_OPT_SOCKBUF=no
-@@ -58439,8 +55124,8 @@
+@@ -58936,8 +55608,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -50090,7 +50414,7 @@
if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes" -a \
x"$samba_cv_HAVE_LDAP_OPT_SOCKBUF" = x"yes"; then
-@@ -58454,10 +55139,10 @@
+@@ -58951,10 +55623,10 @@
#######################################################
# if we have LBER_OPT_LOG_PRINT_FN, we can intercept
# ldap logging and print it out in the samba logs
@@ -50104,7 +50428,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58480,21 +55165,20 @@
+@@ -58977,21 +55649,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50129,7 +50453,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=no
-@@ -58502,8 +55186,8 @@
+@@ -58999,8 +55670,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -50140,7 +50464,7 @@
if test x"$samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" = x"yes"; then
-@@ -58524,10 +55208,10 @@
+@@ -59021,10 +55692,10 @@
@@ -50154,7 +50478,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58557,38 +55241,34 @@
+@@ -59054,38 +55725,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50200,7 +50524,7 @@
if test $ac_cv_lib_ext_ldap_ldap_init = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LDAP_INIT 1
-@@ -58623,10 +55303,10 @@
+@@ -59120,10 +55787,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -50214,7 +50538,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58679,35 +55359,31 @@
+@@ -59176,35 +55843,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50257,7 +50581,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ldap_set_rebind_proc = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -58718,10 +55394,10 @@
+@@ -59215,10 +55878,10 @@
LIBS="$LIBS $LDAP_LIBS"
@@ -50271,7 +50595,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -58747,21 +55423,20 @@
+@@ -59244,21 +55907,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50296,7 +50620,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
smb_ldap_cv_ldap_set_rebind_proc=2
-@@ -58771,8 +55446,8 @@
+@@ -59268,8 +55930,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -50307,7 +50631,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -58785,10 +55460,10 @@
+@@ -59282,10 +55944,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -50321,7 +50645,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -58841,35 +55516,31 @@
+@@ -59338,35 +56000,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50364,7 +50688,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ldap_initialize = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -58891,18 +55562,18 @@
+@@ -59388,18 +56046,18 @@
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
with_ldap_support=yes
@@ -50391,7 +50715,7 @@
fi
LDAP_LIBS=""
-@@ -58916,8 +55587,8 @@
+@@ -59413,8 +56071,8 @@
# active directory support
with_ads_support=auto
@@ -50402,7 +50726,7 @@
# Check whether --with-ads was given.
-@@ -58930,8 +55601,8 @@
+@@ -59427,8 +56085,8 @@
fi
@@ -50413,7 +50737,7 @@
FOUND_KRB5=no
KRB5_LIBS=""
-@@ -58939,12 +55610,12 @@
+@@ -59436,12 +56094,12 @@
if test x"$with_ldap_support" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -50430,7 +50754,7 @@
with_ads_support=no
fi
-@@ -58961,10 +55632,10 @@
+@@ -59458,10 +56116,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -50444,7 +50768,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -59017,35 +55688,31 @@
+@@ -59514,35 +56172,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50487,7 +50811,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ldap_init = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -59057,12 +55724,12 @@
+@@ -59554,12 +56208,12 @@
if test x"$ac_cv_func_ext_ldap_init" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -50504,7 +50828,7 @@
with_ads_support=no
fi
fi
-@@ -59073,10 +55740,10 @@
+@@ -59570,10 +56224,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -50518,7 +50842,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -59129,35 +55796,31 @@
+@@ -59626,35 +56280,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50561,7 +50885,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ldap_initialize = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -59169,12 +55832,12 @@
+@@ -59666,12 +56316,12 @@
if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -50578,7 +50902,7 @@
with_ads_support=no
fi
fi
-@@ -59187,10 +55850,10 @@
+@@ -59684,10 +56334,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$LDAP_LIBS $LIBS"
@@ -50592,7 +50916,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -59243,35 +55906,31 @@
+@@ -59740,35 +56390,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50635,7 +50959,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_ldap_add_result_entry = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -59283,12 +55942,12 @@
+@@ -59780,12 +56426,12 @@
if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -50652,7 +50976,7 @@
with_ads_support=no
fi
fi
-@@ -59303,24 +55962,24 @@
+@@ -59800,24 +56446,24 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# check for location of Kerberos 5 install
@@ -50685,7 +51009,7 @@
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
KRB5_LDFLAGS="-L$withval/lib"
-@@ -59331,8 +55990,8 @@
+@@ -59828,8 +56474,8 @@
;;
esac
else
@@ -50696,7 +51020,7 @@
fi
-@@ -59342,10 +56001,10 @@
+@@ -59839,10 +56485,10 @@
# check for krb5-config from recent MIT and Heimdal kerberos 5
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
@@ -50710,7 +51034,7 @@
else
case $KRB5CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -59360,7 +56019,7 @@
+@@ -59857,7 +56503,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -50719,7 +51043,7 @@
break 2
fi
done
-@@ -59372,16 +56031,16 @@
+@@ -59869,16 +56515,16 @@
fi
KRB5CONFIG=$ac_cv_path_KRB5CONFIG
if test -n "$KRB5CONFIG"; then
@@ -50742,7 +51066,7 @@
if test -x "$KRB5CONFIG"; then
ac_save_CFLAGS=$CFLAGS
CFLAGS="";export CFLAGS
-@@ -59394,71 +56053,71 @@
+@@ -59891,71 +56537,71 @@
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
@@ -50838,7 +51162,7 @@
fi
fi
-@@ -59478,21 +56137,20 @@
+@@ -59975,21 +56621,20 @@
for ac_header in krb5.h
do
@@ -50869,7 +51193,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59508,33 +56166,32 @@
+@@ -60005,33 +56650,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50910,7 +51234,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59548,52 +56205,51 @@
+@@ -60045,52 +56689,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -50984,7 +51308,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -59602,24 +56258,21 @@
+@@ -60099,24 +56742,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -51017,7 +51341,7 @@
_ACEOF
fi
-@@ -59633,12 +56286,12 @@
+@@ -60130,12 +56770,12 @@
# i.e with_ads_support = auto, otherwise die with an error.
if test x"$with_ads_support" = x"yes"; then
@@ -51034,7 +51358,7 @@
fi
# Turn off AD support and restore CFLAGS and LIBS variables
-@@ -59652,21 +56305,20 @@
+@@ -60149,21 +56789,20 @@
for ac_header in krb5/locate_plugin.h
do
@@ -51065,7 +51389,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59682,33 +56334,32 @@
+@@ -60179,33 +56818,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51106,7 +51430,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59722,52 +56373,51 @@
+@@ -60219,52 +56857,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51180,7 +51504,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -59776,24 +56426,21 @@
+@@ -60273,24 +56910,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -51213,7 +51537,7 @@
_ACEOF
fi
-@@ -59821,21 +56468,20 @@
+@@ -60318,21 +56952,20 @@
for ac_header in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h
do
@@ -51244,7 +51568,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59851,33 +56497,32 @@
+@@ -60348,33 +56981,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51285,7 +51609,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -59891,52 +56536,51 @@
+@@ -60388,52 +57020,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51359,7 +51683,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -59945,24 +56589,21 @@
+@@ -60442,24 +57073,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -51392,7 +51716,7 @@
_ACEOF
fi
-@@ -59981,10 +56622,10 @@
+@@ -60478,10 +57106,10 @@
@@ -51406,7 +51730,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60014,38 +56655,34 @@
+@@ -60511,38 +57139,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51452,7 +51776,7 @@
if test $ac_cv_lib_ext_com_err__et_list = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE__ET_LIST 1
-@@ -60080,10 +56717,10 @@
+@@ -60577,10 +57201,10 @@
@@ -51466,7 +51790,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60113,38 +56750,34 @@
+@@ -60610,38 +57234,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51512,7 +51836,7 @@
if test $ac_cv_lib_ext_k5crypto_krb5_encrypt_data = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCRYPT_DATA 1
-@@ -60181,10 +56814,10 @@
+@@ -60678,10 +57298,10 @@
@@ -51526,7 +51850,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60214,38 +56847,34 @@
+@@ -60711,38 +57331,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51572,7 +51896,7 @@
if test $ac_cv_lib_ext_crypto_des_set_key = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DES_SET_KEY 1
-@@ -60280,10 +56909,10 @@
+@@ -60777,10 +57393,10 @@
@@ -51586,7 +51910,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60313,38 +56942,34 @@
+@@ -60810,38 +57426,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51632,7 +51956,7 @@
if test $ac_cv_lib_ext_asn1_copy_Authenticator = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_COPY_AUTHENTICATOR 1
-@@ -60379,10 +57004,10 @@
+@@ -60876,10 +57488,10 @@
@@ -51646,7 +51970,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60412,38 +57037,34 @@
+@@ -60909,38 +57521,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51692,7 +52016,7 @@
if test $ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_ROKEN_GETADDRINFO_HOSTSPEC 1
-@@ -60480,10 +57101,10 @@
+@@ -60977,10 +57585,10 @@
@@ -51706,7 +52030,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60513,38 +57134,34 @@
+@@ -61010,38 +57618,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51752,7 +52076,7 @@
if test $ac_cv_lib_ext_gssapi_gss_display_status = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GSS_DISPLAY_STATUS 1
-@@ -60583,10 +57200,10 @@
+@@ -61080,10 +57684,10 @@
@@ -51766,7 +52090,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60616,38 +57233,34 @@
+@@ -61113,38 +57717,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51812,7 +52136,7 @@
if test $ac_cv_lib_ext_krb5_krb5_mk_req_extended = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_MK_REQ_EXTENDED 1
-@@ -60682,10 +57295,10 @@
+@@ -61179,10 +57779,10 @@
@@ -51826,7 +52150,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60715,38 +57328,34 @@
+@@ -61212,38 +57812,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51872,7 +52196,7 @@
if test $ac_cv_lib_ext_krb5_krb5_kt_compare = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KT_COMPARE 1
-@@ -60785,10 +57394,10 @@
+@@ -61282,10 +57878,10 @@
@@ -51886,7 +52210,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60818,38 +57427,34 @@
+@@ -61315,38 +57911,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51932,7 +52256,7 @@
if test $ac_cv_lib_ext_gssapi_krb5_gss_display_status = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_GSS_DISPLAY_STATUS 1
-@@ -60882,10 +57487,10 @@
+@@ -61379,10 +57971,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -51946,7 +52270,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -60938,35 +57543,31 @@
+@@ -61435,35 +58027,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -51989,7 +52313,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_set_real_time = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -60980,10 +57581,10 @@
+@@ -61477,10 +58065,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52003,7 +52327,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61036,35 +57637,31 @@
+@@ -61533,35 +58121,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52046,7 +52370,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_set_default_in_tkt_etypes = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61078,10 +57675,10 @@
+@@ -61575,10 +58159,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52060,7 +52384,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61134,35 +57731,31 @@
+@@ -61631,35 +58215,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52103,7 +52427,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_set_default_tgs_enctypes = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61176,10 +57769,10 @@
+@@ -61673,10 +58253,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52117,7 +52441,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61232,35 +57825,31 @@
+@@ -61729,35 +58309,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52160,7 +52484,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_set_default_tgs_ktypes = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61274,10 +57863,10 @@
+@@ -61771,10 +58347,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52174,7 +52498,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61330,35 +57919,31 @@
+@@ -61827,35 +58403,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52217,7 +52541,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_principal2salt = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61372,10 +57957,10 @@
+@@ -61869,10 +58441,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52231,7 +52555,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61428,35 +58013,31 @@
+@@ -61925,35 +58497,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52274,7 +52598,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_use_enctype = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61470,10 +58051,10 @@
+@@ -61967,10 +58535,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52288,7 +52612,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61526,35 +58107,31 @@
+@@ -62023,35 +58591,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52331,7 +52655,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_string_to_key = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61568,10 +58145,10 @@
+@@ -62065,10 +58629,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52345,7 +52669,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61624,35 +58201,31 @@
+@@ -62121,35 +58685,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52388,7 +52712,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_pw_salt = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61666,10 +58239,10 @@
+@@ -62163,10 +58723,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52402,7 +52726,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61722,35 +58295,31 @@
+@@ -62219,35 +58779,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52445,7 +52769,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_string_to_key_salt = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61764,10 +58333,10 @@
+@@ -62261,10 +58817,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52459,7 +52783,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61820,35 +58389,31 @@
+@@ -62317,35 +58873,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52502,7 +52826,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_auth_con_setkey = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61862,10 +58427,10 @@
+@@ -62359,10 +58911,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52516,7 +52840,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -61918,35 +58483,31 @@
+@@ -62415,35 +58967,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52559,7 +52883,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_auth_con_setuseruserkey = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -61960,10 +58521,10 @@
+@@ -62457,10 +59005,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52573,7 +52897,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62016,35 +58577,31 @@
+@@ -62513,35 +59061,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52616,7 +52940,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_locate_kdc = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62058,10 +58615,10 @@
+@@ -62555,10 +59099,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52630,7 +52954,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62114,35 +58671,31 @@
+@@ -62611,35 +59155,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52673,7 +52997,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_permitted_enctypes = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62156,10 +58709,10 @@
+@@ -62653,10 +59193,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52687,7 +53011,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62212,35 +58765,31 @@
+@@ -62709,35 +59249,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52730,7 +53054,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_default_in_tkt_etypes = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62254,10 +58803,10 @@
+@@ -62751,10 +59287,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52744,7 +53068,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62310,35 +58859,31 @@
+@@ -62807,35 +59343,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52787,7 +53111,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_free_data_contents = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62352,10 +58897,10 @@
+@@ -62849,10 +59381,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52801,7 +53125,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62408,35 +58953,31 @@
+@@ -62905,35 +59437,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52844,7 +53168,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_principal_get_comp_string = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62450,10 +58991,10 @@
+@@ -62947,10 +59475,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52858,7 +53182,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62506,35 +59047,31 @@
+@@ -63003,35 +59531,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52901,7 +53225,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_free_unparsed_name = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62548,10 +59085,10 @@
+@@ -63045,10 +59569,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52915,7 +53239,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62604,35 +59141,31 @@
+@@ -63101,35 +59625,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -52958,7 +53282,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_free_keytab_entry_contents = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62646,10 +59179,10 @@
+@@ -63143,10 +59663,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -52972,7 +53296,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62702,35 +59235,31 @@
+@@ -63199,35 +59719,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53015,7 +53339,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_kt_free_entry = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62744,10 +59273,10 @@
+@@ -63241,10 +59757,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53029,7 +53353,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62800,35 +59329,31 @@
+@@ -63297,35 +59813,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53072,7 +53396,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_krbhst_init = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62842,10 +59367,10 @@
+@@ -63339,10 +59851,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53086,7 +53410,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62898,35 +59423,31 @@
+@@ -63395,35 +59907,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53129,7 +53453,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_krbhst_get_addrinfo = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -62940,10 +59461,10 @@
+@@ -63437,10 +59945,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53143,7 +53467,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -62996,35 +59517,31 @@
+@@ -63493,35 +60001,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53186,7 +53510,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_c_enctype_compare = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63038,10 +59555,10 @@
+@@ -63535,10 +60039,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53200,7 +53524,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63094,35 +59611,31 @@
+@@ -63591,35 +60095,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53243,7 +53567,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_enctypes_compatible_keys = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63136,10 +59649,10 @@
+@@ -63633,10 +60133,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53257,7 +53581,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63192,35 +59705,31 @@
+@@ -63689,35 +60189,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53300,7 +53624,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_crypto_init = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63234,10 +59743,10 @@
+@@ -63731,10 +60227,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53314,7 +53638,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63290,35 +59799,31 @@
+@@ -63787,35 +60283,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53357,7 +53681,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_crypto_destroy = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63332,10 +59837,10 @@
+@@ -63829,10 +60321,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53371,7 +53695,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63388,35 +59893,31 @@
+@@ -63885,35 +60377,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53414,7 +53738,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_decode_ap_req = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63430,10 +59931,10 @@
+@@ -63927,10 +60415,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53428,7 +53752,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63486,35 +59987,31 @@
+@@ -63983,35 +60471,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53471,7 +53795,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_free_AP_REQ = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63528,10 +60025,10 @@
+@@ -64025,10 +60509,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53485,7 +53809,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63584,35 +60081,31 @@
+@@ -64081,35 +60565,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53528,7 +53852,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_verify_checksum = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63626,10 +60119,10 @@
+@@ -64123,10 +60603,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53542,7 +53866,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63682,35 +60175,31 @@
+@@ -64179,35 +60659,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53585,7 +53909,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_c_verify_checksum = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63724,10 +60213,10 @@
+@@ -64221,10 +60697,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53599,7 +53923,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63780,35 +60269,31 @@
+@@ -64277,35 +60753,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53642,7 +53966,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_principal_compare_any_realm = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63822,10 +60307,10 @@
+@@ -64319,10 +60791,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53656,7 +53980,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63878,35 +60363,31 @@
+@@ -64375,35 +60847,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53699,7 +54023,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_parse_name_norealm = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -63920,10 +60401,10 @@
+@@ -64417,10 +60885,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53713,7 +54037,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -63976,35 +60457,31 @@
+@@ -64473,35 +60941,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53756,7 +54080,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_princ_size = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64018,10 +60495,10 @@
+@@ -64515,10 +60979,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53770,7 +54094,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64074,35 +60551,31 @@
+@@ -64571,35 +61035,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53813,7 +54137,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64116,10 +60589,10 @@
+@@ -64613,10 +61073,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53827,7 +54151,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64172,35 +60645,31 @@
+@@ -64669,35 +61129,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53870,7 +54194,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_renewed_creds = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64214,10 +60683,10 @@
+@@ -64711,10 +61167,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53884,7 +54208,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64270,35 +60739,31 @@
+@@ -64767,35 +61223,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53927,7 +54251,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_kdc_cred = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64312,10 +60777,10 @@
+@@ -64809,10 +61261,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53941,7 +54265,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64368,35 +60833,31 @@
+@@ -64865,35 +61317,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -53984,7 +54308,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_free_error_contents = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64410,10 +60871,10 @@
+@@ -64907,10 +61355,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -53998,7 +54322,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64466,35 +60927,31 @@
+@@ -64963,35 +61411,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54041,7 +54365,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_initialize_krb5_error_table = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64508,10 +60965,10 @@
+@@ -65005,10 +61449,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54055,7 +54379,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64564,35 +61021,31 @@
+@@ -65061,35 +61505,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54098,7 +54422,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_init_creds_opt_alloc = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64606,10 +61059,10 @@
+@@ -65103,10 +61543,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54112,7 +54436,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64662,35 +61115,31 @@
+@@ -65159,35 +61599,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54155,7 +54479,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_init_creds_opt_free = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64704,10 +61153,10 @@
+@@ -65201,10 +61637,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54169,7 +54493,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64760,35 +61209,31 @@
+@@ -65257,35 +61693,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54212,7 +54536,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_get_init_creds_opt_get_error = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64802,10 +61247,10 @@
+@@ -65299,10 +61731,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54226,7 +54550,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64858,35 +61303,31 @@
+@@ -65355,35 +61787,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54269,7 +54593,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_enctype_to_string = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64900,10 +61341,10 @@
+@@ -65397,10 +61825,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54283,7 +54607,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -64956,35 +61397,31 @@
+@@ -65453,35 +61881,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54326,7 +54650,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_fwd_tgt_creds = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -64998,10 +61435,10 @@
+@@ -65495,10 +61919,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$KRB5_LIBS $LIBS"
@@ -54340,7 +54664,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -65054,35 +61491,31 @@
+@@ -65551,35 +61975,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54383,7 +54707,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_krb5_auth_con_set_req_cksumtype = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -65094,10 +61527,10 @@
+@@ -65591,10 +62011,10 @@
LIBS="$KRB5_LIBS $LIBS"
@@ -54397,7 +54721,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65130,21 +61563,20 @@
+@@ -65627,21 +62047,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54422,7 +54746,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
smb_krb5_cv_ticket_has_keyinfo=no
-@@ -65153,8 +61585,8 @@
+@@ -65650,8 +62069,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54433,7 +54757,7 @@
if test x"$smb_krb5_cv_ticket_has_keyinfo" = x"yes" ; then
-@@ -65164,10 +61596,10 @@
+@@ -65661,10 +62080,10 @@
fi
@@ -54447,7 +54771,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65196,21 +61628,20 @@
+@@ -65693,21 +62112,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54472,7 +54796,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
smb_krb5_cv_creds_opt_free_context=no
-@@ -65220,8 +61651,8 @@
+@@ -65717,8 +62135,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54483,7 +54807,7 @@
if test x"$smb_krb5_cv_creds_opt_free_context" = x"yes" ; then
-@@ -65231,10 +61662,10 @@
+@@ -65728,10 +62146,10 @@
fi
@@ -54497,7 +54821,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65259,21 +61690,20 @@
+@@ -65756,21 +62174,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54522,7 +54846,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
smb_krb5_cv_verify_checksum=6
-@@ -65282,18 +61712,18 @@
+@@ -65779,18 +62196,18 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54546,7 +54870,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65317,21 +61747,20 @@
+@@ -65814,21 +62231,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54571,7 +54895,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM=no
-@@ -65339,8 +61768,8 @@
+@@ -65836,8 +62252,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54582,7 +54906,7 @@
if test x"$samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" = x"yes"; then
-@@ -65350,10 +61779,10 @@
+@@ -65847,10 +62263,10 @@
fi
@@ -54596,7 +54920,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65377,21 +61806,20 @@
+@@ -65874,21 +62290,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54621,7 +54945,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA=no
-@@ -65399,8 +61827,8 @@
+@@ -65896,8 +62311,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54632,7 +54956,7 @@
if test x"$samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" = x"yes"; then
-@@ -65410,10 +61838,10 @@
+@@ -65907,10 +62322,10 @@
fi
@@ -54646,7 +54970,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65437,21 +61865,20 @@
+@@ -65934,21 +62349,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54671,7 +54995,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ=no
-@@ -65459,8 +61886,8 @@
+@@ -65956,8 +62370,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54682,7 +55006,7 @@
if test x"$samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" = x"yes"; then
-@@ -65470,10 +61897,10 @@
+@@ -65967,10 +62381,10 @@
fi
@@ -54696,7 +55020,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65497,21 +61924,20 @@
+@@ -65994,21 +62408,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54721,7 +55045,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR=no
-@@ -65519,8 +61945,8 @@
+@@ -66016,8 +62429,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54732,7 +55056,7 @@
if test x"$samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" = x"yes"; then
-@@ -65530,10 +61956,10 @@
+@@ -66027,10 +62440,10 @@
fi
@@ -54746,7 +55070,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65557,21 +61983,20 @@
+@@ -66054,21 +62467,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54771,7 +55095,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_CRYPTO=no
-@@ -65579,8 +62004,8 @@
+@@ -66076,8 +62488,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54782,7 +55106,7 @@
if test x"$samba_cv_HAVE_KRB5_CRYPTO" = x"yes"; then
-@@ -65590,10 +62015,10 @@
+@@ -66087,10 +62499,10 @@
fi
@@ -54796,7 +55120,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65617,21 +62042,20 @@
+@@ -66114,21 +62526,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54821,7 +55145,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no
-@@ -65639,8 +62063,8 @@
+@@ -66136,8 +62547,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54832,7 +55156,7 @@
if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then
-@@ -65650,10 +62074,10 @@
+@@ -66147,10 +62558,10 @@
fi
@@ -54846,7 +55170,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65677,21 +62101,20 @@
+@@ -66174,21 +62585,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54871,7 +55195,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=no
-@@ -65699,8 +62122,8 @@
+@@ -66196,8 +62606,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54882,7 +55206,7 @@
if test x"$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" = x"yes"; then
-@@ -65710,10 +62133,10 @@
+@@ -66207,10 +62617,10 @@
fi
@@ -54896,7 +55220,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65737,21 +62160,20 @@
+@@ -66234,21 +62644,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54921,7 +55245,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=no
-@@ -65759,8 +62181,8 @@
+@@ -66256,8 +62665,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54932,7 +55256,7 @@
if test x"$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" = x"yes"; then
-@@ -65770,10 +62192,10 @@
+@@ -66267,10 +62676,10 @@
fi
@@ -54946,7 +55270,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -65796,21 +62218,20 @@
+@@ -66293,21 +62702,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -54971,7 +55295,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_TKT_ENC_PART2=no
-@@ -65818,8 +62239,8 @@
+@@ -66315,8 +62723,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -54982,7 +55306,7 @@
if test x"$samba_cv_HAVE_KRB5_TKT_ENC_PART2" = x"yes"; then
-@@ -65829,10 +62250,10 @@
+@@ -66326,10 +62734,10 @@
fi
@@ -54996,7 +55320,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65856,21 +62277,20 @@
+@@ -66353,21 +62761,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55021,7 +55345,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no
-@@ -65878,8 +62298,8 @@
+@@ -66375,8 +62782,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55032,7 +55356,7 @@
if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then
-@@ -65889,10 +62309,10 @@
+@@ -66386,10 +62793,10 @@
fi
@@ -55046,7 +55370,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65916,21 +62336,20 @@
+@@ -66413,21 +62820,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55071,7 +55395,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no
-@@ -65938,8 +62357,8 @@
+@@ -66435,8 +62841,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55082,7 +55406,7 @@
if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then
-@@ -65949,10 +62368,10 @@
+@@ -66446,10 +62852,10 @@
fi
@@ -55096,7 +55420,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -65976,21 +62395,20 @@
+@@ -66473,21 +62879,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55121,7 +55445,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no
-@@ -65998,8 +62416,8 @@
+@@ -66495,8 +62900,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55132,7 +55456,7 @@
if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then
-@@ -66009,10 +62427,10 @@
+@@ -66506,10 +62911,10 @@
fi
@@ -55146,7 +55470,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66036,21 +62454,20 @@
+@@ -66533,21 +62938,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55171,7 +55495,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no
-@@ -66058,12 +62475,12 @@
+@@ -66555,12 +62959,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55189,7 +55513,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66087,21 +62504,20 @@
+@@ -66584,21 +62988,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55214,7 +55538,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KEYTYPE_ARCFOUR_56=no
-@@ -66109,8 +62525,8 @@
+@@ -66606,8 +63009,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55225,7 +55549,7 @@
# Heimdals with KEYTYPE_ARCFOUR but not KEYTYPE_ARCFOUR_56 are broken
# w.r.t. arcfour and windows, so we must not enable it here
if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes" -a\
-@@ -66122,10 +62538,10 @@
+@@ -66619,10 +63022,10 @@
fi
@@ -55239,7 +55563,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66149,21 +62565,20 @@
+@@ -66646,21 +63049,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55264,7 +55588,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_AP_OPTS_USE_SUBKEY=no
-@@ -66171,8 +62586,8 @@
+@@ -66668,8 +63070,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55275,7 +55599,7 @@
if test x"$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" = x"yes"; then
-@@ -66182,10 +62597,10 @@
+@@ -66679,10 +63081,10 @@
fi
@@ -55289,7 +55613,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66209,21 +62624,20 @@
+@@ -66706,21 +63108,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55314,7 +55638,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KV5M_KEYTAB=no
-@@ -66231,8 +62645,8 @@
+@@ -66728,8 +63129,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55325,7 +55649,7 @@
if test x"$samba_cv_HAVE_KV5M_KEYTAB" = x"yes"; then
-@@ -66242,10 +62656,10 @@
+@@ -66739,10 +63140,10 @@
fi
@@ -55339,7 +55663,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66269,21 +62683,20 @@
+@@ -66766,21 +63167,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55364,7 +55688,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=no
-@@ -66291,8 +62704,8 @@
+@@ -66788,8 +63188,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55375,7 +55699,7 @@
if test x"$samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" = x"yes"; then
-@@ -66302,10 +62715,10 @@
+@@ -66799,10 +63199,10 @@
fi
@@ -55389,7 +55713,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66329,21 +62742,20 @@
+@@ -66826,21 +63226,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55414,7 +55738,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM=no
-@@ -66351,8 +62763,8 @@
+@@ -66848,8 +63247,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55425,7 +55749,7 @@
if test x"$samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" = x"yes"; then
-@@ -66362,10 +62774,10 @@
+@@ -66859,10 +63258,10 @@
fi
@@ -55439,7 +55763,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66389,35 +62801,31 @@
+@@ -66886,35 +63285,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55482,7 +55806,7 @@
if test x"$samba_cv_HAVE_KRB5_PRINC_COMPONENT" = x"yes"; then
-@@ -66427,10 +62835,10 @@
+@@ -66924,10 +63319,10 @@
fi
@@ -55496,7 +55820,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66454,21 +62862,20 @@
+@@ -66951,21 +63346,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55521,7 +55845,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no
-@@ -66476,8 +62883,8 @@
+@@ -66973,8 +63367,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55532,7 +55856,7 @@
if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" = x"yes"; then
-@@ -66487,10 +62894,10 @@
+@@ -66984,10 +63378,10 @@
fi
@@ -55546,7 +55870,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66514,21 +62921,20 @@
+@@ -67011,21 +63405,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55571,7 +55895,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=no
-@@ -66536,8 +62942,8 @@
+@@ -67033,8 +63426,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55582,7 +55906,7 @@
if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" = x"yes"; then
-@@ -66547,10 +62953,10 @@
+@@ -67044,10 +63437,10 @@
fi
@@ -55596,7 +55920,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66574,21 +62980,20 @@
+@@ -67071,21 +63464,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55621,7 +55945,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS=no
-@@ -66596,8 +63001,8 @@
+@@ -67093,8 +63485,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55632,7 +55956,7 @@
if test x"$samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" = x"yes"; then
-@@ -66607,20 +63012,18 @@
+@@ -67104,20 +63496,18 @@
fi
@@ -55659,7 +55983,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -66645,39 +63048,36 @@
+@@ -67142,39 +63532,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55707,7 +56031,7 @@
if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then
-@@ -66687,10 +63087,10 @@
+@@ -67184,10 +63571,10 @@
fi
@@ -55721,7 +56045,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66717,21 +63117,20 @@
+@@ -67214,21 +63601,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55746,7 +56070,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=no
-@@ -66739,8 +63138,8 @@
+@@ -67236,8 +63622,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55757,7 +56081,7 @@
if test x"$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" = x"yes"; then
-@@ -66750,10 +63149,10 @@
+@@ -67247,10 +63633,10 @@
fi
@@ -55771,7 +56095,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66777,21 +63176,20 @@
+@@ -67274,21 +63660,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55796,7 +56120,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_KRB5_ADDRESSES=no
-@@ -66799,8 +63197,8 @@
+@@ -67296,8 +63681,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55807,7 +56131,7 @@
if test x"$samba_cv_HAVE_KRB5_ADDRESSES" = x"yes"; then
-@@ -66810,10 +63208,10 @@
+@@ -67307,10 +63692,10 @@
fi
@@ -55821,7 +56145,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -66838,21 +63236,20 @@
+@@ -67335,21 +63720,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55846,7 +56170,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE=no
-@@ -66860,8 +63257,8 @@
+@@ -67357,8 +63741,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -55857,7 +56181,7 @@
if test x"$samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE" = x"yes"; then
-@@ -66872,10 +63269,10 @@
+@@ -67369,10 +63753,10 @@
fi
if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
@@ -55871,7 +56195,7 @@
else
-@@ -66889,13 +63286,11 @@
+@@ -67386,13 +63770,11 @@
LDFLAGS="$LDFLAGS";
export LDFLAGS;
if test "$cross_compiling" = yes; then
@@ -55888,7 +56212,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -66921,32 +63316,29 @@
+@@ -67418,32 +63800,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -55927,7 +56251,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -66962,8 +63354,8 @@
+@@ -67459,8 +63838,8 @@
export LDFLAGS;
fi
@@ -55938,7 +56262,7 @@
if test x"$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" = x"yes"; then
-@@ -66973,10 +63365,10 @@
+@@ -67470,10 +63849,10 @@
fi
@@ -55952,7 +56276,7 @@
else
-@@ -66990,13 +63382,11 @@
+@@ -67487,13 +63866,11 @@
LDFLAGS="$LDFLAGS";
export LDFLAGS;
if test "$cross_compiling" = yes; then
@@ -55969,7 +56293,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -67019,32 +63409,29 @@
+@@ -67516,32 +63893,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56008,7 +56332,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -67060,8 +63447,8 @@
+@@ -67557,8 +63931,8 @@
export LDFLAGS;
fi
@@ -56019,7 +56343,7 @@
if test x"$smb_krb5_cv_enctype_to_string_takes_size_t_arg" = x"yes"; then
-@@ -67072,10 +63459,10 @@
+@@ -67569,10 +63943,10 @@
fi
fi
@@ -56033,7 +56357,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -67099,35 +63486,31 @@
+@@ -67596,35 +63970,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56076,7 +56400,7 @@
if test x"$samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" = x"yes"; then
-@@ -67137,10 +63520,10 @@
+@@ -67634,10 +64004,10 @@
fi
@@ -56090,7 +56414,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -67164,35 +63547,31 @@
+@@ -67661,35 +64031,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56133,7 +56457,7 @@
if test x"$samba_cv_HAVE_KRB5_PRINC_REALM" = x"yes"; then
-@@ -67210,40 +63589,40 @@
+@@ -67707,40 +64073,40 @@
#
#
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -56184,7 +56508,7 @@
use_ads=no
fi
-@@ -67254,15 +63633,15 @@
+@@ -67751,15 +64117,15 @@
if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
then
@@ -56204,7 +56528,7 @@
use_ads=no
fi
-@@ -67288,12 +63667,12 @@
+@@ -67785,12 +64151,12 @@
fi
else
if test x"$with_ads_support" = x"yes"; then
@@ -56221,7 +56545,7 @@
fi
grep -v '#define HAVE_KRB5_H ' confdefs.h |grep -v '#define HAVE_KRB5_H$'>confdefs.h.tmp
-@@ -67318,10 +63697,10 @@
+@@ -67815,10 +64181,10 @@
KRB5_LIBS=""
with_ads_support=no
fi
@@ -56236,7 +56560,7 @@
LIBS="$ac_save_LIBS"
fi
-@@ -67335,10 +63714,10 @@
+@@ -67832,10 +64198,10 @@
@@ -56250,7 +56574,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -67368,38 +63747,34 @@
+@@ -67865,38 +64231,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56296,7 +56620,7 @@
if test $ac_cv_lib_ext_nscd_nscd_flush_cache = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_NSCD_FLUSH_CACHE 1
-@@ -67432,8 +63807,8 @@
+@@ -67929,8 +64291,8 @@
# Compile with DNS Updates support?
with_dnsupdate_support=no
@@ -56307,7 +56631,7 @@
# Check whether --with-dnsupdate was given.
-@@ -67446,8 +63821,8 @@
+@@ -67943,8 +64305,8 @@
fi
@@ -56318,7 +56642,7 @@
if test x"$with_dnsupdate_support" != x"no"; then
-@@ -67463,21 +63838,20 @@
+@@ -67960,21 +64322,20 @@
for ac_header in uuid/uuid.h
do
@@ -56349,7 +56673,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -67493,33 +63867,32 @@
+@@ -67990,33 +64351,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56390,7 +56714,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -67533,52 +63906,51 @@
+@@ -68030,52 +64390,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56464,7 +56788,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -67587,24 +63959,21 @@
+@@ -68084,24 +64443,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -56497,7 +56821,7 @@
_ACEOF
fi
-@@ -67614,12 +63983,12 @@
+@@ -68111,12 +64467,12 @@
if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -56514,7 +56838,7 @@
fi
with_dnsupdate_support=no
fi
-@@ -67637,11 +64006,11 @@
+@@ -68134,11 +64490,11 @@
for ac_func in uuid_generate
do
@@ -56530,7 +56854,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -67694,42 +64063,35 @@
+@@ -68191,42 +64547,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56583,7 +56907,7 @@
_ACEOF
# uuid_generate was found in libc or existing $LIBS
-@@ -67761,12 +64123,12 @@
+@@ -68258,12 +64607,12 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -56600,7 +56924,7 @@
fi
with_dnsupdate_support=no
-@@ -67774,10 +64136,10 @@
+@@ -68271,10 +64620,10 @@
;;
*)
# uuid_generate was not found, try adding libuuid
@@ -56614,7 +56938,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBS"
-@@ -67809,37 +64171,33 @@
+@@ -68306,37 +64655,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56660,7 +56984,7 @@
LIBS="-luuid $LIBS"
-@@ -67867,12 +64225,12 @@
+@@ -68364,12 +64709,12 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -56677,7 +57001,7 @@
fi
with_dnsupdate_support=no
-@@ -67891,15 +64249,15 @@
+@@ -68388,15 +64733,15 @@
#################################################
# check for automount support
@@ -56697,7 +57021,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_AUTOMOUNT 1
-@@ -67907,13 +64265,13 @@
+@@ -68404,13 +64749,13 @@
;;
*)
@@ -56715,7 +57039,7 @@
fi
-@@ -67923,21 +64281,21 @@
+@@ -68420,21 +64765,21 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
@@ -56743,7 +57067,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_CIFSMOUNT 1
-@@ -67948,8 +64306,8 @@
+@@ -68445,8 +64790,8 @@
UNINSTALL_CIFSMOUNT="uninstallcifsmount"
;;
*)
@@ -56754,7 +57078,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -67958,8 +64316,8 @@
+@@ -68455,8 +64800,8 @@
else
case "$host_os" in
*linux*)
@@ -56765,7 +57089,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_CIFSMOUNT 1
-@@ -67970,8 +64328,8 @@
+@@ -68467,8 +64812,8 @@
UNINSTALL_CIFSMOUNT="uninstallcifsmount"
;;
*)
@@ -56776,7 +57100,7 @@
;;
esac
-@@ -67983,21 +64341,20 @@
+@@ -68480,21 +64825,20 @@
for ac_header in keyutils.h
do
@@ -56807,7 +57131,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68013,33 +64370,32 @@
+@@ -68510,33 +64854,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56848,7 +57172,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68053,52 +64409,51 @@
+@@ -68550,52 +64893,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -56922,7 +57246,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -68107,24 +64462,21 @@
+@@ -68604,24 +64946,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -56955,7 +57279,7 @@
_ACEOF
HAVE_KEYUTILS_H=1
else
-@@ -68136,30 +64488,30 @@
+@@ -68633,30 +64972,30 @@
CIFSUPCALL_PROGS=""
INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
@@ -56996,7 +57320,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_CIFSUPCALL 1
-@@ -68171,8 +64523,8 @@
+@@ -68668,8 +65007,8 @@
fi
;;
*)
@@ -57007,7 +57331,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -68182,14 +64534,14 @@
+@@ -68679,14 +65018,14 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -57028,7 +57352,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_CIFSUPCALL 1
-@@ -68201,8 +64553,8 @@
+@@ -68698,8 +65037,8 @@
fi
;;
*)
@@ -57039,7 +57363,7 @@
;;
esac
-@@ -68218,8 +64570,8 @@
+@@ -68715,8 +65054,8 @@
with_pam_for_crypt=no
try_pam=no
@@ -57050,7 +57374,7 @@
# Check whether --with-pam was given.
if test "${with_pam+set}" = set; then
-@@ -68231,8 +64583,8 @@
+@@ -68728,8 +65067,8 @@
fi
@@ -57061,7 +57385,7 @@
use_pam=no
create_pam_modules=no
-@@ -68246,21 +64598,20 @@
+@@ -68743,21 +65082,20 @@
for ac_header in security/pam_appl.h pam/pam_appl.h
do
@@ -57092,7 +57416,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68276,33 +64627,32 @@
+@@ -68773,33 +65111,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57133,7 +57457,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68316,52 +64666,51 @@
+@@ -68813,52 +65150,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57207,7 +57531,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -68370,24 +64719,21 @@
+@@ -68867,24 +65203,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -57240,7 +57564,7 @@
_ACEOF
fi
-@@ -68397,8 +64743,8 @@
+@@ -68894,8 +65227,8 @@
if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \
x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then
if test x"${try_pam}" = x"yes";then
@@ -57251,7 +57575,7 @@
{ (exit 1); exit 1; }; }
fi
use_pam=no
-@@ -68414,10 +64760,10 @@
+@@ -68911,10 +65244,10 @@
@@ -57265,7 +57589,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -68447,38 +64793,34 @@
+@@ -68944,38 +65277,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57311,7 +57635,7 @@
if test $ac_cv_lib_ext_pam_pam_get_data = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_PAM_GET_DATA 1
-@@ -68506,8 +64848,8 @@
+@@ -69003,8 +65332,8 @@
if test x"$ac_cv_lib_ext_pam_pam_get_data" != x"yes"; then
if test x"${try_pam}" = x"yes";then
@@ -57322,7 +57646,7 @@
{ (exit 1); exit 1; }; }
fi
use_pam=no
-@@ -68518,11 +64860,11 @@
+@@ -69015,11 +65344,11 @@
for ac_header in security/pam_modules.h pam/pam_modules.h
do
@@ -57338,7 +57662,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -68547,21 +64889,20 @@
+@@ -69044,21 +65373,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57363,7 +57687,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -68569,15 +64910,12 @@
+@@ -69066,15 +65394,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -57384,7 +57708,7 @@
_ACEOF
fi
-@@ -68587,8 +64925,8 @@
+@@ -69084,8 +65409,8 @@
if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \
x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
if test x"${try_pam}" = x"yes";then
@@ -57395,7 +57719,7 @@
{ (exit 1); exit 1; }; }
fi
create_pam_modules=no
-@@ -68620,21 +64958,20 @@
+@@ -69117,21 +65442,20 @@
for ac_header in security/pam_ext.h security/_pam_macros.h
do
@@ -57426,7 +57750,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68650,33 +64987,32 @@
+@@ -69147,33 +65471,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57467,7 +57791,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68690,52 +65026,51 @@
+@@ -69187,52 +65510,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57541,7 +57865,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -68744,24 +65079,21 @@
+@@ -69241,24 +65563,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -57574,7 +57898,7 @@
_ACEOF
fi
-@@ -68772,21 +65104,20 @@
+@@ -69269,21 +65588,20 @@
for ac_header in pam/pam_ext.h pam/_pam_macros.h
do
@@ -57605,7 +57929,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68802,33 +65133,32 @@
+@@ -69299,33 +65617,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57646,7 +57970,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -68842,52 +65172,51 @@
+@@ -69339,52 +65656,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57720,7 +58044,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -68896,24 +65225,21 @@
+@@ -69393,24 +65709,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -57753,7 +58077,7 @@
_ACEOF
fi
-@@ -68925,10 +65251,10 @@
+@@ -69422,10 +65735,10 @@
ac_check_func_ext_save_LIBS=$LIBS
LIBS="$PAM_LIBS $LIBS"
@@ -57767,7 +58091,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -68981,35 +65307,31 @@
+@@ -69478,35 +65791,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57810,7 +58134,7 @@
LIBS=$ac_check_func_ext_save_LIBS
if test $ac_cv_func_ext_pam_vsyslog = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -69019,19 +65341,19 @@
+@@ -69516,19 +65825,19 @@
fi
else
@@ -57841,7 +58165,7 @@
fi # try_pam != no
#################################################
-@@ -69039,25 +65361,25 @@
+@@ -69536,25 +65845,25 @@
PAM_MODULES=""
INSTALL_PAM_MODULES=""
UNINSTALL_PAM_MODULES=""
@@ -57875,7 +58199,7 @@
{ (exit 1); exit 1; }; }
else
PAM_MODULES="pam_smbpass"
-@@ -69066,13 +65388,13 @@
+@@ -69563,13 +65872,13 @@
fi
;;
*)
@@ -57893,7 +58217,7 @@
fi
-@@ -69080,10 +65402,10 @@
+@@ -69577,10 +65886,10 @@
###############################################
# test for where we get crypt() from
@@ -57907,7 +58231,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -69121,30 +65443,26 @@
+@@ -69618,30 +65927,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -57943,7 +58267,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_crypt+set}" = set; then
-@@ -69159,8 +65477,8 @@
+@@ -69656,8 +65961,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -57954,7 +58278,7 @@
ac_res=$ac_cv_search_crypt
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -69180,10 +65498,10 @@
+@@ -69677,10 +65982,10 @@
## $with_pam_for_crypt variable as above --jerry
##
if test $with_pam_for_crypt = no; then
@@ -57968,7 +58292,7 @@
else
crypt_LIBS="$LIBS"
-@@ -69205,40 +65523,37 @@
+@@ -69702,40 +66007,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58017,7 +58341,7 @@
if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -69250,15 +65565,15 @@
+@@ -69747,15 +66049,15 @@
#################################################
# check for a NISPLUS_HOME support
@@ -58037,7 +58361,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_NISPLUS_HOME 1
-@@ -69266,28 +65581,28 @@
+@@ -69763,28 +66065,28 @@
;;
*)
@@ -58074,7 +58398,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_SYSLOG 1
-@@ -69295,28 +65610,28 @@
+@@ -69792,28 +66094,28 @@
;;
*)
@@ -58111,7 +58435,7 @@
{ (exit 1); exit 1; }; }
else
if test "$withval" != "yes" ; then
-@@ -69342,15 +65657,15 @@
+@@ -69839,15 +66141,15 @@
samba_cv_TRY_SYS_QUOTAS=auto
samba_cv_SYSQUOTA_FOUND=no
@@ -58131,7 +58455,7 @@
samba_cv_WITH_QUOTAS=yes
samba_cv_TRY_QUOTAS=yes
samba_cv_RUN_QUOTA_TESTS=yes
-@@ -69358,8 +65673,8 @@
+@@ -69855,8 +66157,8 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
auto)
@@ -58142,7 +58466,7 @@
samba_cv_WITH_QUOTAS=auto
samba_cv_TRY_QUOTAS=auto
samba_cv_RUN_QUOTA_TESTS=auto
-@@ -69367,75 +65682,75 @@
+@@ -69864,75 +66166,75 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
no)
@@ -58242,7 +58566,7 @@
samba_cv_TRY_SYS_QUOTAS=no
;;
esac
-@@ -69455,10 +65770,10 @@
+@@ -69952,10 +66254,10 @@
_ACEOF
samba_cv_sysquotas_file="lib/sysquotas_linux.c"
@@ -58257,7 +58581,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -69466,10 +65781,10 @@
+@@ -69963,10 +66265,10 @@
_ACEOF
samba_cv_found_xfs_header=yes
@@ -58272,7 +58596,7 @@
;;
*solaris*)
# need to set this define when using static linking (BUG 1473)
-@@ -69481,17 +65796,17 @@
+@@ -69978,17 +66280,17 @@
# some broken header files need this
if test "${ac_cv_header_asm_types_h+set}" = set; then
@@ -58297,7 +58621,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69507,33 +65822,32 @@
+@@ -70004,33 +66306,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58338,7 +58662,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69547,52 +65861,51 @@
+@@ -70044,52 +66345,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58412,7 +58736,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -69601,18 +65914,18 @@
+@@ -70098,18 +66398,18 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -58437,7 +58761,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -69632,21 +65945,20 @@
+@@ -70129,21 +66429,20 @@
for ac_header in sys/fs/vx_quota.h
do
@@ -58468,7 +58792,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69662,33 +65974,32 @@
+@@ -70159,33 +66458,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58509,7 +58833,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69702,52 +66013,51 @@
+@@ -70199,52 +66497,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58583,7 +58907,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -69756,24 +66066,21 @@
+@@ -70253,24 +66550,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -58616,7 +58940,7 @@
_ACEOF
fi
-@@ -69785,21 +66092,20 @@
+@@ -70282,21 +66576,20 @@
for ac_header in linux/dqblk_xfs.h
do
@@ -58647,7 +58971,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69815,33 +66121,32 @@
+@@ -70312,33 +66605,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58688,7 +59012,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69855,52 +66160,51 @@
+@@ -70352,52 +66644,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58762,7 +59086,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -69909,24 +66213,21 @@
+@@ -70406,24 +66697,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -58795,7 +59119,7 @@
_ACEOF
fi
-@@ -69938,21 +66239,20 @@
+@@ -70435,21 +66723,20 @@
for ac_header in sys/quota.h
do
@@ -58826,7 +59150,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -69968,33 +66268,32 @@
+@@ -70465,33 +66752,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58867,7 +59191,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -70008,52 +66307,51 @@
+@@ -70505,52 +66791,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -58941,7 +59265,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -70062,24 +66360,21 @@
+@@ -70559,24 +66844,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -58974,7 +59298,7 @@
_ACEOF
fi
-@@ -70089,10 +66384,10 @@
+@@ -70586,10 +66868,10 @@
if test x"$samba_cv_found_xfs_header" != x"yes"; then
# if we have xfs quota support <sys/quota.h> (IRIX) we should use it
@@ -58988,7 +59312,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -70125,21 +66420,20 @@
+@@ -70622,21 +66904,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59013,7 +59337,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_SYS_QUOTA_XFS=no
-@@ -70147,18 +66441,18 @@
+@@ -70644,18 +66925,18 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -59037,7 +59361,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -70189,21 +66483,20 @@
+@@ -70686,21 +66967,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59062,7 +59386,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_DQB_FSOFTLIMIT=no
-@@ -70211,8 +66504,8 @@
+@@ -70708,8 +66988,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -59073,7 +59397,7 @@
if test "$samba_cv_HAVE_DQB_FSOFTLIMIT"x = "yes"x; then
cat >>confdefs.h <<\_ACEOF
-@@ -70225,10 +66518,10 @@
+@@ -70722,10 +67002,10 @@
# look for a working quota system
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -59087,7 +59411,7 @@
else
-@@ -70262,32 +66555,29 @@
+@@ -70759,32 +67039,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59126,7 +59450,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -70303,8 +66593,8 @@
+@@ -70800,8 +67077,8 @@
export LDFLAGS;
fi
@@ -59137,7 +59461,7 @@
if test x"$samba_cv_HAVE_QUOTACTL_4A" = x"yes"; then
samba_cv_SYSQUOTA_FOUND=yes;
-@@ -70317,10 +66607,10 @@
+@@ -70814,10 +67091,10 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -59151,7 +59475,7 @@
else
-@@ -70354,32 +66644,29 @@
+@@ -70851,32 +67128,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59190,7 +59514,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -70395,8 +66682,8 @@
+@@ -70892,8 +67166,8 @@
export LDFLAGS;
fi
@@ -59201,7 +59525,7 @@
if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then
echo "int quotactl(const char *path, int cmd, int id, char *addr) is not reworked for the new sys_quota api"
samba_cv_SYSQUOTA_FOUND=yes;
-@@ -70410,10 +66697,10 @@
+@@ -70907,10 +67181,10 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -59215,7 +59539,7 @@
else
-@@ -70447,32 +66734,29 @@
+@@ -70944,32 +67218,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59254,7 +59578,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -70488,8 +66772,8 @@
+@@ -70985,8 +67256,8 @@
export LDFLAGS;
fi
@@ -59265,7 +59589,7 @@
if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
samba_cv_SYSQUOTA_FOUND=yes;
-@@ -70507,21 +66791,20 @@
+@@ -71004,21 +67275,20 @@
for ac_header in mntent.h
do
@@ -59296,7 +59620,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -70537,33 +66820,32 @@
+@@ -71034,33 +67304,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59337,7 +59661,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -70577,52 +66859,51 @@
+@@ -71074,52 +67343,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59411,7 +59735,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -70631,24 +66912,21 @@
+@@ -71128,24 +67396,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -59444,7 +59768,7 @@
_ACEOF
fi
-@@ -70662,11 +66940,11 @@
+@@ -71159,11 +67424,11 @@
for ac_func in setmntent getmntent endmntent
do
@@ -59460,7 +59784,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -70719,42 +66997,35 @@
+@@ -71216,42 +67481,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59513,7 +59837,7 @@
_ACEOF
fi
-@@ -70766,21 +67037,20 @@
+@@ -71263,21 +67521,20 @@
for ac_header in devnm.h
do
@@ -59544,7 +59868,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -70796,33 +67066,32 @@
+@@ -71293,33 +67550,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59585,7 +59909,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -70836,52 +67105,51 @@
+@@ -71333,52 +67589,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59659,7 +59983,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -70890,24 +67158,21 @@
+@@ -71387,24 +67642,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -59692,7 +60016,7 @@
_ACEOF
fi
-@@ -70919,11 +67184,11 @@
+@@ -71416,11 +67668,11 @@
for ac_func in devnm
do
@@ -59708,7 +60032,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -70976,42 +67241,35 @@
+@@ -71473,42 +67725,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59761,7 +60085,7 @@
_ACEOF
fi
-@@ -71034,10 +67292,10 @@
+@@ -71531,10 +67776,10 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -59775,7 +60099,7 @@
else
SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -71070,21 +67328,20 @@
+@@ -71567,21 +67812,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59800,7 +60124,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_SYSQUOTA_WORKS=no
-@@ -71094,11 +67351,11 @@
+@@ -71591,11 +67835,11 @@
CPPFLAGS="$SAVE_CPPFLAGS"
fi
@@ -59816,7 +60140,7 @@
if test x"$samba_cv_TRY_SYS_QUOTAS" != x"no"; then
cat >>confdefs.h <<\_ACEOF
-@@ -71111,20 +67368,20 @@
+@@ -71608,20 +67852,20 @@
_ACEOF
samba_cv_WE_USE_SYS_QUOTAS=yes
@@ -59844,7 +60168,7 @@
else
SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -71157,21 +67414,20 @@
+@@ -71654,21 +67898,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59869,7 +60193,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_SYSQUOTA_WORKS_XFS=no
-@@ -71181,8 +67437,8 @@
+@@ -71678,8 +67921,8 @@
CPPFLAGS="$SAVE_CPPFLAGS"
fi
@@ -59880,7 +60204,7 @@
if test x"$samba_cv_SYSQUOTA_WORKS_XFS" = x"yes"; then
if test x"$samba_cv_WE_USE_SYS_QUOTAS" = x"yes"; then
-@@ -71194,10 +67450,10 @@
+@@ -71691,10 +67934,10 @@
fi
fi
@@ -59894,7 +60218,7 @@
else
SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -71228,21 +67484,20 @@
+@@ -71725,21 +67968,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -59919,7 +60243,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_QUOTA_WORKS=no
-@@ -71252,11 +67507,11 @@
+@@ -71749,11 +67991,11 @@
CPPFLAGS="$SAVE_CPPFLAGS"
fi
@@ -59935,7 +60259,7 @@
if test x"$samba_cv_WE_USE_SYS_QUOTAS" != x"yes"; then
if test x"$samba_cv_TRY_QUOTAS" != x"no"; then
-@@ -71264,15 +67519,15 @@
+@@ -71761,15 +68003,15 @@
#define WITH_QUOTAS 1
_ACEOF
@@ -59957,7 +60281,7 @@
fi
fi
-@@ -71283,8 +67538,8 @@
+@@ -71780,8 +68022,8 @@
#################################################
# check for experimental utmp accounting
@@ -59968,7 +60292,7 @@
WITH_UTMP=yes
# Check whether --with-utmp was given.
-@@ -71311,16 +67566,16 @@
+@@ -71808,16 +68050,16 @@
# Display test results
if test x"$WITH_UTMP" = x"yes"; then
@@ -59989,7 +60313,7 @@
fi
INSTALLLIBCMD_SH=:
-@@ -71345,8 +67600,8 @@
+@@ -71842,8 +68084,8 @@
USESHARED=false
@@ -60000,7 +60324,7 @@
# Check whether --enable-shared-libs was given.
if test "${enable_shared_libs+set}" = set; then
enableval=$enable_shared_libs; enable_shared_libs=$enableval
-@@ -71359,12 +67614,12 @@
+@@ -71856,12 +68098,12 @@
USESHARED=$BLDSHARED
fi
@@ -60017,7 +60341,7 @@
fi
#################################################
-@@ -71428,7 +67683,8 @@
+@@ -71925,7 +68167,8 @@
LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
LIBTALLOC_SHARED=
LIBTALLOC_STATIC=
@@ -60027,7 +60351,7 @@
INSTALL_LIBTALLOC=
UNINSTALL_LIBTALLOC=
-@@ -71443,8 +67699,9 @@
+@@ -71940,8 +68183,9 @@
@@ -60039,7 +60363,7 @@
# Check whether --with-libtalloc was given.
-@@ -71452,8 +67709,8 @@
+@@ -71949,8 +68193,8 @@
withval=$with_libtalloc;
case "$withval" in
no)
@@ -60050,7 +60374,7 @@
build_lib=no
;;
*)
-@@ -71477,22 +67734,24 @@
+@@ -71974,22 +68218,24 @@
UNINSTALL_LIBTALLOC=uninstalllibtalloc
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
@@ -60083,7 +60407,7 @@
fi
if test $enable_static = yes; then
LIBTALLOC_STATIC=\$\(LIBTALLOC_OBJ0\)
-@@ -71512,7 +67771,8 @@
+@@ -72009,7 +68255,8 @@
LIBTDB_STATIC_TARGET=bin/libtdb.a
LIBTDB_SHARED=
LIBTDB_STATIC=
@@ -60093,7 +60417,7 @@
INSTALL_LIBTDB=
UNINSTALL_LIBTDB=
-@@ -71527,8 +67787,9 @@
+@@ -72024,8 +68271,9 @@
@@ -60105,7 +60429,7 @@
# Check whether --with-libtdb was given.
-@@ -71536,8 +67797,8 @@
+@@ -72033,8 +68281,8 @@
withval=$with_libtdb;
case "$withval" in
no)
@@ -60116,7 +60440,7 @@
build_lib=no
;;
*)
-@@ -71561,22 +67822,24 @@
+@@ -72058,22 +68306,24 @@
UNINSTALL_LIBTDB=uninstalllibtdb
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
@@ -60149,7 +60473,7 @@
fi
if test $enable_static = yes; then
LIBTDB_STATIC=\$\(LIBTDB_OBJ0\)
-@@ -71596,7 +67859,8 @@
+@@ -72093,7 +68343,8 @@
LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
LIBNETAPI_SHARED=
LIBNETAPI_STATIC=
@@ -60159,7 +60483,7 @@
INSTALL_LIBNETAPI=
UNINSTALL_LIBNETAPI=
-@@ -71611,8 +67875,9 @@
+@@ -72108,8 +68359,9 @@
@@ -60171,7 +60495,7 @@
# Check whether --with-libnetapi was given.
-@@ -71620,8 +67885,8 @@
+@@ -72117,8 +68369,8 @@
withval=$with_libnetapi;
case "$withval" in
no)
@@ -60182,7 +60506,7 @@
build_lib=no
;;
*)
-@@ -71645,22 +67910,24 @@
+@@ -72142,22 +68394,24 @@
UNINSTALL_LIBNETAPI=uninstalllibnetapi
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
@@ -60215,7 +60539,7 @@
fi
if test $enable_static = yes; then
LIBNETAPI_STATIC=\$\(LIBNETAPI_OBJ0\)
-@@ -71680,7 +67947,8 @@
+@@ -72177,7 +68431,8 @@
LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
LIBSMBCLIENT_SHARED=
LIBSMBCLIENT_STATIC=
@@ -60225,7 +60549,7 @@
INSTALL_LIBSMBCLIENT=
UNINSTALL_LIBSMBCLIENT=
-@@ -71695,8 +67963,9 @@
+@@ -72192,8 +68447,9 @@
@@ -60237,7 +60561,7 @@
# Check whether --with-libsmbclient was given.
-@@ -71704,8 +67973,8 @@
+@@ -72201,8 +68457,8 @@
withval=$with_libsmbclient;
case "$withval" in
no)
@@ -60248,7 +60572,7 @@
build_lib=no
;;
*)
-@@ -71729,22 +67998,24 @@
+@@ -72226,22 +68482,24 @@
UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
@@ -60281,7 +60605,7 @@
fi
if test $enable_static = yes; then
LIBSMBCLIENT_STATIC=\$\(LIBSMBCLIENT_OBJ0\)
-@@ -71764,7 +68035,8 @@
+@@ -72261,7 +68519,8 @@
LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
LIBSMBSHAREMODES_SHARED=
LIBSMBSHAREMODES_STATIC=
@@ -60291,7 +60615,7 @@
INSTALL_LIBSMBSHAREMODES=
UNINSTALL_LIBSMBSHAREMODES=
-@@ -71779,8 +68051,9 @@
+@@ -72276,8 +68535,9 @@
@@ -60303,7 +60627,7 @@
# Check whether --with-libsmbsharemodes was given.
-@@ -71788,8 +68061,8 @@
+@@ -72285,8 +68545,8 @@
withval=$with_libsmbsharemodes;
case "$withval" in
no)
@@ -60314,7 +60638,7 @@
build_lib=no
;;
*)
-@@ -71813,22 +68086,24 @@
+@@ -72310,22 +68570,24 @@
UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -60347,7 +60671,7 @@
fi
if test $enable_static = yes; then
LIBSMBSHAREMODES_STATIC=\$\(LIBSMBSHAREMODES_OBJ0\)
-@@ -71848,7 +68123,8 @@
+@@ -72345,7 +68607,8 @@
LIBADDNS_STATIC_TARGET=bin/libaddns.a
LIBADDNS_SHARED=
LIBADDNS_STATIC=
@@ -60357,7 +60681,7 @@
INSTALL_LIBADDNS=
UNINSTALL_LIBADDNS=
-@@ -71863,8 +68139,9 @@
+@@ -72360,8 +68623,9 @@
@@ -60369,7 +60693,7 @@
# Check whether --with-libaddns was given.
-@@ -71875,8 +68152,8 @@
+@@ -72372,8 +68636,8 @@
build_lib=yes
;;
*)
@@ -60380,7 +60704,7 @@
build_lib=no
;;
esac
-@@ -71884,8 +68161,8 @@
+@@ -72381,8 +68645,8 @@
else
# if unspecified, default is not to build
@@ -60391,7 +60715,7 @@
build_lib=no
-@@ -71899,22 +68176,24 @@
+@@ -72396,22 +68660,24 @@
UNINSTALL_LIBADDNS=uninstalllibaddns
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
@@ -60424,7 +60748,7 @@
fi
if test $enable_static = yes; then
LIBADDNS_STATIC=\$\(LIBADDNS_OBJ0\)
-@@ -71930,17 +68209,17 @@
+@@ -72427,17 +68693,17 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -60447,7 +60771,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statvfs64=cross
-@@ -71969,39 +68248,36 @@
+@@ -72466,39 +68732,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60495,7 +60819,7 @@
if test $fu_cv_sys_stat_statvfs64 = yes; then
space=yes
-@@ -72020,10 +68296,10 @@
+@@ -72517,10 +68780,10 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -60509,7 +60833,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -72047,35 +68323,31 @@
+@@ -72544,35 +68807,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60552,7 +60876,7 @@
if test $fu_cv_sys_stat_statvfs = yes; then
space=yes
-@@ -72089,10 +68361,10 @@
+@@ -72586,10 +68845,10 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -60566,7 +60890,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -72117,21 +68389,20 @@
+@@ -72614,21 +68873,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60591,7 +60915,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_fsid_int=no
-@@ -72139,8 +68410,8 @@
+@@ -72636,8 +68894,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -60602,7 +60926,7 @@
if test x"$samba_cv_fsid_int" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -72151,10 +68422,10 @@
+@@ -72648,10 +68906,10 @@
# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
# systems use f_bsize.
@@ -60616,7 +60940,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -72179,21 +68450,20 @@
+@@ -72676,21 +68934,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60641,7 +60965,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_frsize=no
-@@ -72201,8 +68471,8 @@
+@@ -72698,8 +68955,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -60652,8 +60976,108 @@
if test x"$samba_cv_frsize" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -72213,10 +68483,10 @@
+@@ -72709,10 +68966,10 @@
+ fi
+ # Some systems use f_flag in struct statvfs while others use f_flags
+-{ $as_echo "$as_me:$LINENO: checking that statvfs.statvfs_f_flag works" >&5
+-$as_echo_n "checking that statvfs.statvfs_f_flag works... " >&6; }
++{ echo "$as_me:$LINENO: checking that statvfs.statvfs_f_flag works" >&5
++echo $ECHO_N "checking that statvfs.statvfs_f_flag works... $ECHO_C" >&6; }
+ if test "${samba_cv_statvfs_f_flag+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -72737,21 +68994,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ samba_cv_statvfs_f_flag=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ samba_cv_statvfs_f_flag=no
+@@ -72759,8 +69015,8 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_statvfs_f_flag" >&5
+-$as_echo "$samba_cv_statvfs_f_flag" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_statvfs_f_flag" >&5
++echo "${ECHO_T}$samba_cv_statvfs_f_flag" >&6; }
+ if test x"$samba_cv_statvfs_f_flag" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -72769,10 +69025,10 @@
+
+ fi
+
+-{ $as_echo "$as_me:$LINENO: checking that statvfs.statvfs_f_flags works" >&5
+-$as_echo_n "checking that statvfs.statvfs_f_flags works... " >&6; }
++{ echo "$as_me:$LINENO: checking that statvfs.statvfs_f_flags works" >&5
++echo $ECHO_N "checking that statvfs.statvfs_f_flags works... $ECHO_C" >&6; }
+ if test "${samba_cv_statvfs_f_flags+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -72797,21 +69053,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ samba_cv_statvfs_f_flags=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ samba_cv_statvfs_f_flags=no
+@@ -72819,8 +69074,8 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_statvfs_f_flags" >&5
+-$as_echo "$samba_cv_statvfs_f_flags" >&6; }
++{ echo "$as_me:$LINENO: result: $samba_cv_statvfs_f_flags" >&5
++echo "${ECHO_T}$samba_cv_statvfs_f_flags" >&6; }
+ if test x"$samba_cv_statvfs_f_flags" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -72832,10 +69087,10 @@
+
if test $space = no; then
# DEC Alpha running OSF/1
- { $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
@@ -60666,7 +61090,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs3_osf1=no
-@@ -72244,40 +68514,37 @@
+@@ -72863,40 +69118,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60715,7 +61139,7 @@
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
space=yes
-@@ -72290,10 +68557,10 @@
+@@ -72909,10 +69161,10 @@
if test $space = no; then
# AIX
@@ -60729,7 +61153,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs2_bsize=no
-@@ -72327,40 +68594,37 @@
+@@ -72946,40 +69198,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60778,7 +61202,7 @@
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
space=yes
-@@ -72373,10 +68637,10 @@
+@@ -72992,10 +69241,10 @@
if test $space = no; then
# SVR3
@@ -60792,7 +61216,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs4=no
-@@ -72401,40 +68665,37 @@
+@@ -73020,40 +69269,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60841,7 +61265,7 @@
if test $fu_cv_sys_stat_statfs4 = yes; then
space=yes
-@@ -72447,10 +68708,10 @@
+@@ -73066,10 +69312,10 @@
if test $space = no; then
# 4.4BSD and NetBSD
@@ -60855,7 +61279,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs2_fsize=no
-@@ -72481,40 +68742,37 @@
+@@ -73100,40 +69346,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60904,7 +61328,7 @@
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
space=yes
-@@ -72527,10 +68785,10 @@
+@@ -73146,10 +69389,10 @@
if test $space = no; then
# Ultrix
@@ -60918,7 +61342,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_fs_data=no
-@@ -72565,40 +68823,37 @@
+@@ -73184,40 +69427,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -60967,7 +61391,7 @@
if test $fu_cv_sys_stat_fs_data = yes; then
space=yes
-@@ -72617,8 +68872,8 @@
+@@ -73236,8 +69476,8 @@
# If we don't have all of these then disable large
# file support.
#
@@ -60978,7 +61402,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -72646,21 +68901,20 @@
+@@ -73265,21 +69505,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61003,7 +61427,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=no
-@@ -72674,14 +68928,14 @@
+@@ -73293,8 +69532,8 @@
_ACEOF
fi
@@ -61014,18 +61438,544 @@
#################################################
# check for cluster extensions
+@@ -73306,8 +69545,8 @@
+ if test "${with_ctdb+set}" = set; then
+ withval=$with_ctdb; case "$withval" in
+ yes|no)
+- { $as_echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
+-$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
++ { echo "$as_me:$LINENO: WARNING: --with-ctdb called without argument" >&5
++echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
+ ;;
+ *)
+ CTDB_CPPFLAGS="-I$withval/include"
+@@ -73324,11 +69563,11 @@
--{ $as_echo "$as_me:$LINENO: checking whether to include cluster support" >&5
--$as_echo_n "checking whether to include cluster support... " >&6; }
-+{ echo "$as_me:$LINENO: checking whether to include cluster support" >&5
-+echo $ECHO_N "checking whether to include cluster support... $ECHO_C" >&6; }
+ for ac_header in ctdb.h ctdb_private.h
+ do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -73356,21 +69595,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+@@ -73378,15 +69616,12 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+@@ -73395,10 +69630,10 @@
+
+
+
+- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
+-$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
++ { echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
++echo $ECHO_N "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... $ECHO_C" >&6; }
+ if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -73432,21 +69667,20 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
+@@ -73454,8 +69688,8 @@
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
+-$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
++echo "${ECHO_T}$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&6; }
+ if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -73471,57 +69705,11 @@
+ fi
+
+ # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
+-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
+-$as_echo_n "checking for struct ctdb_tcp_client... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
++echo $ECHO_N "checking for struct ctdb_tcp_client... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_ctdb_tcp_client+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_type_struct_ctdb_tcp_client=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (struct ctdb_tcp_client))
+- 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
+@@ -73540,11 +69728,14 @@
+ #include <ctdb_private.h>
+
+
++typedef struct ctdb_tcp_client ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct ctdb_tcp_client)))
+- return 0;
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+@@ -73555,39 +69746,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_struct_ctdb_tcp_client=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_type_struct_ctdb_tcp_client=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-
++ ac_cv_type_struct_ctdb_tcp_client=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_tcp_client" >&5
+-$as_echo "$ac_cv_type_struct_ctdb_tcp_client" >&6; }
+-if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_tcp_client" >&5
++echo "${ECHO_T}$ac_cv_type_struct_ctdb_tcp_client" >&6; }
++if test $ac_cv_type_struct_ctdb_tcp_client = yes; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -73598,57 +69780,11 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
+-$as_echo_n "checking for struct ctdb_control_tcp... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
++echo $ECHO_N "checking for struct ctdb_control_tcp... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_ctdb_control_tcp+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_type_struct_ctdb_control_tcp=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (struct ctdb_control_tcp))
+- 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
+@@ -73667,11 +69803,14 @@
+ #include <ctdb_private.h>
+
+
++typedef struct ctdb_control_tcp ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct ctdb_control_tcp)))
+- return 0;
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+@@ -73682,39 +69821,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- :
++ ac_cv_type_struct_ctdb_control_tcp=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_type_struct_ctdb_control_tcp=yes
++ ac_cv_type_struct_ctdb_control_tcp=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp" >&5
+-$as_echo "$ac_cv_type_struct_ctdb_control_tcp" >&6; }
+-if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp" >&5
++echo "${ECHO_T}$ac_cv_type_struct_ctdb_control_tcp" >&6; }
++if test $ac_cv_type_struct_ctdb_control_tcp = yes; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -73729,57 +69859,11 @@
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp_addr" >&5
+-$as_echo_n "checking for struct ctdb_control_tcp_addr... " >&6; }
++{ echo "$as_me:$LINENO: checking for struct ctdb_control_tcp_addr" >&5
++echo $ECHO_N "checking for struct ctdb_control_tcp_addr... $ECHO_C" >&6; }
+ if test "${ac_cv_type_struct_ctdb_control_tcp_addr+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_type_struct_ctdb_control_tcp_addr=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-
+-int
+-main ()
+-{
+-if (sizeof (struct ctdb_control_tcp_addr))
+- 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
+@@ -73798,11 +69882,14 @@
+ #include <ctdb_private.h>
+
+
++typedef struct ctdb_control_tcp_addr ac__type_new_;
+ int
+ main ()
+ {
+-if (sizeof ((struct ctdb_control_tcp_addr)))
+- return 0;
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+@@ -73813,39 +69900,30 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_struct_ctdb_control_tcp_addr=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_type_struct_ctdb_control_tcp_addr=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
++ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-
++ ac_cv_type_struct_ctdb_control_tcp_addr=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp_addr" >&5
+-$as_echo "$ac_cv_type_struct_ctdb_control_tcp_addr" >&6; }
+-if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp_addr" >&5
++echo "${ECHO_T}$ac_cv_type_struct_ctdb_control_tcp_addr" >&6; }
++if test $ac_cv_type_struct_ctdb_control_tcp_addr = yes; then
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -73857,8 +69935,8 @@
+
+ CPPFLAGS="$SAVED_CPPFLAGS"
+
+-{ $as_echo "$as_me:$LINENO: checking cluster support" >&5
+-$as_echo_n "checking cluster support... " >&6; }
++{ echo "$as_me:$LINENO: checking cluster support" >&5
++echo $ECHO_N "checking cluster support... $ECHO_C" >&6; }
+
# Check whether --with-cluster-support was given.
if test "${with_cluster_support+set}" = set; then
-@@ -72694,19 +68948,19 @@
- #define CLUSTER_SUPPORT 1
+@@ -73872,8 +69950,8 @@
+
+ if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
+ if test "x$with_cluster_support" = "xyes"; then
+- { { $as_echo "$as_me:$LINENO: error: \"ctdb_private.h is required for cluster support\"" >&5
+-$as_echo "$as_me: error: \"ctdb_private.h is required for cluster support\"" >&2;}
++ { { echo "$as_me:$LINENO: error: \"ctdb_private.h is required for cluster support\"" >&5
++echo "$as_me: error: \"ctdb_private.h is required for cluster support\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ with_cluster_support=no
+@@ -73881,8 +69959,8 @@
+
+ if test x"$ctdb_broken" != x"no"; then
+ if test "x$with_cluster_support" = "xyes"; then
+- { { $as_echo "$as_me:$LINENO: error: \"cluster support: $ctdb_broken\"" >&5
+-$as_echo "$as_me: error: \"cluster support: $ctdb_broken\"" >&2;}
++ { { echo "$as_me:$LINENO: error: \"cluster support: $ctdb_broken\"" >&5
++echo "$as_me: error: \"cluster support: $ctdb_broken\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ with_cluster_support=no
+@@ -73895,18 +69973,18 @@
_ACEOF
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CTDB_CPPFLAGS}"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -61037,7 +61987,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-
#################################################
# check for ACL support
@@ -61048,7 +61997,7 @@
# Check whether --with-acl-support was given.
if test "${with_acl_support+set}" = set; then
-@@ -72722,24 +68976,24 @@
+@@ -73922,24 +70000,24 @@
with_acl_support="auto"
fi
@@ -61081,7 +62030,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_UNIXWARE_ACLS 1
-@@ -72748,8 +69002,8 @@
+@@ -73948,8 +70026,8 @@
default_static_modules="$default_static_modules vfs_solarisacl"
;;
*solaris*)
@@ -61092,7 +62041,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_SOLARIS_ACLS 1
-@@ -72759,8 +69013,8 @@
+@@ -73959,8 +70037,8 @@
default_static_modules="$default_static_modules vfs_solarisacl"
;;
*hpux*)
@@ -61103,7 +62052,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_HPUX_ACLS 1
-@@ -72769,8 +69023,8 @@
+@@ -73969,8 +70047,8 @@
default_static_modules="$default_static_modules vfs_hpuxacl"
;;
*irix*)
@@ -61114,7 +62063,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_IRIX_ACLS 1
-@@ -72779,8 +69033,8 @@
+@@ -73979,8 +70057,8 @@
default_static_modules="$default_static_modules vfs_irixacl"
;;
*aix*)
@@ -61125,7 +62074,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_AIX_ACLS 1
-@@ -72789,8 +69043,8 @@
+@@ -73989,8 +70067,8 @@
default_static_modules="$default_static_modules vfs_aixacl"
;;
*osf*)
@@ -61136,7 +62085,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_TRU64_ACLS 1
-@@ -72800,8 +69054,8 @@
+@@ -74000,8 +70078,8 @@
default_static_modules="$default_static_modules vfs_tru64acl"
;;
*darwin*)
@@ -61147,7 +62096,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NO_ACLS 1
-@@ -72809,10 +69063,10 @@
+@@ -74009,10 +70087,10 @@
;;
*)
@@ -61161,7 +62110,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lacl $LIBS"
-@@ -72844,46 +69098,42 @@
+@@ -74044,46 +70122,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61219,7 +62168,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lattr $LIBS"
-@@ -72915,46 +69165,42 @@
+@@ -74115,46 +70189,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61277,7 +62226,7 @@
else
acl_LIBS=$LIBS
-@@ -72988,49 +69234,45 @@
+@@ -74188,49 +70258,45 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61339,7 +62288,7 @@
else
acl_LIBS=$LIBS
-@@ -73063,37 +69305,33 @@
+@@ -74263,37 +70329,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61384,7 +62333,7 @@
if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -73103,8 +69341,8 @@
+@@ -74303,8 +70365,8 @@
fi
default_static_modules="$default_static_modules vfs_posixacl"
else
@@ -61395,7 +62344,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NO_ACLS 1
-@@ -73120,23 +69358,23 @@
+@@ -74320,23 +70382,23 @@
#################################################
# check for AIO support
@@ -61426,7 +62375,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-@@ -73168,44 +69406,40 @@
+@@ -74368,44 +70430,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61482,7 +62431,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-laio $LIBS"
-@@ -73237,44 +69471,40 @@
+@@ -74437,44 +70495,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61538,7 +62487,7 @@
else
aio_LIBS=$LIBS
-@@ -73301,40 +69531,36 @@
+@@ -74501,40 +70555,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61589,7 +62538,7 @@
else
aio_LIBS=$LIBS
-@@ -73361,36 +69587,32 @@
+@@ -74561,36 +70611,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61633,7 +62582,7 @@
if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -73413,8 +69635,8 @@
+@@ -74613,8 +70659,8 @@
fi
if test x"$samba_cv_HAVE_AIO" = x"yes"; then
@@ -61644,7 +62593,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_read(&a); }
-@@ -73425,41 +69647,37 @@
+@@ -74625,41 +70671,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61697,7 +62646,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_write(&a); }
-@@ -73470,41 +69688,37 @@
+@@ -74670,41 +70712,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61750,7 +62699,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_fsync(1, &a); }
-@@ -73515,41 +69729,37 @@
+@@ -74715,41 +70753,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61803,7 +62752,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_return(&a); }
-@@ -73560,41 +69770,37 @@
+@@ -74760,41 +70794,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61856,7 +62805,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_error(&a); }
-@@ -73605,41 +69811,37 @@
+@@ -74805,41 +70835,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61909,7 +62858,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_cancel(1, &a); }
-@@ -73650,41 +69852,37 @@
+@@ -74850,41 +70876,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -61962,7 +62911,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }
-@@ -73695,43 +69893,39 @@
+@@ -74895,43 +70917,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62017,7 +62966,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_read64(&a); }
-@@ -73742,41 +69936,37 @@
+@@ -74942,41 +70960,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62070,7 +63019,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_write64(&a); }
-@@ -73787,41 +69977,37 @@
+@@ -74987,41 +71001,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62123,7 +63072,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_fsync64(1, &a); }
-@@ -73832,41 +70018,37 @@
+@@ -75032,41 +71042,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62176,7 +63125,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_return64(&a); }
-@@ -73877,41 +70059,37 @@
+@@ -75077,41 +71083,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62229,7 +63178,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_error64(&a); }
-@@ -73922,41 +70100,37 @@
+@@ -75122,41 +71124,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62282,7 +63231,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_cancel64(1, &a); }
-@@ -73967,41 +70141,37 @@
+@@ -75167,41 +71165,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62335,7 +63284,7 @@
cat >conftest.$ac_ext <<_ACEOF
#include <aio.h>
int main() { struct aiocb a; return aio_suspend64(&a, 1, NULL); }
-@@ -74012,36 +70182,32 @@
+@@ -75212,36 +71206,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62381,7 +63330,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -74049,8 +70215,8 @@
+@@ -75249,8 +71239,8 @@
esac
;;
*)
@@ -62392,7 +63341,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NO_AIO 1
-@@ -74064,8 +70230,8 @@
+@@ -75264,8 +71254,8 @@
#define HAVE_NO_AIO 1
_ACEOF
@@ -62403,7 +63352,7 @@
fi
-@@ -74081,23 +70247,23 @@
+@@ -75281,23 +71271,23 @@
# check for sendfile support
with_sendfile_support=yes
@@ -62435,7 +63384,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74126,40 +70292,36 @@
+@@ -75326,40 +71316,36 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62486,7 +63435,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74188,41 +70350,37 @@
+@@ -75388,41 +71374,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62538,7 +63487,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74255,35 +70413,31 @@
+@@ -75455,35 +71437,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62581,7 +63530,7 @@
if test x"$samba_cv_HAVE_SENDFILE64" = x"yes"; then
-@@ -74329,16 +70483,16 @@
+@@ -75529,16 +71507,16 @@
_ACEOF
else
@@ -62603,7 +63552,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74378,35 +70532,31 @@
+@@ -75578,35 +71556,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62646,7 +63595,7 @@
if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-@@ -74425,16 +70575,16 @@
+@@ -75625,16 +71599,16 @@
_ACEOF
else
@@ -62668,7 +63617,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74471,35 +70621,31 @@
+@@ -75671,35 +71645,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62711,7 +63660,7 @@
if test x"$samba_cv_HAVE_SENDFILE64" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -74517,14 +70663,14 @@
+@@ -75717,14 +71687,14 @@
_ACEOF
else
@@ -62731,7 +63680,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74561,35 +70707,31 @@
+@@ -75761,35 +71731,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62774,7 +63723,7 @@
if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -74607,17 +70749,17 @@
+@@ -75807,17 +71773,17 @@
_ACEOF
else
@@ -62797,7 +63746,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsendfile $LIBS"
-@@ -74649,37 +70791,33 @@
+@@ -75849,37 +71815,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62843,7 +63792,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -74688,10 +70826,10 @@
+@@ -75888,10 +71850,10 @@
fi
@@ -62857,7 +63806,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74735,35 +70873,31 @@
+@@ -75935,35 +71897,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62900,7 +63849,7 @@
if test x"$samba_cv_HAVE_SENDFILEV64" = x"yes"; then
-@@ -74782,14 +70916,14 @@
+@@ -75982,14 +71940,14 @@
_ACEOF
else
@@ -62920,7 +63869,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74833,35 +70967,31 @@
+@@ -76033,35 +71991,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -62963,7 +63912,7 @@
if test x"$samba_cv_HAVE_SENDFILEV" = x"yes"; then
-@@ -74880,15 +71010,15 @@
+@@ -76080,15 +72034,15 @@
_ACEOF
else
@@ -62984,7 +63933,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -74929,35 +71059,31 @@
+@@ -76129,35 +72083,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63027,7 +63976,7 @@
if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -74975,8 +71101,8 @@
+@@ -76175,8 +72125,8 @@
_ACEOF
else
@@ -63038,7 +63987,7 @@
fi
;;
*)
-@@ -74984,13 +71110,13 @@
+@@ -76184,13 +72134,13 @@
esac
;;
*)
@@ -63056,7 +64005,7 @@
fi
-@@ -74998,10 +71124,10 @@
+@@ -76198,10 +72148,10 @@
############################################
# See if we have the Linux readahead syscall.
@@ -63070,7 +64019,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -75029,35 +71155,31 @@
+@@ -76229,35 +72179,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63113,7 +64062,7 @@
if test x"$samba_cv_HAVE_LINUX_READAHEAD" = x"yes"; then
-@@ -75068,10 +71190,10 @@
+@@ -76268,10 +72214,10 @@
fi
@@ -63127,7 +64076,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -75095,21 +71217,20 @@
+@@ -76295,21 +72241,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63152,7 +64101,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_readahead_decl=no
-@@ -75117,8 +71238,8 @@
+@@ -76317,8 +72262,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63163,7 +64112,7 @@
if test x"$ac_cv_have_readahead_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -75131,10 +71252,10 @@
+@@ -76331,10 +72276,10 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -63177,7 +64126,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -75162,35 +71283,31 @@
+@@ -76362,35 +72307,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63220,7 +64169,7 @@
if test x"$samba_cv_HAVE_POSIX_FADVISE" = x"yes"; then
-@@ -75203,10 +71320,10 @@
+@@ -76403,10 +72344,10 @@
############################################
# See if we have the Linux splice syscall.
@@ -63234,7 +64183,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -75234,35 +71351,31 @@
+@@ -76434,35 +72375,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63277,7 +64226,7 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
-@@ -75273,10 +71386,10 @@
+@@ -76473,10 +72410,10 @@
fi
@@ -63291,7 +64240,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -75300,21 +71413,20 @@
+@@ -76500,21 +72437,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63316,7 +64265,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_splice_decl=no
-@@ -75322,8 +71434,8 @@
+@@ -76522,8 +72458,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63327,7 +64276,7 @@
if test x"$ac_cv_have_splice_decl" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -75338,8 +71450,8 @@
+@@ -76538,8 +72474,8 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -63338,7 +64287,7 @@
# Initially, the value of $host_os decides whether winbind is supported
-@@ -75355,11 +71467,11 @@
+@@ -76555,11 +72491,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
@@ -63352,7 +64301,7 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -75474,8 +71586,8 @@
+@@ -76674,8 +72610,8 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -63363,7 +64312,7 @@
cat >>confdefs.h <<\_ACEOF
#define WITH_WINBIND 1
-@@ -75490,14 +71602,14 @@
+@@ -76690,14 +72626,14 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -63383,7 +64332,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-@@ -75529,37 +71641,33 @@
+@@ -76729,37 +72665,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63429,7 +64378,7 @@
WINBIND_NSS_PTHREAD="-lpthread"
cat >>confdefs.h <<\_ACEOF
-@@ -75581,10 +71689,10 @@
+@@ -76781,10 +72713,10 @@
# Solaris 10 does have new member in nss_XbyY_key
@@ -63443,7 +64392,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -75610,21 +71718,20 @@
+@@ -76810,21 +72742,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63468,7 +64417,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -75651,21 +71758,20 @@
+@@ -76851,21 +72782,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63493,7 +64442,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_union_nss_XbyY_key_ipnode_af_family=no
-@@ -75676,9 +71782,9 @@
+@@ -76876,9 +72806,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63506,7 +64455,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NSS_XBYY_KEY_IPNODE 1
-@@ -75690,10 +71796,10 @@
+@@ -76890,10 +72820,10 @@
# Solaris has some extra fields in struct passwd that need to be
# initialised otherwise nscd crashes.
@@ -63520,7 +64469,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -75719,21 +71825,20 @@
+@@ -76919,21 +72849,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63545,7 +64494,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -75760,21 +71865,20 @@
+@@ -76960,21 +72889,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63570,7 +64519,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_passwd_pw_comment=no
-@@ -75785,9 +71889,9 @@
+@@ -76985,9 +72913,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63583,7 +64532,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PASSWD_PW_COMMENT 1
-@@ -75796,10 +71900,10 @@
+@@ -76996,10 +72924,10 @@
fi
@@ -63597,7 +64546,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -75825,21 +71929,20 @@
+@@ -77025,21 +72953,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63622,7 +64571,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -75866,21 +71969,20 @@
+@@ -77066,21 +72993,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63647,7 +64596,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_passwd_pw_age=no
-@@ -75891,9 +71993,9 @@
+@@ -77091,9 +73017,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63660,7 +64609,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PASSWD_PW_AGE 1
-@@ -75904,10 +72006,10 @@
+@@ -77104,10 +73030,10 @@
# AIX 4.3.x and 5.1 do not have as many members in
# struct secmethod_table as AIX 5.2
@@ -63674,7 +64623,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -75933,21 +72035,20 @@
+@@ -77133,21 +73059,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63699,7 +64648,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -75974,21 +72075,20 @@
+@@ -77174,21 +73099,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63724,7 +64673,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_secmethod_table_method_attrlist=no
-@@ -75999,9 +72099,9 @@
+@@ -77199,9 +73123,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63737,7 +64686,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -76010,10 +72110,10 @@
+@@ -77210,10 +73134,10 @@
fi
@@ -63751,7 +64700,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -76039,21 +72139,20 @@
+@@ -77239,21 +73163,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63776,7 +64725,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -76080,21 +72179,20 @@
+@@ -77280,21 +73203,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63801,7 +64750,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_secmethod_table_method_version=no
-@@ -76105,9 +72203,9 @@
+@@ -77305,9 +73227,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63814,7 +64763,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -76117,10 +72215,10 @@
+@@ -77317,10 +73239,10 @@
fi
@@ -63828,7 +64777,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -76148,21 +72246,20 @@
+@@ -77348,21 +73270,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63853,7 +64802,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
samba_cv_HAVE_PEERCRED=no
-@@ -76170,8 +72267,8 @@
+@@ -77370,8 +73291,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -63864,7 +64813,7 @@
if test x"$samba_cv_HAVE_PEERCRED" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -76199,10 +72296,10 @@
+@@ -77399,10 +73320,10 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -63878,7 +64827,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpopt $LIBS"
-@@ -76234,37 +72331,33 @@
+@@ -77434,37 +73355,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -63924,7 +64873,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -76272,17 +72365,17 @@
+@@ -77472,17 +73389,17 @@
fi
@@ -63948,7 +64897,7 @@
BUILD_POPT=""
POPTLIBS="-lpopt"
fi
-@@ -76306,21 +72399,20 @@
+@@ -77506,21 +73423,20 @@
for ac_header in dns_sd.h
do
@@ -63979,7 +64928,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -76336,33 +72428,32 @@
+@@ -77536,33 +73452,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64020,7 +64969,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -76376,52 +72467,51 @@
+@@ -77576,52 +73491,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64094,7 +65043,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -76430,24 +72520,21 @@
+@@ -77630,24 +73544,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -64127,7 +65076,7 @@
_ACEOF
fi
-@@ -76463,11 +72550,11 @@
+@@ -77663,11 +73574,11 @@
for ac_func in DNSServiceRegister
do
@@ -64143,7 +65092,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -76520,42 +72607,35 @@
+@@ -77720,42 +73631,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64196,7 +65145,7 @@
_ACEOF
fi
-@@ -76570,10 +72650,10 @@
+@@ -77770,10 +73674,10 @@
@@ -64210,7 +65159,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -76603,38 +72683,34 @@
+@@ -77803,38 +73707,34 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64256,7 +65205,7 @@
if test $ac_cv_lib_ext_dns_sd_DNSServiceRegister = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DNSSERVICEREGISTER 1
-@@ -76673,8 +72749,8 @@
+@@ -77873,8 +73773,8 @@
else
if test x"$enable_dnssd" = x"yes"; then
@@ -64267,7 +65216,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -76699,10 +72775,10 @@
+@@ -77899,10 +73799,10 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -64281,7 +65230,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-liniparser $LIBS"
-@@ -76734,37 +72810,33 @@
+@@ -77934,37 +73834,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64327,7 +65276,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -76772,17 +72844,17 @@
+@@ -77972,17 +73868,17 @@
fi
@@ -64351,7 +65300,7 @@
BUILD_INIPARSER=""
INIPARSERLIBS="-liniparser"
fi
-@@ -76794,10 +72866,10 @@
+@@ -77994,10 +73890,10 @@
# Checks for the vfs_fileid module
# Start
@@ -64365,7 +65314,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -76850,55 +72922,50 @@
+@@ -78050,55 +73946,50 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64437,7 +65386,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -76914,33 +72981,32 @@
+@@ -78114,33 +74005,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64478,7 +65427,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -76954,52 +73020,51 @@
+@@ -78154,52 +74044,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64552,7 +65501,7 @@
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to samba-technical at samba.org ##
-@@ -77008,24 +73073,21 @@
+@@ -78208,24 +74097,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -64585,7 +65534,7 @@
_ACEOF
fi
-@@ -77033,10 +73095,10 @@
+@@ -78233,10 +74119,10 @@
done
@@ -64599,7 +65548,7 @@
else
if test "$cross_compiling" = yes; then
-@@ -77064,32 +73126,29 @@
+@@ -78264,32 +74150,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -64638,7 +65587,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -77097,8 +73156,8 @@
+@@ -78297,8 +74180,8 @@
fi
@@ -64649,7 +65598,7 @@
if test x"$ac_cv_func_getmntent" = x"yes" -a \
x"$vfsfileid_cv_statfs" = x"yes"; then
-@@ -77155,8 +73214,8 @@
+@@ -78355,8 +74238,8 @@
@@ -64660,7 +65609,7 @@
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_ldap"; then
-@@ -77172,8 +73231,8 @@
+@@ -78372,8 +74255,8 @@
_ACEOF
PDB_MODULES="$PDB_MODULES "bin/ldapsam.$SHLIBEXT""
@@ -64671,7 +65620,7 @@
string_shared_modules="$string_shared_modules pdb_ldap"
elif test x"$DEST" = xSTATIC; then
-@@ -77183,17 +73242,17 @@
+@@ -78383,17 +74266,17 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -64695,7 +65644,7 @@
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_smbpasswd"; then
-@@ -77209,8 +73268,8 @@
+@@ -78409,8 +74292,8 @@
_ACEOF
PDB_MODULES="$PDB_MODULES "bin/smbpasswd.$SHLIBEXT""
@@ -64706,7 +65655,7 @@
string_shared_modules="$string_shared_modules pdb_smbpasswd"
elif test x"$DEST" = xSTATIC; then
-@@ -77220,17 +73279,17 @@
+@@ -78420,17 +74303,17 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -64730,7 +65679,7 @@
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
elif test "$MODULE_pdb" -a "$MODULE_DEFAULT_pdb_tdbsam"; then
-@@ -77246,8 +73305,8 @@
+@@ -78446,8 +74329,8 @@
_ACEOF
PDB_MODULES="$PDB_MODULES "bin/tdbsam.$SHLIBEXT""
@@ -64741,7 +65690,7 @@
string_shared_modules="$string_shared_modules pdb_tdbsam"
elif test x"$DEST" = xSTATIC; then
-@@ -77257,12 +73316,12 @@
+@@ -78457,12 +74340,12 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -64758,7 +65707,7 @@
fi
-@@ -77283,8 +73342,8 @@
+@@ -78483,8 +74366,8 @@
@@ -64769,7 +65718,7 @@
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_lsarpc"; then
-@@ -77300,8 +73359,8 @@
+@@ -78500,8 +74383,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_lsarpc.$SHLIBEXT""
@@ -64780,7 +65729,7 @@
string_shared_modules="$string_shared_modules rpc_lsarpc"
elif test x"$DEST" = xSTATIC; then
-@@ -77311,17 +73370,17 @@
+@@ -78511,17 +74394,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -64804,7 +65753,7 @@
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_winreg"; then
-@@ -77337,8 +73396,8 @@
+@@ -78537,8 +74420,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_winreg.$SHLIBEXT""
@@ -64815,7 +65764,7 @@
string_shared_modules="$string_shared_modules rpc_winreg"
elif test x"$DEST" = xSTATIC; then
-@@ -77348,17 +73407,17 @@
+@@ -78548,17 +74431,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -64839,7 +65788,7 @@
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_initshutdown"; then
-@@ -77374,8 +73433,8 @@
+@@ -78574,8 +74457,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_initshutdown.$SHLIBEXT""
@@ -64850,7 +65799,7 @@
string_shared_modules="$string_shared_modules rpc_initshutdown"
elif test x"$DEST" = xSTATIC; then
-@@ -77385,17 +73444,17 @@
+@@ -78585,17 +74468,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -64874,7 +65823,7 @@
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_dssetup"; then
-@@ -77411,8 +73470,8 @@
+@@ -78611,8 +74494,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_dssetup.$SHLIBEXT""
@@ -64885,7 +65834,7 @@
string_shared_modules="$string_shared_modules rpc_dssetup"
elif test x"$DEST" = xSTATIC; then
-@@ -77422,17 +73481,17 @@
+@@ -78622,17 +74505,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -64909,7 +65858,7 @@
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_wkssvc"; then
-@@ -77448,8 +73507,8 @@
+@@ -78648,8 +74531,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_wkssvc.$SHLIBEXT""
@@ -64920,7 +65869,7 @@
string_shared_modules="$string_shared_modules rpc_wkssvc"
elif test x"$DEST" = xSTATIC; then
-@@ -77459,17 +73518,17 @@
+@@ -78659,17 +74542,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -64944,7 +65893,7 @@
if test "$MODULE_rpc_svcctl2"; then
DEST=$MODULE_rpc_svcctl2
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_svcctl2"; then
-@@ -77485,8 +73544,8 @@
+@@ -78685,8 +74568,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_svcctl2.$SHLIBEXT""
@@ -64955,7 +65904,7 @@
string_shared_modules="$string_shared_modules rpc_svcctl2"
elif test x"$DEST" = xSTATIC; then
-@@ -77496,17 +73555,17 @@
+@@ -78696,17 +74579,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -64979,7 +65928,7 @@
if test "$MODULE_rpc_ntsvcs2"; then
DEST=$MODULE_rpc_ntsvcs2
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_ntsvcs2"; then
-@@ -77522,8 +73581,8 @@
+@@ -78722,8 +74605,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_ntsvcs2.$SHLIBEXT""
@@ -64990,7 +65939,7 @@
string_shared_modules="$string_shared_modules rpc_ntsvcs2"
elif test x"$DEST" = xSTATIC; then
-@@ -77533,17 +73592,17 @@
+@@ -78733,17 +74616,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -65014,7 +65963,7 @@
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_netlogon"; then
-@@ -77559,8 +73618,8 @@
+@@ -78759,8 +74642,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_NETLOGON.$SHLIBEXT""
@@ -65025,7 +65974,7 @@
string_shared_modules="$string_shared_modules rpc_netlogon"
elif test x"$DEST" = xSTATIC; then
-@@ -77570,17 +73629,17 @@
+@@ -78770,17 +74653,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -65049,7 +65998,7 @@
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_netdfs"; then
-@@ -77596,8 +73655,8 @@
+@@ -78796,8 +74679,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_netdfs.$SHLIBEXT""
@@ -65060,7 +66009,7 @@
string_shared_modules="$string_shared_modules rpc_netdfs"
elif test x"$DEST" = xSTATIC; then
-@@ -77607,17 +73666,17 @@
+@@ -78807,17 +74690,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -65084,7 +66033,7 @@
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_srvsvc"; then
-@@ -77633,8 +73692,8 @@
+@@ -78833,8 +74716,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_svcsvc.$SHLIBEXT""
@@ -65095,7 +66044,7 @@
string_shared_modules="$string_shared_modules rpc_srvsvc"
elif test x"$DEST" = xSTATIC; then
-@@ -77644,17 +73703,17 @@
+@@ -78844,17 +74727,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -65119,7 +66068,7 @@
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_spoolss"; then
-@@ -77670,8 +73729,8 @@
+@@ -78870,8 +74753,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_spoolss.$SHLIBEXT""
@@ -65130,7 +66079,7 @@
string_shared_modules="$string_shared_modules rpc_spoolss"
elif test x"$DEST" = xSTATIC; then
-@@ -77681,17 +73740,17 @@
+@@ -78881,17 +74764,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -65154,7 +66103,7 @@
if test "$MODULE_rpc_eventlog2"; then
DEST=$MODULE_rpc_eventlog2
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_eventlog2"; then
-@@ -77707,8 +73766,8 @@
+@@ -78907,8 +74790,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_eventlog2.$SHLIBEXT""
@@ -65165,7 +66114,7 @@
string_shared_modules="$string_shared_modules rpc_eventlog2"
elif test x"$DEST" = xSTATIC; then
-@@ -77718,17 +73777,17 @@
+@@ -78918,17 +74801,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -65189,7 +66138,7 @@
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_samr"; then
-@@ -77744,8 +73803,8 @@
+@@ -78944,8 +74827,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_samr.$SHLIBEXT""
@@ -65200,7 +66149,7 @@
string_shared_modules="$string_shared_modules rpc_samr"
elif test x"$DEST" = xSTATIC; then
-@@ -77755,17 +73814,17 @@
+@@ -78955,17 +74838,17 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -65224,7 +66173,7 @@
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
elif test "$MODULE_rpc" -a "$MODULE_DEFAULT_rpc_rpcecho"; then
-@@ -77781,8 +73840,8 @@
+@@ -78981,8 +74864,8 @@
_ACEOF
RPC_MODULES="$RPC_MODULES "bin/librpc_rpcecho.$SHLIBEXT""
@@ -65235,7 +66184,7 @@
string_shared_modules="$string_shared_modules rpc_rpcecho"
elif test x"$DEST" = xSTATIC; then
-@@ -77792,12 +73851,12 @@
+@@ -78992,12 +74875,12 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -65252,7 +66201,7 @@
fi
-@@ -77817,8 +73876,8 @@
+@@ -79017,8 +74900,8 @@
@@ -65263,7 +66212,7 @@
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_ldap"; then
-@@ -77834,8 +73893,8 @@
+@@ -79034,8 +74917,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/ldap.$SHLIBEXT""
@@ -65274,7 +66223,7 @@
string_shared_modules="$string_shared_modules idmap_ldap"
elif test x"$DEST" = xSTATIC; then
-@@ -77845,17 +73904,17 @@
+@@ -79045,17 +74928,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -65298,7 +66247,7 @@
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_tdb"; then
-@@ -77871,8 +73930,8 @@
+@@ -79071,8 +74954,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/tdb.$SHLIBEXT""
@@ -65309,7 +66258,7 @@
string_shared_modules="$string_shared_modules idmap_tdb"
elif test x"$DEST" = xSTATIC; then
-@@ -77882,17 +73941,17 @@
+@@ -79082,17 +74965,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -65333,7 +66282,7 @@
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_tdb2"; then
-@@ -77908,8 +73967,8 @@
+@@ -79108,8 +74991,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/tdb2.$SHLIBEXT""
@@ -65344,7 +66293,7 @@
string_shared_modules="$string_shared_modules idmap_tdb2"
elif test x"$DEST" = xSTATIC; then
-@@ -77919,17 +73978,17 @@
+@@ -79119,17 +75002,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -65368,7 +66317,7 @@
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_passdb"; then
-@@ -77945,8 +74004,8 @@
+@@ -79145,8 +75028,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/passdb.$SHLIBEXT""
@@ -65379,7 +66328,7 @@
string_shared_modules="$string_shared_modules idmap_passdb"
elif test x"$DEST" = xSTATIC; then
-@@ -77956,17 +74015,17 @@
+@@ -79156,17 +75039,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -65403,7 +66352,7 @@
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_nss"; then
-@@ -77982,8 +74041,8 @@
+@@ -79182,8 +75065,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/nss.$SHLIBEXT""
@@ -65414,7 +66363,7 @@
string_shared_modules="$string_shared_modules idmap_nss"
elif test x"$DEST" = xSTATIC; then
-@@ -77993,17 +74052,17 @@
+@@ -79193,17 +75076,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -65438,7 +66387,7 @@
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_rid"; then
-@@ -78019,8 +74078,8 @@
+@@ -79219,8 +75102,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/rid.$SHLIBEXT""
@@ -65449,7 +66398,7 @@
string_shared_modules="$string_shared_modules idmap_rid"
elif test x"$DEST" = xSTATIC; then
-@@ -78030,17 +74089,17 @@
+@@ -79230,17 +75113,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -65473,7 +66422,7 @@
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_ad"; then
-@@ -78056,8 +74115,8 @@
+@@ -79256,8 +75139,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/ad.$SHLIBEXT""
@@ -65484,7 +66433,7 @@
string_shared_modules="$string_shared_modules idmap_ad"
elif test x"$DEST" = xSTATIC; then
-@@ -78067,17 +74126,17 @@
+@@ -79267,17 +75150,17 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -65508,7 +66457,7 @@
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_hash"; then
-@@ -78093,8 +74152,8 @@
+@@ -79293,8 +75176,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/hash.$SHLIBEXT""
@@ -65519,7 +66468,7 @@
string_shared_modules="$string_shared_modules idmap_hash"
elif test x"$DEST" = xSTATIC; then
-@@ -78104,17 +74163,17 @@
+@@ -79304,17 +75187,17 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -65543,7 +66492,7 @@
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
elif test "$MODULE_idmap" -a "$MODULE_DEFAULT_idmap_adex"; then
-@@ -78130,8 +74189,8 @@
+@@ -79330,8 +75213,8 @@
_ACEOF
IDMAP_MODULES="$IDMAP_MODULES "bin/adex.$SHLIBEXT""
@@ -65554,7 +66503,7 @@
string_shared_modules="$string_shared_modules idmap_adex"
elif test x"$DEST" = xSTATIC; then
-@@ -78141,12 +74200,12 @@
+@@ -79341,12 +75224,12 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -65571,7 +66520,7 @@
fi
-@@ -78166,8 +74225,8 @@
+@@ -79366,8 +75249,8 @@
@@ -65582,7 +66531,7 @@
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
elif test "$MODULE_nss_info" -a "$MODULE_DEFAULT_nss_info_template"; then
-@@ -78183,8 +74242,8 @@
+@@ -79383,8 +75266,8 @@
_ACEOF
NSS_INFO_MODULES="$NSS_INFO_MODULES "bin/template.$SHLIBEXT""
@@ -65593,7 +66542,7 @@
string_shared_modules="$string_shared_modules nss_info_template"
elif test x"$DEST" = xSTATIC; then
-@@ -78194,12 +74253,12 @@
+@@ -79394,12 +75277,12 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -65610,7 +66559,7 @@
fi
-@@ -78219,8 +74278,8 @@
+@@ -79419,8 +75302,8 @@
@@ -65621,7 +66570,7 @@
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_weird"; then
-@@ -78236,8 +74295,8 @@
+@@ -79436,8 +75319,8 @@
_ACEOF
CHARSET_MODULES="$CHARSET_MODULES "bin/weird.$SHLIBEXT""
@@ -65632,7 +66581,7 @@
string_shared_modules="$string_shared_modules charset_weird"
elif test x"$DEST" = xSTATIC; then
-@@ -78247,17 +74306,17 @@
+@@ -79447,17 +75330,17 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -65656,7 +66605,7 @@
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_CP850"; then
-@@ -78273,8 +74332,8 @@
+@@ -79473,8 +75356,8 @@
_ACEOF
CHARSET_MODULES="$CHARSET_MODULES "bin/CP850.$SHLIBEXT""
@@ -65667,7 +66616,7 @@
string_shared_modules="$string_shared_modules charset_CP850"
elif test x"$DEST" = xSTATIC; then
-@@ -78284,17 +74343,17 @@
+@@ -79484,17 +75367,17 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -65691,7 +66640,7 @@
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_CP437"; then
-@@ -78310,8 +74369,8 @@
+@@ -79510,8 +75393,8 @@
_ACEOF
CHARSET_MODULES="$CHARSET_MODULES "bin/CP437.$SHLIBEXT""
@@ -65702,7 +66651,7 @@
string_shared_modules="$string_shared_modules charset_CP437"
elif test x"$DEST" = xSTATIC; then
-@@ -78321,17 +74380,17 @@
+@@ -79521,17 +75404,17 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -65726,7 +66675,7 @@
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
elif test "$MODULE_charset" -a "$MODULE_DEFAULT_charset_macosxfs"; then
-@@ -78347,8 +74406,8 @@
+@@ -79547,8 +75430,8 @@
_ACEOF
CHARSET_MODULES="$CHARSET_MODULES "bin/macosxfs.$SHLIBEXT""
@@ -65737,7 +66686,7 @@
string_shared_modules="$string_shared_modules charset_macosxfs"
elif test x"$DEST" = xSTATIC; then
-@@ -78358,12 +74417,12 @@
+@@ -79558,12 +75441,12 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -65754,7 +66703,7 @@
fi
-@@ -78383,8 +74442,8 @@
+@@ -79583,8 +75466,8 @@
@@ -65765,7 +66714,7 @@
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_sam"; then
-@@ -78400,8 +74459,8 @@
+@@ -79600,8 +75483,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/sam.$SHLIBEXT""
@@ -65776,7 +66725,7 @@
string_shared_modules="$string_shared_modules auth_sam"
elif test x"$DEST" = xSTATIC; then
-@@ -78411,17 +74470,17 @@
+@@ -79611,17 +75494,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -65800,7 +66749,7 @@
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_unix"; then
-@@ -78437,8 +74496,8 @@
+@@ -79637,8 +75520,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/unix.$SHLIBEXT""
@@ -65811,7 +66760,7 @@
string_shared_modules="$string_shared_modules auth_unix"
elif test x"$DEST" = xSTATIC; then
-@@ -78448,17 +74507,17 @@
+@@ -79648,17 +75531,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -65835,7 +66784,7 @@
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_winbind"; then
-@@ -78474,8 +74533,8 @@
+@@ -79674,8 +75557,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/winbind.$SHLIBEXT""
@@ -65846,7 +66795,7 @@
string_shared_modules="$string_shared_modules auth_winbind"
elif test x"$DEST" = xSTATIC; then
-@@ -78485,17 +74544,17 @@
+@@ -79685,17 +75568,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -65870,7 +66819,7 @@
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_server"; then
-@@ -78511,8 +74570,8 @@
+@@ -79711,8 +75594,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/smbserver.$SHLIBEXT""
@@ -65881,7 +66830,7 @@
string_shared_modules="$string_shared_modules auth_server"
elif test x"$DEST" = xSTATIC; then
-@@ -78522,17 +74581,17 @@
+@@ -79722,17 +75605,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -65905,7 +66854,7 @@
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_domain"; then
-@@ -78548,8 +74607,8 @@
+@@ -79748,8 +75631,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/domain.$SHLIBEXT""
@@ -65916,7 +66865,7 @@
string_shared_modules="$string_shared_modules auth_domain"
elif test x"$DEST" = xSTATIC; then
-@@ -78559,17 +74618,17 @@
+@@ -79759,17 +75642,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -65940,7 +66889,7 @@
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_builtin"; then
-@@ -78585,8 +74644,8 @@
+@@ -79785,8 +75668,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/builtin.$SHLIBEXT""
@@ -65951,7 +66900,7 @@
string_shared_modules="$string_shared_modules auth_builtin"
elif test x"$DEST" = xSTATIC; then
-@@ -78596,17 +74655,17 @@
+@@ -79796,17 +75679,17 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -65975,7 +66924,7 @@
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
elif test "$MODULE_auth" -a "$MODULE_DEFAULT_auth_script"; then
-@@ -78622,8 +74681,8 @@
+@@ -79822,8 +75705,8 @@
_ACEOF
AUTH_MODULES="$AUTH_MODULES "bin/script.$SHLIBEXT""
@@ -65986,7 +66935,7 @@
string_shared_modules="$string_shared_modules auth_script"
elif test x"$DEST" = xSTATIC; then
-@@ -78633,12 +74692,12 @@
+@@ -79833,12 +75716,12 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -66003,7 +66952,7 @@
fi
-@@ -78658,8 +74717,8 @@
+@@ -79858,8 +75741,8 @@
@@ -66014,7 +66963,7 @@
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_default"; then
-@@ -78675,8 +74734,8 @@
+@@ -79875,8 +75758,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/default.$SHLIBEXT""
@@ -66025,7 +66974,7 @@
string_shared_modules="$string_shared_modules vfs_default"
elif test x"$DEST" = xSTATIC; then
-@@ -78686,17 +74745,17 @@
+@@ -79886,17 +75769,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -66049,7 +66998,7 @@
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_recycle"; then
-@@ -78712,8 +74771,8 @@
+@@ -79912,8 +75795,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/recycle.$SHLIBEXT""
@@ -66060,7 +67009,7 @@
string_shared_modules="$string_shared_modules vfs_recycle"
elif test x"$DEST" = xSTATIC; then
-@@ -78723,17 +74782,17 @@
+@@ -79923,17 +75806,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -66084,7 +67033,7 @@
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_audit"; then
-@@ -78749,8 +74808,8 @@
+@@ -79949,8 +75832,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/audit.$SHLIBEXT""
@@ -66095,7 +67044,7 @@
string_shared_modules="$string_shared_modules vfs_audit"
elif test x"$DEST" = xSTATIC; then
-@@ -78760,17 +74819,17 @@
+@@ -79960,17 +75843,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -66119,7 +67068,7 @@
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_extd_audit"; then
-@@ -78786,8 +74845,8 @@
+@@ -79986,8 +75869,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/extd_audit.$SHLIBEXT""
@@ -66130,7 +67079,7 @@
string_shared_modules="$string_shared_modules vfs_extd_audit"
elif test x"$DEST" = xSTATIC; then
-@@ -78797,17 +74856,17 @@
+@@ -79997,17 +75880,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -66154,7 +67103,7 @@
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_full_audit"; then
-@@ -78823,8 +74882,8 @@
+@@ -80023,8 +75906,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/full_audit.$SHLIBEXT""
@@ -66165,7 +67114,7 @@
string_shared_modules="$string_shared_modules vfs_full_audit"
elif test x"$DEST" = xSTATIC; then
-@@ -78834,17 +74893,17 @@
+@@ -80034,17 +75917,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -66189,7 +67138,7 @@
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_netatalk"; then
-@@ -78860,8 +74919,8 @@
+@@ -80060,8 +75943,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/netatalk.$SHLIBEXT""
@@ -66200,7 +67149,7 @@
string_shared_modules="$string_shared_modules vfs_netatalk"
elif test x"$DEST" = xSTATIC; then
-@@ -78871,17 +74930,17 @@
+@@ -80071,17 +75954,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -66224,7 +67173,7 @@
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_fake_perms"; then
-@@ -78897,8 +74956,8 @@
+@@ -80097,8 +75980,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/fake_perms.$SHLIBEXT""
@@ -66235,7 +67184,7 @@
string_shared_modules="$string_shared_modules vfs_fake_perms"
elif test x"$DEST" = xSTATIC; then
-@@ -78908,17 +74967,17 @@
+@@ -80108,17 +75991,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -66259,7 +67208,7 @@
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_default_quota"; then
-@@ -78934,8 +74993,8 @@
+@@ -80134,8 +76017,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/default_quota.$SHLIBEXT""
@@ -66270,7 +67219,7 @@
string_shared_modules="$string_shared_modules vfs_default_quota"
elif test x"$DEST" = xSTATIC; then
-@@ -78945,17 +75004,17 @@
+@@ -80145,17 +76028,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -66294,7 +67243,7 @@
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_readonly"; then
-@@ -78971,8 +75030,8 @@
+@@ -80171,8 +76054,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/readonly.$SHLIBEXT""
@@ -66305,7 +67254,7 @@
string_shared_modules="$string_shared_modules vfs_readonly"
elif test x"$DEST" = xSTATIC; then
-@@ -78982,17 +75041,17 @@
+@@ -80182,17 +76065,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -66329,7 +67278,7 @@
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_cap"; then
-@@ -79008,8 +75067,8 @@
+@@ -80208,8 +76091,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/cap.$SHLIBEXT""
@@ -66340,7 +67289,7 @@
string_shared_modules="$string_shared_modules vfs_cap"
elif test x"$DEST" = xSTATIC; then
-@@ -79019,17 +75078,17 @@
+@@ -80219,17 +76102,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -66364,7 +67313,7 @@
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_expand_msdfs"; then
-@@ -79045,8 +75104,8 @@
+@@ -80245,8 +76128,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/expand_msdfs.$SHLIBEXT""
@@ -66375,7 +67324,7 @@
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
elif test x"$DEST" = xSTATIC; then
-@@ -79056,17 +75115,17 @@
+@@ -80256,17 +76139,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -66399,7 +67348,7 @@
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_shadow_copy"; then
-@@ -79082,8 +75141,8 @@
+@@ -80282,8 +76165,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/shadow_copy.$SHLIBEXT""
@@ -66410,7 +67359,7 @@
string_shared_modules="$string_shared_modules vfs_shadow_copy"
elif test x"$DEST" = xSTATIC; then
-@@ -79093,17 +75152,17 @@
+@@ -80293,17 +76176,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -66434,7 +67383,7 @@
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_shadow_copy2"; then
-@@ -79119,8 +75178,8 @@
+@@ -80319,8 +76202,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/shadow_copy2.$SHLIBEXT""
@@ -66445,7 +67394,7 @@
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
elif test x"$DEST" = xSTATIC; then
-@@ -79130,17 +75189,17 @@
+@@ -80330,17 +76213,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -66469,7 +67418,7 @@
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_afsacl"; then
-@@ -79156,8 +75215,8 @@
+@@ -80356,8 +76239,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/afsacl.$SHLIBEXT""
@@ -66480,7 +67429,7 @@
string_shared_modules="$string_shared_modules vfs_afsacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79167,17 +75226,17 @@
+@@ -80367,17 +76250,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -66504,7 +67453,7 @@
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_xattr_tdb"; then
-@@ -79193,8 +75252,8 @@
+@@ -80393,8 +76276,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/xattr_tdb.$SHLIBEXT""
@@ -66515,7 +67464,7 @@
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
elif test x"$DEST" = xSTATIC; then
-@@ -79204,17 +75263,17 @@
+@@ -80404,17 +76287,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -66539,7 +67488,7 @@
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_posixacl"; then
-@@ -79230,8 +75289,8 @@
+@@ -80430,8 +76313,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/posixacl.$SHLIBEXT""
@@ -66550,7 +67499,7 @@
string_shared_modules="$string_shared_modules vfs_posixacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79241,17 +75300,17 @@
+@@ -80441,17 +76324,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -66574,7 +67523,7 @@
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aixacl"; then
-@@ -79267,8 +75326,8 @@
+@@ -80467,8 +76350,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/aixacl.$SHLIBEXT""
@@ -66585,7 +67534,7 @@
string_shared_modules="$string_shared_modules vfs_aixacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79278,17 +75337,17 @@
+@@ -80478,17 +76361,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -66609,7 +67558,7 @@
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aixacl2"; then
-@@ -79304,8 +75363,8 @@
+@@ -80504,8 +76387,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/aixacl2.$SHLIBEXT""
@@ -66620,7 +67569,7 @@
string_shared_modules="$string_shared_modules vfs_aixacl2"
elif test x"$DEST" = xSTATIC; then
-@@ -79315,17 +75374,17 @@
+@@ -80515,17 +76398,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -66644,7 +67593,7 @@
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_solarisacl"; then
-@@ -79341,8 +75400,8 @@
+@@ -80541,8 +76424,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/solarisacl.$SHLIBEXT""
@@ -66655,7 +67604,7 @@
string_shared_modules="$string_shared_modules vfs_solarisacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79352,17 +75411,17 @@
+@@ -80552,17 +76435,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -66679,7 +67628,7 @@
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_irixacl"; then
-@@ -79378,8 +75437,8 @@
+@@ -80578,8 +76461,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/irixacl.$SHLIBEXT""
@@ -66690,7 +67639,7 @@
string_shared_modules="$string_shared_modules vfs_irixacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79389,17 +75448,17 @@
+@@ -80589,17 +76472,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -66714,7 +67663,7 @@
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_hpuxacl"; then
-@@ -79415,8 +75474,8 @@
+@@ -80615,8 +76498,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/hpuxacl.$SHLIBEXT""
@@ -66725,7 +67674,7 @@
string_shared_modules="$string_shared_modules vfs_hpuxacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79426,17 +75485,17 @@
+@@ -80626,17 +76509,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -66749,7 +67698,7 @@
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_tru64acl"; then
-@@ -79452,8 +75511,8 @@
+@@ -80652,8 +76535,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/tru64acl.$SHLIBEXT""
@@ -66760,7 +67709,7 @@
string_shared_modules="$string_shared_modules vfs_tru64acl"
elif test x"$DEST" = xSTATIC; then
-@@ -79463,17 +75522,17 @@
+@@ -80663,17 +76546,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -66784,7 +67733,7 @@
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_catia"; then
-@@ -79489,8 +75548,8 @@
+@@ -80689,8 +76572,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/catia.$SHLIBEXT""
@@ -66795,7 +67744,7 @@
string_shared_modules="$string_shared_modules vfs_catia"
elif test x"$DEST" = xSTATIC; then
-@@ -79500,17 +75559,17 @@
+@@ -80700,17 +76583,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -66819,7 +67768,7 @@
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_streams_xattr"; then
-@@ -79526,8 +75585,8 @@
+@@ -80726,8 +76609,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/streams_xattr.$SHLIBEXT""
@@ -66830,7 +67779,7 @@
string_shared_modules="$string_shared_modules vfs_streams_xattr"
elif test x"$DEST" = xSTATIC; then
-@@ -79537,17 +75596,17 @@
+@@ -80737,17 +76620,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -66854,7 +67803,7 @@
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_streams_depot"; then
-@@ -79563,8 +75622,8 @@
+@@ -80763,8 +76646,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/streams_depot.$SHLIBEXT""
@@ -66865,7 +67814,7 @@
string_shared_modules="$string_shared_modules vfs_streams_depot"
elif test x"$DEST" = xSTATIC; then
-@@ -79574,17 +75633,17 @@
+@@ -80774,17 +76657,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -66889,7 +67838,7 @@
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_cacheprime"; then
-@@ -79600,8 +75659,8 @@
+@@ -80800,8 +76683,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/cacheprime.$SHLIBEXT""
@@ -66900,7 +67849,7 @@
string_shared_modules="$string_shared_modules vfs_cacheprime"
elif test x"$DEST" = xSTATIC; then
-@@ -79611,17 +75670,17 @@
+@@ -80811,17 +76694,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -66924,7 +67873,7 @@
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_prealloc"; then
-@@ -79637,8 +75696,8 @@
+@@ -80837,8 +76720,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/prealloc.$SHLIBEXT""
@@ -66935,7 +67884,7 @@
string_shared_modules="$string_shared_modules vfs_prealloc"
elif test x"$DEST" = xSTATIC; then
-@@ -79648,17 +75707,17 @@
+@@ -80848,17 +76731,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -66959,7 +67908,7 @@
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_commit"; then
-@@ -79674,8 +75733,8 @@
+@@ -80874,8 +76757,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/commit.$SHLIBEXT""
@@ -66970,7 +67919,7 @@
string_shared_modules="$string_shared_modules vfs_commit"
elif test x"$DEST" = xSTATIC; then
-@@ -79685,17 +75744,17 @@
+@@ -80885,17 +76768,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -66994,7 +67943,7 @@
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_gpfs"; then
-@@ -79711,8 +75770,8 @@
+@@ -80911,8 +76794,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/gpfs.$SHLIBEXT""
@@ -67005,7 +67954,7 @@
string_shared_modules="$string_shared_modules vfs_gpfs"
elif test x"$DEST" = xSTATIC; then
-@@ -79722,17 +75781,17 @@
+@@ -80922,17 +76805,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -67029,7 +67978,7 @@
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_readahead"; then
-@@ -79748,8 +75807,8 @@
+@@ -80948,8 +76831,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/readahead.$SHLIBEXT""
@@ -67040,7 +67989,7 @@
string_shared_modules="$string_shared_modules vfs_readahead"
elif test x"$DEST" = xSTATIC; then
-@@ -79759,17 +75818,17 @@
+@@ -80959,17 +76842,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -67064,7 +68013,7 @@
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_tsmsm"; then
-@@ -79785,8 +75844,8 @@
+@@ -80985,8 +76868,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/tsmsm.$SHLIBEXT""
@@ -67075,7 +68024,7 @@
string_shared_modules="$string_shared_modules vfs_tsmsm"
elif test x"$DEST" = xSTATIC; then
-@@ -79796,17 +75855,17 @@
+@@ -80996,17 +76879,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -67099,7 +68048,7 @@
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_fileid"; then
-@@ -79822,8 +75881,8 @@
+@@ -81022,8 +76905,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/fileid.$SHLIBEXT""
@@ -67110,7 +68059,7 @@
string_shared_modules="$string_shared_modules vfs_fileid"
elif test x"$DEST" = xSTATIC; then
-@@ -79833,17 +75892,17 @@
+@@ -81033,17 +76916,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -67134,7 +68083,7 @@
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_aio_fork"; then
-@@ -79859,8 +75918,8 @@
+@@ -81059,8 +76942,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/aio_fork.$SHLIBEXT""
@@ -67145,7 +68094,7 @@
string_shared_modules="$string_shared_modules vfs_aio_fork"
elif test x"$DEST" = xSTATIC; then
-@@ -79870,17 +75929,17 @@
+@@ -81070,17 +76953,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -67169,7 +68118,7 @@
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_syncops"; then
-@@ -79896,8 +75955,8 @@
+@@ -81096,8 +76979,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/syncops.$SHLIBEXT""
@@ -67180,7 +68129,7 @@
string_shared_modules="$string_shared_modules vfs_syncops"
elif test x"$DEST" = xSTATIC; then
-@@ -79907,17 +75966,17 @@
+@@ -81107,17 +76990,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -67204,7 +68153,7 @@
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_zfsacl"; then
-@@ -79933,8 +75992,8 @@
+@@ -81133,8 +77016,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/zfsacl.$SHLIBEXT""
@@ -67215,7 +68164,7 @@
string_shared_modules="$string_shared_modules vfs_zfsacl"
elif test x"$DEST" = xSTATIC; then
-@@ -79944,17 +76003,17 @@
+@@ -81144,17 +77027,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -67239,7 +68188,7 @@
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_notify_fam"; then
-@@ -79970,8 +76029,8 @@
+@@ -81170,8 +77053,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/notify_fam.$SHLIBEXT""
@@ -67250,7 +68199,7 @@
string_shared_modules="$string_shared_modules vfs_notify_fam"
elif test x"$DEST" = xSTATIC; then
-@@ -79981,17 +76040,17 @@
+@@ -81181,17 +77064,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -67274,7 +68223,7 @@
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_acl_xattr"; then
-@@ -80007,8 +76066,8 @@
+@@ -81207,8 +77090,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/acl_xattr.$SHLIBEXT""
@@ -67285,7 +68234,7 @@
string_shared_modules="$string_shared_modules vfs_acl_xattr"
elif test x"$DEST" = xSTATIC; then
-@@ -80018,17 +76077,17 @@
+@@ -81218,17 +77101,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -67309,7 +68258,7 @@
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_acl_tdb"; then
-@@ -80044,8 +76103,8 @@
+@@ -81244,8 +77127,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/acl_tdb.$SHLIBEXT""
@@ -67320,7 +68269,7 @@
string_shared_modules="$string_shared_modules vfs_acl_tdb"
elif test x"$DEST" = xSTATIC; then
-@@ -80055,17 +76114,17 @@
+@@ -81255,17 +77138,17 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -67344,7 +68293,7 @@
if test "$MODULE_vfs_smb_traffic_analyzer"; then
DEST=$MODULE_vfs_smb_traffic_analyzer
elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_smb_traffic_analyzer"; then
-@@ -80081,8 +76140,8 @@
+@@ -81281,8 +77164,8 @@
_ACEOF
VFS_MODULES="$VFS_MODULES "bin/smb_traffic_analyzer.$SHLIBEXT""
@@ -67355,7 +68304,7 @@
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
elif test x"$DEST" = xSTATIC; then
-@@ -80092,12 +76151,12 @@
+@@ -81292,12 +77175,12 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -67372,7 +68321,7 @@
fi
-@@ -80119,8 +76178,8 @@
+@@ -81319,8 +77202,8 @@
@@ -67383,7 +68332,7 @@
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_registry"; then
-@@ -80136,8 +76195,8 @@
+@@ -81336,8 +77219,8 @@
_ACEOF
GPEXT_MODULES="$GPEXT_MODULES "bin/registry.$SHLIBEXT""
@@ -67394,7 +68343,7 @@
string_shared_modules="$string_shared_modules gpext_registry"
elif test x"$DEST" = xSTATIC; then
-@@ -80147,17 +76206,17 @@
+@@ -81347,17 +77230,17 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -67418,7 +68367,7 @@
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_scripts"; then
-@@ -80173,8 +76232,8 @@
+@@ -81373,8 +77256,8 @@
_ACEOF
GPEXT_MODULES="$GPEXT_MODULES "bin/scripts.$SHLIBEXT""
@@ -67429,7 +68378,7 @@
string_shared_modules="$string_shared_modules gpext_scripts"
elif test x"$DEST" = xSTATIC; then
-@@ -80184,17 +76243,17 @@
+@@ -81384,17 +77267,17 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -67453,7 +68402,7 @@
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
elif test "$MODULE_gpext" -a "$MODULE_DEFAULT_gpext_security"; then
-@@ -80210,8 +76269,8 @@
+@@ -81410,8 +77293,8 @@
_ACEOF
GPEXT_MODULES="$GPEXT_MODULES "bin/security.$SHLIBEXT""
@@ -67464,7 +68413,7 @@
string_shared_modules="$string_shared_modules gpext_security"
elif test x"$DEST" = xSTATIC; then
-@@ -80221,12 +76280,12 @@
+@@ -81421,12 +77304,12 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -67481,7 +68430,7 @@
fi
-@@ -80261,19 +76320,19 @@
+@@ -81461,19 +77344,19 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -67507,7 +68456,7 @@
fi
#################################################
-@@ -80289,12 +76348,12 @@
+@@ -81489,12 +77372,12 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -67524,7 +68473,7 @@
# cross compiling, I hope you know what you are doing
true
-@@ -80367,30 +76426,28 @@
+@@ -81567,30 +77450,28 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -67563,7 +68512,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -80412,41 +76469,37 @@
+@@ -81612,41 +77493,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -67616,7 +68565,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -80454,14 +76507,14 @@
+@@ -81654,14 +77531,14 @@
else
@@ -67635,7 +68584,7 @@
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
esac
-@@ -80474,8 +76527,8 @@
+@@ -81674,8 +77551,8 @@
# no RT_SIGNAL bug, we are golden
@@ -67646,7 +68595,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -80497,41 +76550,37 @@
+@@ -81697,41 +77574,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -67699,7 +68648,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -80539,7 +76588,6 @@
+@@ -81739,7 +77612,6 @@
fi
@@ -67707,7 +68656,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -80657,37 +76705,37 @@
+@@ -81857,37 +77729,37 @@
#################################################
# Display summary of libraries detected
@@ -67763,7 +68712,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -80703,35 +76751,32 @@
+@@ -81903,35 +77775,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -67809,7 +68758,7 @@
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-@@ -80776,12 +76821,11 @@
+@@ -81976,12 +77845,11 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -67824,7 +68773,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -80814,12 +76858,12 @@
+@@ -82014,12 +77882,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -67841,7 +68790,7 @@
fi
fi
rm -f confcache
-@@ -80835,7 +76879,7 @@
+@@ -82035,7 +77903,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -67850,7 +68799,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -80847,15 +76891,12 @@
+@@ -82047,15 +77915,12 @@
@@ -67869,7 +68818,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -80868,7 +76909,7 @@
+@@ -82068,7 +77933,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -67878,7 +68827,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -80878,7 +76919,7 @@
+@@ -82078,7 +77943,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -67887,7 +68836,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -80900,45 +76941,17 @@
+@@ -82100,45 +77965,17 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -67942,7 +68891,7 @@
fi
# Support unset when possible.
-@@ -80954,6 +76967,8 @@
+@@ -82154,6 +77991,8 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -67951,7 +68900,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -80976,7 +76991,7 @@
+@@ -82176,7 +78015,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -67960,7 +68909,7 @@
{ (exit 1); exit 1; }
fi
-@@ -80989,10 +77004,17 @@
+@@ -82189,10 +78028,17 @@
PS4='+ '
# NLS nuisances.
@@ -67982,7 +68931,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -81014,7 +77036,7 @@
+@@ -82214,7 +78060,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -67991,7 +68940,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -81065,7 +77087,7 @@
+@@ -82265,7 +78111,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -68000,7 +68949,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -81093,6 +77115,7 @@
+@@ -82293,6 +78139,7 @@
*)
ECHO_N='-n';;
esac
@@ -68008,7 +68957,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -81105,22 +77128,19 @@
+@@ -82305,22 +78152,19 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -68042,7 +68991,7 @@
else
as_ln_s='cp -p'
fi
-@@ -81145,10 +77165,10 @@
+@@ -82345,10 +78189,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -68055,7 +69004,7 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -81171,7 +77191,7 @@
+@@ -82371,7 +78215,7 @@
# values after options handling.
ac_log="
This file was extended by Samba $as_me 3, which was
@@ -68064,7 +69013,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -81184,16 +77204,7 @@
+@@ -82384,16 +78228,7 @@
_ACEOF
@@ -68082,7 +69031,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -81201,23 +77212,22 @@
+@@ -82401,23 +78236,22 @@
_ACEOF
@@ -68113,7 +69062,7 @@
Configuration files:
$config_files
-@@ -81231,25 +77241,24 @@
+@@ -82431,25 +78265,24 @@
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
@@ -68146,7 +69095,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -81271,36 +77280,30 @@
+@@ -82471,36 +78304,30 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -68189,7 +69138,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -81319,29 +77322,27 @@
+@@ -82519,29 +78346,27 @@
fi
_ACEOF
@@ -68226,7 +69175,7 @@
#
# INIT-COMMANDS
#
-@@ -81352,7 +77353,7 @@
+@@ -82552,7 +78377,7 @@
_ACEOF
@@ -68235,7 +69184,7 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -81377,8 +77378,8 @@
+@@ -82577,8 +78402,8 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -68246,7 +69195,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -81419,144 +77420,405 @@
+@@ -82619,144 +78444,405 @@
(umask 077 && mkdir "$tmp")
} ||
{
@@ -68336,7 +69285,6 @@
+lockdir!$lockdir$ac_delim
+piddir!$piddir$ac_delim
+logfilebase!$logfilebase$ac_delim
-+ctdbdir!$ctdbdir$ac_delim
+privatedir!$privatedir$ac_delim
+swatdir!$swatdir$ac_delim
+codepagedir!$codepagedir$ac_delim
@@ -68377,6 +69325,7 @@
+MODULE_EXPORTS!$MODULE_EXPORTS$ac_delim
+DSO_EXPORTS!$DSO_EXPORTS$ac_delim
+HOST_OS!$HOST_OS$ac_delim
++PICFLAG!$PICFLAG$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -68432,7 +69381,6 @@
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ cat >conf$$subs.sed <<_ACEOF
-+PICFLAG!$PICFLAG$ac_delim
+PIE_CFLAGS!$PIE_CFLAGS$ac_delim
+PIE_LDFLAGS!$PIE_LDFLAGS$ac_delim
+RELRO_LDFLAGS!$RELRO_LDFLAGS$ac_delim
@@ -68529,6 +69477,7 @@
+LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
+LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
+LIBNETAPI_TARGET!$LIBNETAPI_TARGET$ac_delim
++INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
+_ACEOF
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
@@ -68647,7 +69596,6 @@
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
-+INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
+UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
+LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
+LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
@@ -68677,6 +69625,7 @@
+INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
+UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
+LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
++CTDB_CFLAGS!$CTDB_CFLAGS$ac_delim
+WINBIND_NSS_PTHREAD!$WINBIND_NSS_PTHREAD$ac_delim
+WINBIND_NSS!$WINBIND_NSS$ac_delim
+WINBIND_WINS_NSS!$WINBIND_WINS_NSS$ac_delim
@@ -68762,7 +69711,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -81572,133 +77834,19 @@
+@@ -82772,133 +78858,19 @@
}'
fi
@@ -68900,7 +69849,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -81727,38 +77875,26 @@
+@@ -82927,38 +78899,26 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -68947,7 +69896,7 @@
esac
;;
esac
-@@ -81768,7 +77904,7 @@
+@@ -82968,7 +78928,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -68956,7 +69905,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -81794,7 +77930,7 @@
+@@ -82994,7 +78954,7 @@
as_dirs=
while :; do
case $as_dir in #(
@@ -68965,7 +69914,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -81803,7 +77939,7 @@
+@@ -83003,7 +78963,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -68974,7 +69923,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -81824,17 +77960,17 @@
+@@ -83024,17 +78984,17 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -68996,7 +69945,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -81874,13 +78010,12 @@
+@@ -83074,13 +79034,12 @@
esac
_ACEOF
@@ -69012,7 +69961,7 @@
p
q
}
-@@ -81889,14 +78024,13 @@
+@@ -83089,14 +79048,13 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -69031,7 +69980,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -81910,16 +78044,15 @@
+@@ -83110,16 +79068,15 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -69052,7 +70001,7 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -81929,62 +78062,123 @@
+@@ -83129,62 +79086,123 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -69211,7 +70160,7 @@
;;
esac
-@@ -82004,11 +78198,6 @@
+@@ -83204,11 +79222,6 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -69223,7 +70172,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -82030,18 +78219,14 @@
+@@ -83230,18 +79243,14 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -69246,10 +70195,10 @@
+ { echo "$as_me:$LINENO: result: \$ eval \\`dmalloc samba\\`." >&5
+echo "${ECHO_T} \$ eval \\`dmalloc samba\\`." >&6; }
fi
-Index: samba-3.3.0/source/include/config.h.in
+Index: samba-3.3.1/source/include/config.h.in
===================================================================
---- samba-3.3.0.orig/source/include/config.h.in
-+++ samba-3.3.0/source/include/config.h.in
+--- samba-3.3.1.orig/source/include/config.h.in
++++ samba-3.3.1/source/include/config.h.in
@@ -69,6 +69,9 @@
/* Whether to use fully FHS-compatible paths */
#undef FHS_COMPATIBLE
More information about the Pkg-samba-maint
mailing list