[Pkg-samba-maint] r3050 - trunk/samba/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Mon Sep 14 07:48:58 UTC 2009
Author: vorlon
Date: 2009-09-14 07:48:53 +0000 (Mon, 14 Sep 2009)
New Revision: 3050
Modified:
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/external-talloc-support.patch
Log:
adjust patches for new upstream version, which partially fixes the
external-talloc-support build
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-09-13 20:20:40 UTC (rev 3049)
+++ trunk/samba/debian/patches/autoconf.patch 2009-09-14 07:48:53 UTC (rev 3050)
@@ -18,7 +18,7 @@
export QUILT_PATCHES=debian/patches
quilt push autoconf.patch # to get everything applied up to this point
quilt push -f autoconf.patch # to override the errors when applying
- (cd source && autoconf -Im4 -I../m4 -I../lib/replace -I../source4)
+ (cd source3 && autoconf -Im4 -I../m4 -I../lib/replace -I../source4)
# the -I lib/replace is needed because upstream seems to have done
# something screwy with where their m4 include files are distributed in the
# source tree; so this option may not be necessary in the future
@@ -833,15 +833,7 @@
ac_unique_file="include/includes.h"
ac_default_prefix=/usr/local/samba
-@@ -858,6 +812,7 @@
- TEVENT_CFLAGS
- TEVENT_OBJ
- teventdir
-+NO_LIBTALLOC
- LIBTALLOC_OBJ0
- TALLOC_OBJ
- tallocdir
-@@ -942,6 +897,7 @@
+@@ -943,6 +897,7 @@
program_transform_name
prefix
exec_prefix
@@ -849,7 +841,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1161,8 +1117,7 @@
+@@ -1162,8 +1117,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -859,7 +851,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1188,8 +1143,7 @@
+@@ -1189,8 +1143,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -869,7 +861,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1393,8 +1347,7 @@
+@@ -1394,8 +1347,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -879,7 +871,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1410,8 +1363,7 @@
+@@ -1411,8 +1363,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -889,7 +881,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1441,17 +1393,17 @@
+@@ -1442,17 +1393,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -913,7 +905,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1468,15 +1420,13 @@
+@@ -1469,15 +1420,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -931,7 +923,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1499,8 +1449,7 @@
+@@ -1500,8 +1449,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -941,7 +933,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1530,11 +1479,9 @@
+@@ -1531,11 +1479,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -955,7 +947,7 @@
# Find the source files, if location was not specified.
-@@ -1573,13 +1520,11 @@
+@@ -1574,13 +1520,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -971,7 +963,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1901,181 +1846,866 @@
+@@ -1902,181 +1846,866 @@
if $ac_init_version; then
cat <<\_ACEOF
Samba configure 3
@@ -1987,7 +1979,7 @@
done | sort
echo
-@@ -2116,39 +2746,41 @@
+@@ -2117,39 +2746,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2034,7 +2026,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2167,7 +2799,7 @@
+@@ -2168,7 +2799,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -2043,7 +2035,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2178,7 +2810,7 @@
+@@ -2179,7 +2810,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -2052,7 +2044,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2186,7 +2818,7 @@
+@@ -2187,7 +2818,7 @@
esac
fi
else
@@ -2061,7 +2053,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2201,11 +2833,11 @@
+@@ -2202,11 +2833,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -2075,7 +2067,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2215,17 +2847,17 @@
+@@ -2216,17 +2847,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -2097,7 +2089,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2237,43 +2869,20 @@
+@@ -2238,43 +2869,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2148,7 +2140,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2287,14 +2896,12 @@
+@@ -2288,14 +2896,12 @@
ac_config_headers="$ac_config_headers include/config.h"
@@ -2165,7 +2157,7 @@
$as_echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
;;
esac
-@@ -2326,24 +2933,16 @@
+@@ -2327,24 +2933,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2198,7 +2190,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2355,57 +2954,29 @@
+@@ -2356,57 +2954,29 @@
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
@@ -2263,7 +2255,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -2421,28 +2992,24 @@
+@@ -2422,28 +2992,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2297,7 +2289,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -2458,28 +3025,24 @@
+@@ -2459,28 +3025,24 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -2331,7 +2323,7 @@
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
-@@ -2502,6 +3065,27 @@
+@@ -2503,6 +3065,27 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@@ -2359,7 +2351,7 @@
echo "LIBREPLACE_LOCATION_CHECKS: END"
-@@ -2530,7 +3114,7 @@
+@@ -2531,7 +3114,7 @@
# Check whether --with-fhs was given.
@@ -2368,7 +2360,7 @@
withval=$with_fhs; case "$withval" in
yes)
lockdir="\${VARDIR}/lib/samba"
-@@ -2547,9 +3131,7 @@
+@@ -2548,9 +3131,7 @@
cachedir="\${VARDIR}/lib/samba"
ncalrpcdir="\${VARDIR}/ncalrpc"
@@ -2379,7 +2371,7 @@
;;
esac
-@@ -2560,13 +3142,13 @@
+@@ -2561,13 +3142,13 @@
# set private directory location
# Check whether --with-privatedir was given.
@@ -2395,7 +2387,7 @@
$as_echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
;;
* )
-@@ -2580,13 +3162,13 @@
+@@ -2581,13 +3162,13 @@
# set root sbin directory location
# Check whether --with-rootsbindir was given.
@@ -2411,7 +2403,7 @@
$as_echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
;;
* )
-@@ -2600,13 +3182,13 @@
+@@ -2601,13 +3182,13 @@
# set lock directory location
# Check whether --with-lockdir was given.
@@ -2427,7 +2419,7 @@
$as_echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
;;
* )
-@@ -2620,13 +3202,13 @@
+@@ -2621,13 +3202,13 @@
# set state directory location
# Check whether --with-statedir was given.
@@ -2443,7 +2435,7 @@
$as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
;;
* )
-@@ -2640,13 +3222,13 @@
+@@ -2641,13 +3222,13 @@
# set cache directory location
# Check whether --with-cachedir was given.
@@ -2459,7 +2451,7 @@
$as_echo "$as_me: WARNING: --with-cachedir called without argument - will use default" >&2;}
;;
* )
-@@ -2660,13 +3242,13 @@
+@@ -2661,13 +3242,13 @@
# set pid directory location
# Check whether --with-piddir was given.
@@ -2475,7 +2467,7 @@
$as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
;;
* )
-@@ -2680,13 +3262,13 @@
+@@ -2681,13 +3262,13 @@
# set ncalrpc directory location
# Check whether --with-ncalprcdir was given.
@@ -2491,7 +2483,7 @@
$as_echo "$as_me: WARNING: --with-ncalrpcdir called without argument - will use default" >&2;}
;;
* )
-@@ -2700,13 +3282,13 @@
+@@ -2701,13 +3282,13 @@
# set SWAT directory location
# Check whether --with-swatdir was given.
@@ -2507,7 +2499,7 @@
$as_echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
;;
* )
-@@ -2720,13 +3302,13 @@
+@@ -2721,13 +3302,13 @@
# set configuration directory location
# Check whether --with-configdir was given.
@@ -2523,7 +2515,7 @@
$as_echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
;;
* )
-@@ -2740,13 +3322,13 @@
+@@ -2741,13 +3322,13 @@
# set log directory location
# Check whether --with-logfilebase was given.
@@ -2539,7 +2531,7 @@
$as_echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
;;
* )
-@@ -2761,13 +3343,13 @@
+@@ -2762,13 +3343,13 @@
# set shared modules (internal lib) directory location
# Check whether --with-modulesdir was given.
@@ -2555,7 +2547,7 @@
$as_echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
;;
* )
-@@ -2781,13 +3363,13 @@
+@@ -2782,13 +3363,13 @@
# set PAM modules directory location
# Check whether --with-pammodulesdir was given.
@@ -2571,7 +2563,7 @@
$as_echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
;;
* )
-@@ -2801,13 +3383,13 @@
+@@ -2802,13 +3383,13 @@
# set man directory location
# Check whether --with-mandir was given.
@@ -2587,7 +2579,7 @@
$as_echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
;;
* )
-@@ -2821,13 +3403,13 @@
+@@ -2822,13 +3403,13 @@
# set locale directory location
# Check whether --with-localedir was given.
@@ -2603,7 +2595,7 @@
$as_echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
;;
*)
-@@ -2861,10 +3443,10 @@
+@@ -2862,10 +3443,10 @@
# Check whether --with-selftest-prefix was given.
@@ -2616,7 +2608,7 @@
$as_echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
;;
* )
-@@ -2881,10 +3463,10 @@
+@@ -2882,10 +3463,10 @@
# Check whether --with-selftest-shrdir was given.
@@ -2629,7 +2621,7 @@
$as_echo "$as_me: WARNING: --with-selftest-shrdir called without argument - will use default" >&2;}
;;
* )
-@@ -2903,19 +3485,15 @@
+@@ -2904,19 +3485,15 @@
# Check whether --with-smbtorture4_path was given.
@@ -2652,7 +2644,7 @@
fi
smbtorture4_option="-t $withval"
;;
-@@ -2930,19 +3508,15 @@
+@@ -2931,19 +3508,15 @@
# Check whether --with-selftest_custom_conf was given.
@@ -2675,7 +2667,7 @@
fi
selftest_custom_conf="-c $withval"
;;
-@@ -2955,7 +3529,7 @@
+@@ -2956,7 +3529,7 @@
## so that we don't mix -O and -g
debug=no
# Check whether --enable-debug was given.
@@ -2684,7 +2676,7 @@
enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
debug=yes
fi
-@@ -2965,7 +3539,7 @@
+@@ -2966,7 +3539,7 @@
developer=no
# Check whether --enable-developer was given.
@@ -2693,7 +2685,7 @@
enableval=$enable_developer; if eval "test x$enable_developer = xyes"; then
debug=yes
developer=yes
-@@ -2975,7 +3549,7 @@
+@@ -2976,7 +3549,7 @@
krb5developer=no
# Check whether --enable-krb5developer was given.
@@ -2702,7 +2694,7 @@
enableval=$enable_krb5developer; if eval "test x$enable_krb5developer = xyes"; then
debug=yes
developer=yes
-@@ -2986,7 +3560,7 @@
+@@ -2987,7 +3560,7 @@
picky_developer=no
# Check whether --enable-picky-developer was given.
@@ -2711,7 +2703,7 @@
enableval=$enable_picky_developer; if eval "test x$enable_picky_developer = xyes"; then
debug=yes
developer=yes
-@@ -2997,7 +3571,7 @@
+@@ -2998,7 +3571,7 @@
# Check whether --with-cfenc was given.
@@ -2720,7 +2712,7 @@
withval=$with_cfenc;
# May be in source $withval/CoreFoundation/StringEncodings.subproj.
# Should have been in framework $withval/CoreFoundation.framework/Headers.
-@@ -3094,9 +3668,9 @@
+@@ -3095,9 +3668,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2732,7 +2724,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3107,24 +3681,24 @@
+@@ -3108,24 +3681,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2762,7 +2754,7 @@
$as_echo "no" >&6; }
fi
-@@ -3134,9 +3708,9 @@
+@@ -3135,9 +3708,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2774,7 +2766,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3147,24 +3721,24 @@
+@@ -3148,24 +3721,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2804,7 +2796,7 @@
$as_echo "no" >&6; }
fi
-@@ -3173,7 +3747,7 @@
+@@ -3174,7 +3747,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2813,7 +2805,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3187,9 +3761,9 @@
+@@ -3188,9 +3761,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2825,7 +2817,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3200,24 +3774,24 @@
+@@ -3201,24 +3774,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2855,7 +2847,7 @@
$as_echo "no" >&6; }
fi
-@@ -3227,9 +3801,9 @@
+@@ -3228,9 +3801,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2867,7 +2859,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3241,18 +3815,18 @@
+@@ -3242,18 +3815,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2889,7 +2881,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3271,10 +3845,10 @@
+@@ -3272,10 +3845,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2902,7 +2894,7 @@
$as_echo "no" >&6; }
fi
-@@ -3286,9 +3860,9 @@
+@@ -3287,9 +3860,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2914,7 +2906,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3299,24 +3873,24 @@
+@@ -3300,24 +3873,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2944,7 +2936,7 @@
$as_echo "no" >&6; }
fi
-@@ -3330,9 +3904,9 @@
+@@ -3331,9 +3904,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2956,7 +2948,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3343,24 +3917,24 @@
+@@ -3344,24 +3917,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2986,7 +2978,7 @@
$as_echo "no" >&6; }
fi
-@@ -3373,7 +3947,7 @@
+@@ -3374,7 +3947,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2995,7 +2987,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3384,73 +3958,55 @@
+@@ -3385,73 +3958,55 @@
fi
@@ -3094,7 +3086,7 @@
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3467,17 +4023,17 @@
+@@ -3468,17 +4023,17 @@
done
rm -f $ac_rmfiles
@@ -3117,7 +3109,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3494,7 +4050,7 @@
+@@ -3495,7 +4050,7 @@
# certainly right.
break;;
*.* )
@@ -3126,7 +3118,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3513,84 +4069,75 @@
+@@ -3514,84 +4069,75 @@
else
ac_file=''
fi
@@ -3236,7 +3228,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3605,32 +4152,24 @@
+@@ -3606,32 +4152,24 @@
esac
done
else
@@ -3276,7 +3268,7 @@
/* end confdefs.h. */
int
-@@ -3642,17 +4181,17 @@
+@@ -3643,17 +4181,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3299,7 +3291,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3665,31 +4204,23 @@
+@@ -3666,31 +4204,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3338,7 +3330,7 @@
/* end confdefs.h. */
int
-@@ -3703,37 +4234,16 @@
+@@ -3704,37 +4234,16 @@
return 0;
}
_ACEOF
@@ -3379,7 +3371,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3742,20 +4252,16 @@
+@@ -3743,20 +4252,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3403,7 +3395,7 @@
/* end confdefs.h. */
int
-@@ -3766,35 +4272,11 @@
+@@ -3767,35 +4272,11 @@
return 0;
}
_ACEOF
@@ -3442,7 +3434,7 @@
/* end confdefs.h. */
int
-@@ -3805,36 +4287,12 @@
+@@ -3806,36 +4287,12 @@
return 0;
}
_ACEOF
@@ -3483,7 +3475,7 @@
/* end confdefs.h. */
int
-@@ -3845,42 +4303,17 @@
+@@ -3846,42 +4303,17 @@
return 0;
}
_ACEOF
@@ -3528,7 +3520,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3897,18 +4330,14 @@
+@@ -3898,18 +4330,14 @@
CFLAGS=
fi
fi
@@ -3550,7 +3542,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3965,32 +4394,9 @@
+@@ -3966,32 +4394,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3584,7 +3576,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4001,17 +4407,19 @@
+@@ -4002,17 +4407,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3607,7 +3599,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4022,18 +4430,14 @@
+@@ -4023,18 +4430,14 @@
CFLAGS=$savedCFLAGS
if test x"$GCC" != x"yes" ; then
@@ -3629,7 +3621,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdbool.h>
-@@ -4175,32 +4579,9 @@
+@@ -4176,32 +4579,9 @@
for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
do
CC="$ac_save_CC $ac_arg"
@@ -3663,7 +3655,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
-@@ -4211,26 +4592,28 @@
+@@ -4212,26 +4592,28 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c99" in
x)
@@ -3697,7 +3689,7 @@
$as_echo "${GCC_VERSION}" >&6; }
fi
-@@ -4239,14 +4622,14 @@
+@@ -4240,14 +4622,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3714,7 +3706,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4261,11 +4644,7 @@
+@@ -4262,11 +4644,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3727,7 +3719,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4274,78 +4653,34 @@
+@@ -4275,78 +4653,34 @@
#endif
Syntax error
_ACEOF
@@ -3811,7 +3803,7 @@
break
fi
-@@ -4357,7 +4692,7 @@
+@@ -4358,7 +4692,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3820,7 +3812,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4368,11 +4703,7 @@
+@@ -4369,11 +4703,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3833,7 +3825,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4381,87 +4712,40 @@
+@@ -4382,87 +4712,40 @@
#endif
Syntax error
_ACEOF
@@ -3930,7 +3922,7 @@
fi
ac_ext=c
-@@ -4471,9 +4755,9 @@
+@@ -4472,9 +4755,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3942,7 +3934,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4484,7 +4768,7 @@
+@@ -4485,7 +4768,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3951,7 +3943,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4504,7 +4788,7 @@
+@@ -4505,7 +4788,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3960,7 +3952,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4519,26 +4803,24 @@
+@@ -4520,26 +4803,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3992,7 +3984,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4552,7 +4834,7 @@
+@@ -4553,7 +4834,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4001,7 +3993,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4572,7 +4854,7 @@
+@@ -4573,7 +4854,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4010,7 +4002,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4587,12 +4869,10 @@
+@@ -4588,12 +4869,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -4025,7 +4017,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4600,21 +4880,17 @@
+@@ -4601,21 +4880,17 @@
fi
fi
@@ -4051,7 +4043,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4629,48 +4905,23 @@
+@@ -4630,48 +4905,23 @@
return 0;
}
_ACEOF
@@ -4105,7 +4097,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4680,18 +4931,14 @@
+@@ -4681,18 +4931,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4127,7 +4119,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4701,14 +4948,10 @@
+@@ -4702,14 +4948,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4144,7 +4136,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4735,118 +4978,34 @@
+@@ -4736,118 +4978,34 @@
return 0;
}
_ACEOF
@@ -4276,7 +4268,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4857,139 +5016,8 @@
+@@ -4858,139 +5016,8 @@
@@ -4418,7 +4410,7 @@
MINIX=yes
else
MINIX=
-@@ -4998,34 +5026,23 @@
+@@ -4999,34 +5026,23 @@
if test "$MINIX" = yes; then
@@ -4459,7 +4451,7 @@
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -5038,71 +5055,35 @@
+@@ -5039,71 +5055,35 @@
return 0;
}
_ACEOF
@@ -4542,7 +4534,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -5110,46 +5091,34 @@
+@@ -5111,46 +5091,34 @@
typedef int dummy;
_ACEOF
@@ -4611,7 +4603,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -5167,30 +5136,9 @@
+@@ -5168,30 +5136,9 @@
return 0;
}
_ACEOF
@@ -4644,7 +4636,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -5206,49 +5154,18 @@
+@@ -5207,49 +5154,18 @@
return 0;
}
_ACEOF
@@ -4697,7 +4689,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -5263,30 +5180,9 @@
+@@ -5264,30 +5180,9 @@
return 0;
}
_ACEOF
@@ -4730,7 +4722,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -5301,51 +5197,20 @@
+@@ -5302,51 +5197,20 @@
return 0;
}
_ACEOF
@@ -4786,7 +4778,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -5371,24 +5236,7 @@
+@@ -5372,24 +5236,7 @@
return 0;
}
_ACEOF
@@ -4812,7 +4804,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -5400,20 +5248,10 @@
+@@ -5401,20 +5248,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -4834,7 +4826,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -5433,81 +5271,43 @@
+@@ -5434,81 +5271,43 @@
return 0;
}
_ACEOF
@@ -4928,7 +4920,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -5516,41 +5316,17 @@
+@@ -5517,41 +5316,17 @@
#endif
_ACEOF
@@ -4972,7 +4964,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -5570,14 +5346,10 @@
+@@ -5571,14 +5346,10 @@
saved_CFLAGS="$CFLAGS";
c99_init=no
if test x"$c99_init" = x"no"; then
@@ -4989,7 +4981,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5590,45 +5362,20 @@
+@@ -5591,45 +5362,20 @@
return 0;
}
_ACEOF
@@ -5040,7 +5032,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5641,45 +5388,20 @@
+@@ -5642,45 +5388,20 @@
return 0;
}
_ACEOF
@@ -5091,7 +5083,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5692,45 +5414,20 @@
+@@ -5693,45 +5414,20 @@
return 0;
}
_ACEOF
@@ -5142,7 +5134,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5743,45 +5440,20 @@
+@@ -5744,45 +5440,20 @@
return 0;
}
_ACEOF
@@ -5193,7 +5185,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5794,34 +5466,13 @@
+@@ -5795,34 +5466,13 @@
return 0;
}
_ACEOF
@@ -5231,7 +5223,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-@@ -5840,7 +5491,7 @@
+@@ -5841,7 +5491,7 @@
else
CFLAGS="$saved_CFLAGS"
saved_CFLAGS=""
@@ -5240,7 +5232,7 @@
$as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
fi
-@@ -5859,10 +5510,10 @@
+@@ -5860,10 +5510,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5253,7 +5245,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5870,11 +5521,11 @@
+@@ -5871,11 +5521,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5269,7 +5261,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -5911,7 +5562,7 @@
+@@ -5912,7 +5562,7 @@
;;
esac
@@ -5278,7 +5270,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -5927,7 +5578,7 @@
+@@ -5928,7 +5578,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5287,7 +5279,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -5939,17 +5590,13 @@
+@@ -5940,17 +5590,13 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5308,7 +5300,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5974,54 +5621,27 @@
+@@ -5975,54 +5621,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -5371,7 +5363,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -6029,7 +5649,6 @@
+@@ -6030,7 +5649,6 @@
@@ -5379,7 +5371,7 @@
cat >>confdefs.h <<\EOF
#ifndef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED 1
-@@ -6038,15 +5657,15 @@
+@@ -6039,15 +5657,15 @@
# Check whether --enable-largefile was given.
@@ -5398,7 +5390,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -6055,11 +5674,7 @@
+@@ -6056,11 +5674,7 @@
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
@@ -5411,7 +5403,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6078,60 +5693,14 @@
+@@ -6079,60 +5693,14 @@
return 0;
}
_ACEOF
@@ -5474,7 +5466,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -6139,23 +5708,19 @@
+@@ -6140,23 +5708,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -5502,7 +5494,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6174,38 +5739,11 @@
+@@ -6175,38 +5739,11 @@
return 0;
}
_ACEOF
@@ -5543,7 +5535,7 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -6225,38 +5763,15 @@
+@@ -6226,38 +5763,15 @@
return 0;
}
_ACEOF
@@ -5584,7 +5576,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -6268,17 +5783,13 @@
+@@ -6269,17 +5783,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -5605,7 +5597,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6297,38 +5808,11 @@
+@@ -6298,38 +5808,11 @@
return 0;
}
_ACEOF
@@ -5646,7 +5638,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -6348,38 +5832,15 @@
+@@ -6349,38 +5832,15 @@
return 0;
}
_ACEOF
@@ -5687,7 +5679,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -6403,31 +5864,25 @@
+@@ -6404,31 +5864,25 @@
*hpux*)
# mmap on HPUX is completely broken...
@@ -5724,7 +5716,7 @@
if test "${GCC}" != "yes"; then
## for funky AIX compiler using strncpy()
-@@ -6439,7 +5894,6 @@
+@@ -6440,7 +5894,6 @@
@@ -5732,7 +5724,7 @@
cat >>confdefs.h <<\EOF
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
-@@ -6449,7 +5903,6 @@
+@@ -6450,7 +5903,6 @@
@@ -5740,7 +5732,7 @@
cat >>confdefs.h <<\EOF
#ifndef _OSF_SOURCE
#define _OSF_SOURCE 1
-@@ -6466,9 +5919,7 @@
+@@ -6467,9 +5919,7 @@
*)
CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
@@ -5751,7 +5743,7 @@
;;
esac
-@@ -6477,9 +5928,7 @@
+@@ -6478,9 +5928,7 @@
*)
CFLAGS="$CFLAGS -D_SYSV"
@@ -5762,7 +5754,7 @@
;;
esac
-@@ -6488,978 +5937,385 @@
+@@ -6489,978 +5937,385 @@
@@ -6996,7 +6988,7 @@
_ACEOF
-@@ -7467,27254 +6323,429 @@
+@@ -7468,27612 +6323,429 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
@@ -7640,20 +7632,21 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_lo= ac_hi=
-fi
--
++echo "LIBREPLACE_CC_CHECKS: END"
+
-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
@@ -7670,7 +7663,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -7694,13 +7687,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
--else
++# Check whether --enable-external_libtalloc was given.
++if test "${enable_external_libtalloc+set}" = set; then :
++ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
++ enable_external_libtalloc=auto
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -7732,7 +7729,7 @@
-int
-main ()
-{
--
+
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -7753,7 +7750,9 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
--
++if test "x$enable_external_libtalloc" != xno
++then
+
- ;
- return 0;
-}
@@ -7781,11 +7780,39 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
--else
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -7801,14 +7828,23 @@
-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
++ ;;
++esac
+ fi
-rm -f conftest.val
--fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
-
--
--
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
@@ -7821,8 +7857,16 @@
-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -7874,7 +7918,26 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
--
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ;
- return 0;
-}
@@ -7884,7 +7947,8 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -7908,11 +7972,15 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
--else
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -7965,7 +8033,10 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
- ;
- return 0;
-}
@@ -7975,7 +8046,15 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -7989,7 +8068,9 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
--else
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -7999,8 +8080,9 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
@@ -8008,11 +8090,23 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
--fi
--
+ fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ PKG_CONFIG=""
++ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -8029,7 +8123,10 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
--
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
++$as_echo_n "checking for TALLOC... " >&6; }
+
- ;
- return 0;
-}
@@ -8043,7 +8140,14 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TALLOC_CFLAGS"; then
++ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -8053,12 +8157,16 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
--else
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
++ pkg_failed=yes
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
@@ -8076,7 +8184,8 @@
- ac_cv_sizeof_long_long=0
- fi ;;
-esac
--else
++ fi
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -8136,11 +8245,23 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
-- ac_status=$?
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TALLOC_LIBS"; then
++ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
+ ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long_long=`cat conftest.val`
--else
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
+ else
- $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
@@ -8160,20 +8281,25 @@
-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
++ pkg_failed=yes
+ fi
-rm -f conftest.val
--fi
++ fi
++else
++ pkg_failed=untried
+ 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
-
--
--
+
++if test $pkg_failed = yes; 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
@@ -8249,13 +8375,23 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_uint_t=yes
--fi
--
++ _pkg_short_errors_supported=no
+ fi
++ if test $_pkg_short_errors_supported = yes; then
++ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
++ else
++ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$TALLOC_PKG_ERRORS" >&5
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
@@ -11233,7 +11369,7 @@
-fi
-fi
-
--if test "x$enable_external_libtalloc" = xno
+-if test "x$enable_external_libtalloc" != xyes
-then
- tallocdir=""
-tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
@@ -11993,15 +12129,9 @@
-
-fi
-
--LIBTALLOC_OBJ0=""
--for obj in ${TALLOC_OBJ}; do
-- LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
--done
-
-
-
--
--
-if test x"$teventdir" = "x"; then
- teventdir=""
- teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
@@ -12293,8 +12423,13 @@
-
-fi
-
+-if test x"$VERSIONSCRIPT" != "x"; then
+- EXPORTSFILE=tevent.exports
-
+-fi
-
+-
+-
-LIBTEVENT_OBJ0=""
-for obj in ${TEVENT_OBJ}; do
- LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
@@ -33623,12 +33758,12 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -33670,8 +33805,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+echo "LIBREPLACE_CC_CHECKS: END"
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -33679,22 +33813,14 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+-
-fi
-
+-
-done
-+# Check whether --enable-external_libtalloc was given.
-+if test "${enable_external_libtalloc+set}" = set; then :
-+ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
-+else
-+ enable_external_libtalloc=auto
-+fi
-
-
-+if test "x$enable_external_libtalloc" != xno
-+then
-
-
+-
+-
+-
+-
-for ac_header in sys/cdefs.h glob.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33702,20 +33828,13 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -33733,28 +33852,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -33768,24 +33866,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -33815,51 +33906,13 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ ac_pt_PKG_CONFIG=$PKG_CONFIG
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
+-
- ac_header_preproc=no
-+ ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
@@ -33893,62 +33946,36 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
- esac
+-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
- else
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
- fi
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ PKG_CONFIG=""
-+ fi
-
- fi
-
+-
+-fi
+-
-done
-
-
-# For experimental utmp support (lastlog on some BSD-like systems)
-
-
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
-+$as_echo_n "checking for TALLOC... " >&6; }
-
+-
-for ac_header in utmp.h utmpx.h lastlog.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33984,14 +34011,7 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_CFLAGS"; then
-+ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -34001,16 +34021,12 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ pkg_failed=yes
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -34045,14 +34061,12 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+ fi
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+ pkg_failed=untried
- fi
+-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -34092,18 +34106,7 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_LIBS"; then
-+ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
- else
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -34111,8 +34114,7 @@
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-+ pkg_failed=yes
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
@@ -34120,14 +34122,11 @@
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
+-fi
+-
-done
-
-
+-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -34151,7 +34150,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -34188,8 +34187,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-+if test $pkg_failed = yes; then
-
+-
- ;
- return 0;
-}
@@ -34213,9 +34211,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -34225,16 +34221,8 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ _pkg_short_errors_supported=no
- fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ else
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$TALLOC_PKG_ERRORS" >&5
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
@@ -34253,14 +34241,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
-test_array [0] = 0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-
+-
- ;
- return 0;
-}
@@ -34297,13 +34278,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-+elif test $pkg_failed = untried; then
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-
+-
- ;
- return 0;
-}
@@ -34327,7 +34302,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -34337,12 +34312,7 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
-+ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ enable_external_libtalloc=yes
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
@@ -34351,25 +34321,11 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "x$enable_external_libtalloc" = xno
-+then
-+ tallocdir=""
-+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
-+for d in $tallocpaths; do
-+ if test -f "$srcdir/$d/talloc.c"; then
-+ tallocdir="$d"
-+
-+ break;
-+ fi
-+done
-+if test x"$tallocdir" = "x"; then
-+ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
- fi
-+TALLOC_OBJ="talloc.o"
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -34386,7 +34342,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -34413,11 +34369,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
-
+-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
@@ -34449,8 +34404,7 @@
-int
-main ()
-{
-+TALLOC_LIBS=""
-
+-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -34471,7 +34425,7 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
+-
- ;
- return 0;
-}
@@ -34499,71 +34453,48 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-
+-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+else
-+ if test "$ac_cv_type_size_t" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (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; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
- else
+- else
- ac_cv_sizeof_int=0
-+ ac_cv_sizeof_size_t=0
- fi
- fi
+- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-
-
- cat >>confdefs.h <<_ACEOF
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
- _ACEOF
-
-
-@@ -34722,3692 +6753,1920 @@
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -34615,8 +34546,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
-
+-
- ;
- return 0;
-}
@@ -34640,36 +34570,24 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if test "$ac_cv_type_void_p" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void *)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_void_p=0
-+ fi
-+fi
-
+-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -34682,7 +34600,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -34709,9 +34627,7 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -34721,7 +34637,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -34748,6 +34664,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ if x$enable_external_libtalloc = xyes; then
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
@@ -34756,50 +34679,28 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
++elif test $pkg_failed = untried; then
++ if x$enable_external_libtalloc = xyes; then
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
-+$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical at samba.org>" >&5
-+$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
-+$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
-+$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-+ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
-+fi
-
+-
- ac_lo= ac_hi=
++ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
++ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ enable_external_libtalloc=yes
fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+LIBTALLOC_OBJ0=""
-+for obj in ${TALLOC_OBJ}; do
-+ LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
-+done
-+
-+
-+
-+
-+
-+
-+if test x"$teventdir" = "x"; then
-+ teventdir=""
-+ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+ for d in $teventpaths; do
-+ if test -f "$d/tevent.c"; then
-+ teventdir="$d"
-+ break;
-+ fi
-+ done
-+ if test x"$teventdir" = "x"; then
-+ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
-+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -34818,30 +34719,11 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
-
+-
- ;
- return 0;
-}
-+
-+
-+
-+TEVENT_CFLAGS="-I$teventdir"
-+
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
-+
-+for ac_header in sys/epoll.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -34864,11 +34746,20 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
+-fi
++if test "x$enable_external_libtalloc" != xyes
++then
++ tallocdir=""
++tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
++for d in $tallocpaths; do
++ if test -f "$srcdir/$d/talloc.c"; then
++ tallocdir="$d"
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ break;
++ fi
done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
@@ -34920,17 +34811,11 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
+-
- ;
- return 0;
-}
-+for ac_func in epoll_create
-+do :
-+ ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
-+if test "x$ac_cv_func_epoll_create" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_EPOLL_CREATE 1
- _ACEOF
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -34954,60 +34839,83 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
--else
++if test x"$tallocdir" = "x"; then
++ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
++fi
++TALLOC_OBJ="talloc.o"
++
++
++TALLOC_CFLAGS="-I$srcdir/$tallocdir"
++
++
++TALLOC_LIBS=""
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
++$as_echo_n "checking size of size_t... " >&6; }
++if test "${ac_cv_sizeof_size_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++else
++ if test "$ac_cv_type_size_t" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-- else
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (size_t)
++See \`config.log' for more details." "$LINENO" 5; }; }
+ else
- ac_cv_sizeof_long=0
-- fi
--fi
++ ac_cv_sizeof_size_t=0
+ fi
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-rm -f conftest.val
-+done
+
-+if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
-+ TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
-+
-+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
-+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
++$as_echo "$ac_cv_sizeof_size_t" >&6; }
--cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
--_ACEOF
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
-+LIBS="${LIBS} ${TEVENT_LIBS}"
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
+@@ -35081,3333 +6753,1920 @@
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if test "${ac_cv_sizeof_void_p+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -35022,10 +34930,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-+# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
-+# but currently this fails: things have to get merged from s4.
-+tdbdir="../lib/tdb"
-
+-
- ;
- return 0;
-}
@@ -35062,7 +34967,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-+TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
- ;
- return 0;
@@ -35087,9 +34992,19 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ if test "$ac_cv_type_void_p" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (void *)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_void_p=0
++ fi
++fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
@@ -35097,30 +35012,9 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+LIBTDB_OBJ0=""
-+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
-+ common/traverse.o common/freelist.o common/freelistcheck.o \
-+ common/io.o common/lock.o common/open.o;
-+do
-+ LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
-+done
-+
-+
-+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-+
-+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-+
-+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
-+if test "x${srcdir-.}" != "x."; then
-+ SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
++$as_echo "$ac_cv_sizeof_void_p" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
@@ -35167,7 +35061,9 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -35212,98 +35108,44 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-+# if it has no value. This prevent *very* large debug binaries from occurring
-+# by default.
-+if test "x$debug" = "xyes" ; then
-+ CFLAGS="${CFLAGS} -g"
-+fi
-+if test "x$CFLAGS" = x; then
-+ CFLAGS="-O"
++if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
++$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical at samba.org>" >&5
++$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
++$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
++$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
++ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+ enableval=$enable_socket_wrapper;
-+fi
-
+-
- ac_lo= ac_hi=
-+
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_socket_wrapper=yes
++ tallocdir=../lib/talloc
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if eval "test x$enable_socket_wrapper = xyes"; then
+
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
+
-+ DEFAULT_TEST_OPTIONS=--socket-wrapper
-+ HAVE_SOCKET_WRAPPER=yes
+
-+ # this is only used for samba3
-+ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++if test x"$teventdir" = "x"; then
++ teventdir=""
++ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++ for d in $teventpaths; do
++ if test -f "$d/tevent.c"; then
++ teventdir="$d"
++ break;
++ fi
++ done
++ if test x"$teventdir" = "x"; then
++ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -35322,11 +35164,30 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
- ;
- return 0;
-}
--_ACEOF
++
++
++
++TEVENT_CFLAGS="-I$teventdir"
++
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
++
++for ac_header in sys/epoll.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -35351,22 +35212,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
-+
-+
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+ enableval=$enable_nss_wrapper;
-+fi
-+
-+
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_nss_wrapper=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
+ done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
@@ -35396,8 +35245,7 @@
-int
-main ()
-{
-+if eval "test x$enable_nss_wrapper = xyes"; then
-
+-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -35418,12 +35266,17 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-+$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
- ;
- return 0;
-}
--_ACEOF
++for ac_func in epoll_create
++do :
++ ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
++if test "x$ac_cv_func_epoll_create" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_EPOLL_CREATE 1
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -35451,7 +35304,6 @@
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ HAVE_NSS_WRAPPER=yes
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
@@ -35465,13 +35317,22 @@
- else
- ac_cv_sizeof_long_long=0
- fi
--fi
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++done
++
++if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
++ TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
++
++$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
++
+ fi
-rm -f conftest.val
-+ # this is only used for samba3
-+ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
++
++if test x"$VERSIONSCRIPT" != "x"; then
++ EXPORTSFILE=tevent.exports
++
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
@@ -35481,7 +35342,12 @@
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
++LIBTEVENT_OBJ0=""
++for obj in ${TEVENT_OBJ}; do
++ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
++done
++LIBS="${LIBS} ${TEVENT_LIBS}"
-# 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
@@ -35506,6 +35372,9 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-test_array [0] = 0
++# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
++# but currently this fails: things have to get merged from s4.
++tdbdir="../lib/tdb"
- ;
- return 0;
@@ -35543,6 +35412,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
++TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
- ;
- return 0;
@@ -35570,18 +35440,6 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-+SWAT_INSTALL_TARGETS=installswat
-+
-+# Check whether --enable-swat was given.
-+if test "${enable_swat+set}" = set; then :
-+ enableval=$enable_swat;
-+ case "$enable_swat" in
-+ no)
-+ SWAT_SBIN_TARGETS=''
-+ SWAT_INSTALL_TARGETS=''
-+ ;;
-+ esac
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
@@ -35589,27 +35447,34 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++LIBTDB_OBJ0=""
++for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
++ common/traverse.o common/freelist.o common/freelistcheck.o \
++ common/io.o common/lock.o common/open.o;
++do
++ LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
++done
++
++
++SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
++
++SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
++
++## cleanup the $(srcdir) in the Makefile if we are outside of the tree
++if test "x${srcdir-.}" != "x."; then
++ SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+
-+
-+
-+
-+
-+
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
-+ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
-+ # Add -Wdeclaration-after-statement if compiler supports it
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
-+$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-+if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -35655,20 +35520,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Wdeclaration-after-statement";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Wdeclaration_after_statement=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -35679,11 +35531,7 @@
- ;
- return 0;
-}
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -35703,46 +35551,29 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Wdeclaration_after_statement=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_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`
-+ samba_cv_HAVE_Wdeclaration_after_statement=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
-+$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
@@ -35760,9 +35591,6 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-+ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+ fi
- ;
- return 0;
@@ -35787,12 +35615,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-+ #-Werror-implicit-function-declaration
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
-+$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
-+if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -35815,25 +35638,13 @@
- ac_cv_sizeof_short=0
- fi ;;
-esac
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Werror-implicit-function-declaration";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=cross
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
@@ -35842,7 +35653,7 @@
-int
-main ()
-{
--
+
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
@@ -35867,11 +35678,7 @@
- ;
- return 0;
-}
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -35895,28 +35702,10 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ samba_cv_HAVE_Werror_implicit_function_declaration=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-+
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
@@ -35930,45 +35719,84 @@
- else
- ac_cv_sizeof_short=0
- fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# compile with optimization and without debugging by default, but
++# allow people to set their own preference.
++# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
++# if it has no value. This prevent *very* large debug binaries from occurring
++# by default.
++if test "x$debug" = "xyes" ; then
++ CFLAGS="${CFLAGS} -g"
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
-+$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
-+ if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
-+ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
-+ fi
-+
-+ # krb5developer is like developer, except we don't get
-+ # -Wstrict-prototypes.
-+ if test x"$krb5_developer" != x"$yes" ; then
-+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+ fi
-+
-+ if test x"$picky_developer" = x"yes"; then
-+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+ fi
++if test "x$CFLAGS" = x; then
++ CFLAGS="-O"
fi
-rm -f conftest.val
+
-+# Check whether --enable-dmalloc was given.
-+if test "${enable_dmalloc+set}" = set; then :
-+ enableval=$enable_dmalloc;
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++ enableval=$enable_socket_wrapper;
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-+if test "x$enable_dmalloc" = xyes
-+then
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-+$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
++if eval "test x$developer = xyes"; then
++ enable_socket_wrapper=yes
++fi
++if eval "test x$enable_socket_wrapper = xyes"; then
-+$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
@@ -35981,8 +35809,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ LIBS="$LIBS -ldmalloc"
-+fi
++ DEFAULT_TEST_OPTIONS=--socket-wrapper
++ HAVE_SOCKET_WRAPPER=yes
-int
-main ()
@@ -36011,10 +35839,9 @@
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-+#################################################
-+# check for a shared memory profiling support
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
-+$as_echo_n "checking whether to use profiling... " >&6; }
++ # this is only used for samba3
++ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++fi
- *t++ = 0;
- if (s) return 0;
@@ -36040,12 +35867,6 @@
- }
- return !cs[0] && !zero.x;
-#endif
-+# Check whether --with-profiling-data was given.
-+if test "${with_profiling_data+set}" = set; then :
-+ withval=$with_profiling_data; case "$withval" in
-+ yes)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- ;
- return 0;
@@ -36070,27 +35891,19 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
-+
-+ samba_cv_WITH_PROFILE=yes
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ samba_cv_WITH_PROFILE=no
-+ ;;
-+ esac
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- ac_cv_c_const=no
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++ enableval=$enable_nss_wrapper;
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
@@ -36098,22 +35911,18 @@
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
-+merged_build_possible=yes
--fi
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_nss_wrapper=yes
+ fi
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-+for ac_prog in gawk mawk nawk awk
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
@@ -36127,7 +35936,8 @@
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
--
++if eval "test x$enable_nss_wrapper = xyes"; then
+
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -36148,48 +35958,24 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
-+ if test -n "$AWK"; then
-+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_AWK="$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
++ HAVE_NSS_WRAPPER=yes
+
++ # this is only used for samba3
++ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-+
-+ test -n "$AWK" && break
- done
+-done
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-+# Check for GNU make
-case $ac_cv_c_inline in
@@ -36198,7 +35984,21 @@
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
-- esac
++
++
++
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
++
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++ enableval=$enable_swat;
++ case "$enable_swat" in
++ no)
++ SWAT_SBIN_TARGETS=''
++ SWAT_INSTALL_TARGETS=''
++ ;;
+ esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
@@ -36207,21 +36007,13 @@
- ;;
-esac
++fi
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-+
-+
-+for ac_prog in gmake make
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat >conftest.$ac_ext <<_ACEOF
@@ -36234,25 +36026,6 @@
- not a universal capable compiler
- #endif
- typedef int dummy;
-+ case $MAKE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-_ACEOF
-rm -f conftest.$ac_objext
@@ -36260,8 +36033,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36274,27 +36046,20 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
--
+
- # Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
-+fi
-+MAKE=$ac_cv_path_MAKE
-+if test -n "$MAKE"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-+$as_echo "$MAKE" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+
+-fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
@@ -36306,7 +36071,7 @@
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
--
+
-int
-main ()
-{
@@ -36315,6 +36080,17 @@
- && LITTLE_ENDIAN)
- bogus endian macros
- #endif
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
++ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
++ # Add -Wdeclaration-after-statement if compiler supports it
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
- ;
- return 0;
@@ -36347,8 +36123,6 @@
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
-+ test -n "$MAKE" && break
-+done
-int
-main ()
@@ -36356,11 +36130,29 @@
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
- #endif
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="-Wdeclaration-after-statement";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- ;
- return 0;
-}
--_ACEOF
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36380,37 +36172,37 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
-+$as_echo_n "checking whether we have GNU make... " >&6; }
-+if test "${samba_cv_gnu_make+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_c_bigendian=no
-+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-+then
-+ samba_cv_gnu_make=no
-+else
-+ samba_cv_gnu_make=yes
++ samba_cv_HAVE_Wdeclaration_after_statement=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
-+$as_echo "$samba_cv_gnu_make" >&6; }
-+if test x$samba_cv_gnu_make = xyes; then
-+ true
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ merged_build_possible=no
-+fi
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
--fi
-+# Check for perl
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
@@ -36423,6 +36215,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
++ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++ fi
-int
-main ()
@@ -36430,6 +36225,12 @@
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
- bogus endian macros
- #endif
++ #-Werror-implicit-function-declaration
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
++$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
++if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
- ;
- return 0;
@@ -36468,11 +36269,29 @@
-#ifndef _BIG_ENDIAN
- not big endian
- #endif
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="-Werror-implicit-function-declaration";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- ;
- return 0;
-}
--_ACEOF
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36492,58 +36311,54 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-+case "$host_os" in
-+ *irix*)
-+ # On IRIX, we prefer Freeware or Nekoware Perl, because the
-+ # system perl is so ancient.
-+ # Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ case $PERL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
-+for as_dir in $as_dummy
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
++ samba_cv_HAVE_Werror_implicit_function_declaration=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
++
- ac_cv_c_bigendian=no
-+ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+ ;;
-+esac
fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
++ if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
++ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ # krb5developer is like developer, except we don't get
++ # -Wstrict-prototypes.
++ if test x"$krb5_developer" != x"$yes" ; then
++ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
++ fi
+
++ if test x"$picky_developer" = x"yes"; then
++ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
++ fi
++fi
+
++# Check whether --enable-dmalloc was given.
++if test "${enable_dmalloc+set}" = set; then :
++ enableval=$enable_dmalloc;
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -36611,48 +36426,18 @@
- ac_cv_c_bigendian=unknown
- fi
- fi
-+ ;;
-+ *)
-+ # Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+ case $PERL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
++if test "x$enable_dmalloc" = xyes
++then
-+ ;;
-+esac
- fi
--
++$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
+
+-fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -36663,9 +36448,7 @@
-int
-main ()
-{
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
- /* Are we little or big endian? From Harbison&Steele. */
- union
@@ -36675,6 +36458,8 @@
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
++ LIBS="$LIBS -ldmalloc"
++fi
- ;
- return 0;
@@ -36695,8 +36480,7 @@
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
@@ -36708,26 +36492,39 @@
- $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
--
++#################################################
++# check for a shared memory profiling support
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
++$as_echo_n "checking whether to use profiling... " >&6; }
+
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
--
++# Check whether --with-profiling-data was given.
++if test "${with_profiling_data+set}" = set; then :
++ withval=$with_profiling_data; case "$withval" in
++ yes)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++$as_echo "#define WITH_PROFILE 1" >>confdefs.h
++
++ samba_cv_WITH_PROFILE=yes
++ ;;
++ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ samba_cv_WITH_PROFILE=no
++ ;;
++ esac
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
- fi
-+if test x"$PERL" = x""; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
-+$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
-+ merged_build_possible=no
-+else
-+ if test x"$debug" = x"yes";then
-+ PERL="$PERL -W"
-+ fi
-+ export PERL
-+ true
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -36740,11 +36537,11 @@
- no)
- ;; #(
- universal)
--
+
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
--
+
- ;; #(
- *)
- { { $as_echo "$as_me:$LINENO: error: unknown endianness
@@ -36753,17 +36550,19 @@
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
++merged_build_possible=yes
-{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
-if test "${ac_cv_c_char_unsigned+set}" = set; then
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
++for ac_prog in gawk mawk nawk awk
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
++if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -36802,8 +36601,8 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_char_unsigned=no
-+ if test -n "$AR"; then
-+ ac_cv_prog_AR="$AR" # Let the user override the test.
++ if test -n "$AWK"; then
++ ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -36814,7 +36613,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_AR="${ac_tool_prefix}ar"
++ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -36834,10 +36633,10 @@
-#define __CHAR_UNSIGNED__ 1
-_ACEOF
-
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
@@ -36847,14 +36646,23 @@
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+ ac_ct_AR=$AR
-+ # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
++ test -n "$AWK" && break
++done
++
++# Check for GNU make
++
++
++
++
++
++
++for ac_prog in gmake make
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if test "${ac_cv_path_MAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -36865,7 +36673,26 @@
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
--
++ case $MAKE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
-int
-main ()
-{
@@ -36879,7 +36706,8 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36893,62 +36721,39 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_signal=int
-+ if test -n "$ac_ct_AR"; then
-+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++fi
++MAKE=$ac_cv_path_MAKE
++if test -n "$MAKE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
++$as_echo "$MAKE" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_AR="ar"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
+-
- ac_cv_type_signal=void
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
--
+
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
--
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++ test -n "$MAKE" && break
++done
+
-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
++$as_echo_n "checking whether we have GNU make... " >&6; }
++if test "${samba_cv_gnu_make+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36957,98 +36762,58 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-+ AR="$ac_cv_prog_AR"
-+fi
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then
- ac_cv_type_uid_t=yes
-+
-+LD=ld
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${ac_cv_prog_gnu_ld+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
++then
++ samba_cv_gnu_make=no
else
- ac_cv_type_uid_t=no
-+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+ ac_cv_prog_gnu_ld=yes
-+else
-+ ac_cv_prog_gnu_ld=no
++ samba_cv_gnu_make=yes
fi
-rm -f conftest*
--
+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
-+$as_echo "$ac_cv_prog_gnu_ld" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
++$as_echo "$samba_cv_gnu_make" >&6; }
++if test x$samba_cv_gnu_make = xyes; then
++ true
++else
++ merged_build_possible=no
++fi
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+
-+if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+ ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
-+$as_echo_n "checking GNU ld release date... " >&6; }
-+ ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
-+$as_echo "${ac_cv_gnu_ld_date}" >&6; }
-+ if test -n "$ac_cv_gnu_ld_date"; then
-+ if test "$ac_cv_gnu_ld_date" -lt 20030217; then
-+ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+ fi
-+ if test "$ac_cv_gnu_ld_date" -gt 20030101; then
-+ ac_cv_gnu_ld_version_script=yes
-+ fi
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
-+$as_echo_n "checking GNU ld release version... " >&6; }
-+ ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
-+ ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
-+ ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
-+$as_echo_n "checking GNU ld release version major... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
-+$as_echo_n "checking GNU ld release version minor... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
-+ if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
-+ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+ fi
-+ if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
-+ ac_cv_gnu_ld_version_script=yes
-+ fi
-+ fi
-+fi
++# Check for perl
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-+if test "x$CC" != xcc; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
- fi
--
+-fi
+
-{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
-$as_echo_n "checking for mode_t... " >&6; }
-if test "${ac_cv_type_mode_t+set}" = set; then
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++
++case "$host_os" in
++ *irix*)
++ # On IRIX, we prefer Freeware or Nekoware Perl, because the
++ # system perl is so ancient.
++ # Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_type_mode_t=no
@@ -37057,39 +36822,27 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof (mode_t))
- return 0;
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-+# Make sure it works both with $CC and with simple cc.
-+# We do the test twice because some compilers refuse to overwrite an
-+# existing .o file with -o, though they will create one.
-+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+rm -f conftest2.*
-+if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37117,19 +36870,13 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } &&
-+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37142,37 +36889,124 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
++for as_dir in $as_dummy
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ac_cv_type_mode_t=yes
--fi
++ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
++ ;;
++esac
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+
-fi
--
++ ;;
++ *)
++ # Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ ;;
++esac
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-$as_echo "$ac_cv_type_mode_t" >&6; }
-if test "x$ac_cv_type_mode_t" = x""yes; then
- :
--else
--
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
+ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
--
--fi
--
+
++ ;;
++esac
++
++if test x"$PERL" = x""; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
++$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
++ merged_build_possible=no
++else
++ if test x"$debug" = x"yes";then
++ PERL="$PERL -W"
++ fi
++ export PERL
++ true
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
-$as_echo_n "checking for off_t... " >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_off_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -37193,24 +37027,13 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; };
-+then
-+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-+ if test "x$CC" != xcc; then
-+ # Test first that cc exists at all.
-+ if { ac_try='cc -c conftest.$ac_ext >&5'
-+ { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37238,21 +37061,13 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+ rm -f conftest2.*
-+ if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37262,77 +37077,97 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } &&
-+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; };
-+ then
-+ # cc works too.
-+ :
-+ else
-+ # cc exists but doesn't like -o.
-+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+ fi
-+ fi
-+ fi
++ if test -n "$AR"; then
++ ac_cv_prog_AR="$AR" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_AR="${ac_tool_prefix}ar"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ac_cv_type_off_t=yes
-+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
-+rm -f core conftest*
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
++fi
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
fi
++if test -z "$ac_cv_prog_AR"; then
++ ac_ct_AR=$AR
++ # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_AR"; then
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_AR="ar"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-$as_echo "$ac_cv_type_off_t" >&6; }
-if test "x$ac_cv_type_off_t" = x""yes; then
- :
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+ BROKEN_CC=
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-+ BROKEN_CC=#
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
-+$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
-+if test "${samba_cv_HAVE_Werror+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -37389,7 +37224,15 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ if test "x$ac_ct_AR" = x; then
++ AR=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -37403,47 +37246,78 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++ AR=$ac_ct_AR
++ fi
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_size_t=yes
--fi
++ AR="$ac_cv_prog_AR"
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Werror";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror=cross
++
++LD=ld
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++if test "${ac_cv_prog_gnu_ld+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++ ac_cv_prog_gnu_ld=yes
++else
++ ac_cv_prog_gnu_ld=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
++$as_echo "$ac_cv_prog_gnu_ld" >&6; }
-+ int main(void)
-+ {
-+ return 0;
-+ }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror=yes
-+else
-+ samba_cv_HAVE_Werror=no
+
++if test "$ac_cv_prog_gnu_ld" = "yes"; then
++ ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
++$as_echo_n "checking GNU ld release date... " >&6; }
++ ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
++$as_echo "${ac_cv_gnu_ld_date}" >&6; }
++ if test -n "$ac_cv_gnu_ld_date"; then
++ if test "$ac_cv_gnu_ld_date" -lt 20030217; then
++ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ fi
++ if test "$ac_cv_gnu_ld_date" -gt 20030101; then
++ ac_cv_gnu_ld_version_script=yes
++ fi
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
++$as_echo_n "checking GNU ld release version... " >&6; }
++ ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++ ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
++ ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
++$as_echo_n "checking GNU ld release version major... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
++$as_echo_n "checking GNU ld release version minor... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
++ if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
++ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ fi
++ if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++ ac_cv_gnu_ld_version_script=yes
++ fi
++ fi
fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
@@ -37453,26 +37327,22 @@
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
++if test "x$CC" != xcc; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
fi
-
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
-+$as_echo "$samba_cv_HAVE_Werror" >&6; }
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+ Werror_FLAGS="-Werror"
++set dummy $CC; ac_cc=`$as_echo "$2" |
++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
@@ -37480,27 +37350,39 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++
+ int
+ main ()
+ {
-if (sizeof (pid_t))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37528,13 +37410,19 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37544,87 +37432,125 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
-+$as_echo_n "checking that the C compiler understands -w2... " >&6; }
-+if test "${samba_cv_HAVE_w2+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++then
++ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++ if test "x$CC" != xcc; then
++ # Test first that cc exists at all.
++ if { ac_try='cc -c conftest.$ac_ext >&5'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++ rm -f conftest2.*
++ if { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++ then
++ # cc works too.
++ :
++ else
++ # cc exists but doesn't like -o.
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++ fi
++ fi
++ fi
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_pid_t=yes
--fi
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
++rm -f core conftest*
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-w2";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_w2=cross
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
-+ int main(void)
-+ {
-+ return 0;
-+ }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_w2=yes
-+else
-+ samba_cv_HAVE_w2=no
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
- :
--else
-
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
++ BROKEN_CC=
+ else
+-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
+-
++ BROKEN_CC=#
+ fi
- fi
--
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-$as_echo_n "checking for struct stat.st_rdev... " >&6; }
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+ Werror_FLAGS="-w2"
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
++$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
++if test "${samba_cv_HAVE_Werror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="-Werror";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -37635,7 +37561,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37655,22 +37586,47 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ samba_cv_HAVE_Werror=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
++$as_echo "$samba_cv_HAVE_Werror" >&6; }
++if test x"$samba_cv_HAVE_Werror" = x"yes"; then
++ Werror_FLAGS="-Werror"
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
++$as_echo_n "checking that the C compiler understands -w2... " >&6; }
++if test "${samba_cv_HAVE_w2+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++
+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-errwarn=%all";
++ CFLAGS="-w2";
+ export CFLAGS;
+ old_CPPFLAGS="$CPPFLAGS";
+ CPPFLAGS="$CPPFLAGS";
@@ -37679,7 +37635,7 @@
+ LDFLAGS="$LDFLAGS";
+ export LDFLAGS;
+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_errwarn=cross
++ samba_cv_HAVE_w2=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -37694,10 +37650,10 @@
- return 0;
-}
+
-+ int main(void)
-+ {
-+ return 0;
-+ }
++ int main(void)
++ {
++ return 0;
++ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -37719,13 +37675,13 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_errwarn=yes
++ samba_cv_HAVE_w2=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_rdev=no
-+ samba_cv_HAVE_errwarn=no
++ samba_cv_HAVE_w2=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -37744,115 +37700,131 @@
+ old_LDFLAGS="";
+ export LDFLAGS;
+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+ Werror_FLAGS="-errwarn=%all"
-+fi
-+fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
++$as_echo "$samba_cv_HAVE_w2" >&6; }
++if test x"$samba_cv_HAVE_w2" = x"yes"; then
++ Werror_FLAGS="-w2"
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
++$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++if test "${samba_cv_HAVE_errwarn+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
-+$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-+if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
+
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="-errwarn=%all";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_errwarn=cross
+else
-+
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
-+ #include <stdio.h>
-+ enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-+ int main(void) {
-+ enum negative_values v1 = NEGATIVE_VALUE;
-+ unsigned v2 = NEGATIVE_VALUE;
-+
-+ if (v1 != 0xFFFFFFFF) {
-+ printf("%u != 0xFFFFFFFF\n", v1);
-+ return 1;
-+ }
-+ if (v2 != 0xFFFFFFFF) {
-+ printf("%u != 0xFFFFFFFF\n", v2);
-+ return 1;
-+ }
-+ return 0;
-+ }
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_RDEV 1
++ int main(void)
++ {
++ return 0;
++ }
_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
++ samba_cv_HAVE_errwarn=yes
+else
-+ samba_cv__CC_NEGATIVE_ENUM_VALUES=no
++ samba_cv_HAVE_errwarn=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
++
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
-+$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
-+if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
-+$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
-+ PIDL_ARGS="$PIDL_ARGS --uint-enums"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++ Werror_FLAGS="-errwarn=%all"
+fi
++fi
++fi
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
-{ $as_echo "$as_me:$LINENO: checking for d_off in dirent" >&5
-$as_echo_n "checking for d_off in dirent... " >&6; }
-if test "${ac_cv_dirent_d_off+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
++$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-+saved_CFLAGS="$CFLAGS";
-+c99_init=no
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
-+$as_echo_n "checking for C99 designated initializers... " >&6; }
-+ CFLAGS="$saved_CFLAGS";
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-struct dirent d; d.d_off;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
+- ;
+- return 0;
+-}
++ #include <stdio.h>
++ enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
++ int main(void) {
++ enum negative_values v1 = NEGATIVE_VALUE;
++ unsigned v2 = NEGATIVE_VALUE;
+
- ;
- return 0;
- }
++ if (v1 != 0xFFFFFFFF) {
++ printf("%u != 0xFFFFFFFF\n", v1);
++ return 1;
++ }
++ if (v2 != 0xFFFFFFFF) {
++ printf("%u != 0xFFFFFFFF\n", v2);
++ return 1;
++ }
++
++ return 0;
++ }
++
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -37873,30 +37845,38 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_dirent_d_off=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_dirent_d_off=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ samba_cv__CC_NEGATIVE_ENUM_VALUES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_dirent_d_off" >&5
-$as_echo "$ac_cv_dirent_d_off" >&6; }
-if test $ac_cv_dirent_d_off = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
++$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
++if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
++$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
++ PIDL_ARGS="$PIDL_ARGS --uint-enums"
++fi
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DIRENT_D_OFF 1
-_ACEOF
--
+
-fi
--
+
-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
@@ -37908,10 +37888,12 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++saved_CFLAGS="$CFLAGS";
++c99_init=no
+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
-+$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -AC99";
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
++$as_echo_n "checking for C99 designated initializers... " >&6; }
++ CFLAGS="$saved_CFLAGS";
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
@@ -37961,9 +37943,9 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
++$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++ CFLAGS="$saved_CFLAGS -AC99";
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
@@ -38026,10 +38008,25 @@
-if test "x$ac_cv_type_ssize_t" = x""yes; then
- :
-else
--
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++ CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
+
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
--_ACEOF
++ ;
++ return 0;
++}
+ _ACEOF
-
-fi
-
@@ -38037,13 +38034,21 @@
-$as_echo_n "checking for wchar_t... " >&6; }
-if test "${ac_cv_type_wchar_t+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
+ else
- ac_cv_type_wchar_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+if test x"$c99_init" = x"no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
+$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
@@ -38141,21 +38146,12 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_wchar_t=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
+if test "`uname`" = "HP-UX"; then
+ if test "$ac_cv_c_compiler_gnu" = no; then
+ # special override for broken HP-UX compiler - I can't find a way to test
@@ -38163,50 +38159,175 @@
+ CFLAGS="$CFLAGS -AC99";
+ c99_init=yes;
+ fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
--$as_echo "$ac_cv_type_wchar_t" >&6; }
--if test "x$ac_cv_type_wchar_t" = x""yes; then
-- :
--else
-
--cat >>confdefs.h <<_ACEOF
--#define wchar_t unsigned short
--_ACEOF
++fi
++
+if test x"$c99_init" = x"yes"; then
+ saved_CFLAGS=""
-
++
+else
+ CFLAGS="$saved_CFLAGS"
+ saved_CFLAGS=""
+ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
- fi
-
-
--############################################
--# for cups support we need libcups, and a handful of header files
++fi
++
++
+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
+$as_echo_n "checking uname -s... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
+$as_echo "${UNAME_S}" >&6; }
-
--# Check whether --enable-cups was given.
--if test "${enable_cups+set}" = set; then
-- enableval=$enable_cups;
--fi
++
+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
+$as_echo_n "checking uname -r... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
+$as_echo "${UNAME_R}" >&6; }
-
++
+UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
+$as_echo_n "checking uname -m... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
+$as_echo "${UNAME_M}" >&6; }
++
++UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
++$as_echo_n "checking uname -p... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
++$as_echo "${UNAME_P}" >&6; }
++
++UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
++$as_echo_n "checking uname -i... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
++$as_echo "${UNAME_I}" >&6; }
++
++ case "$host_os" in
++ *irix6*)
++ #TODO add to libreplace
++ if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++ CFLAGS="$CFLAGS -diag_error 1035"
++ CFLAGS="$CFLAGS -woff 1209,1174,3201"
++ fi
++ ;;
++esac
++
++DYNEXP=
++
++
++default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
++
++default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
+- ac_cv_type_wchar_t=yes
++if test "x$developer" = xyes; then
++ default_static_modules="$default_static_modules rpc_rpcecho"
++ default_shared_modules="$default_shared_modules charset_weird perfcount_test"
+ 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
++#
++# Config CPPFLAG settings for strange OS's that must be set
++# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
++# case statement; its first reference must be unconditional.
++#
++case "$host_os" in
++ *hpux*)
++#
++# Defines needed for HPUX support.
++# HPUX has bigcrypt but (sometimes?) doesn't use it for
++# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
++#
++ case `uname -r` in
++ *9*|*10*|*11)
++
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
++
++ ;;
++ esac
++ ;;
++
++#
++# CRAY Unicos has broken const handling
++ *unicos*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++ CPPFLAGS="$CPPFLAGS -Dconst="
++ ;;
+
++#
++# AIX4.x doesn't even admit to having large
++# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
++#
++ *aix4*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
+
+-fi
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+-$as_echo "$ac_cv_type_wchar_t" >&6; }
+-if test "x$ac_cv_type_wchar_t" = x""yes; then
+- :
+-else
++ ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing. Make sure to set that here. --jerry
++#
++ *solaris*)
+
+-cat >>confdefs.h <<_ACEOF
+-#define wchar_t unsigned short
+-_ACEOF
++$as_echo "#define SYSV 1" >>confdefs.h
+
+-fi
++ case `uname -r` in
++ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
++$as_echo "no large file support" >&6; }
++ ;;
++ 5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ if test "$ac_cv_c_compiler_gnu" = yes; then
++ ${CC-cc} -v >conftest.c 2>&1
++ ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
++ rm -fr conftest.c
++ case "$ac_cv_gcc_compiler_version_number" in
++ *"gcc version 2.6"*|*"gcc version 2.7"*)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
++ LDFLAGS="$LDFLAGS -lthread"
+
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+-############################################
+-# for cups support we need libcups, and a handful of header files
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
+
+-# Check whether --enable-cups was given.
+-if test "${enable_cups+set}" = set; then
+- enableval=$enable_cups;
+-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+
-if test x$enable_cups != xno; then
- # Extract the first word of "cups-config", so it can be a program name with args.
-set dummy cups-config; ac_word=$2
@@ -38234,11 +38355,7 @@
-done
-done
-IFS=$as_save_IFS
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
-+$as_echo_n "checking uname -p... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
-+$as_echo "${UNAME_P}" >&6; }
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- ;;
-esac
@@ -38251,25 +38368,17 @@
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-+UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
-+$as_echo_n "checking uname -i... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
-+$as_echo "${UNAME_I}" >&6; }
++ ;;
++ esac
++ else
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
-+ case "$host_os" in
-+ *irix6*)
-+ #TODO add to libreplace
-+ if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
-+ CFLAGS="$CFLAGS -diag_error 1035"
-+ CFLAGS="$CFLAGS -woff 1209,1174,3201"
-+ fi
-+ ;;
-+esac
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+DYNEXP=
- if test "x$CUPS_CONFIG" != x; then
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- ac_save_CFLAGS=$CFLAGS
- ac_save_LDFLAGS=$LDFLAGS
@@ -38277,9 +38386,16 @@
- CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
- LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
- PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
-+default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
++ fi
++ ;;
++ esac
++ ;;
++#
++# IRIX uses SYSV printing. Make sure to set that here
++#
++ *irix*)
-+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
++$as_echo "#define SYSV 1" >>confdefs.h
-for ac_header in cups/cups.h cups/language.h
-do
@@ -38289,10 +38405,7 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+if test "x$developer" = xyes; then
-+ default_static_modules="$default_static_modules rpc_rpcecho"
-+ default_shared_modules="$default_shared_modules charset_weird perfcount_test"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -38332,28 +38445,26 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ;;
++ *freebsd*|*dragonfly*)
- ac_header_compiler=no
-fi
-+#
-+# Config CPPFLAG settings for strange OS's that must be set
-+# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
-+# case statement; its first reference must be unconditional.
-+#
-+case "$host_os" in
-+ *hpux*)
-+#
-+# Defines needed for HPUX support.
-+# HPUX has bigcrypt but (sometimes?) doesn't use it for
-+# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
-+#
-+ case `uname -r` in
-+ *9*|*10*|*11)
++$as_echo "#define FREEBSD 1" >>confdefs.h
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
++ ;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++ *vos*)
++ case "$CPPFLAGS" in
++ *-D_POSIX_C_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -38387,31 +38498,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ;;
-+ esac
-+ ;;
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
- ac_header_preproc=no
-fi
-+#
-+# CRAY Unicos has broken const handling
-+ *unicos*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
-+$as_echo "disabling const" >&6; }
-+ CPPFLAGS="$CPPFLAGS -Dconst="
-+ ;;
++ ;;
++ esac
++ case "$CPPFLAGS" in
++ *-D_SYSV*|*-D_SVID_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_SYSV"
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+#
-+# AIX4.x doesn't even admit to having large
-+# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
-+#
-+ *aix4*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
++$as_echo "#define _SYSV 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -38441,20 +38543,33 @@
-## ---------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
++ esac
+ ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++#
++# Tests needed for SINIX large file support.
++#
++ *sysv4*)
++ if test $host = mips-sni-sysv4 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ SINIX_LFS_SUPPORT=cross
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+$as_echo "#define _LARGE_FILES 1" >>confdefs.h
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -38462,40 +38577,29 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+ ;;
-+#
-+# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
-+# to the existance of large files..
-+# Note that -D_LARGEFILE64_SOURCE is different from the Sun
-+# recommendations on large file support, however it makes the
-+# compile work using gcc 2.7 and 2.8, whereas using the Sun
-+# recommendation makes the compile fail on gcc2.7. JRA.
-+#
-+# Solaris uses SYSV printing. Make sure to set that here. --jerry
-+#
-+ *solaris*)
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
++}
+ _ACEOF
+-
++if ac_fn_c_try_run "$LINENO"; then :
++ SINIX_LFS_SUPPORT=yes
++else
++ SINIX_LFS_SUPPORT=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
--fi
-+$as_echo "#define SYSV 1" >>confdefs.h
-
-done
-+ case `uname -r` in
-+ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
-+$as_echo "no large file support" >&6; }
-+ ;;
-+ 5.*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+ if test "$ac_cv_c_compiler_gnu" = yes; then
-+ ${CC-cc} -v >conftest.c 2>&1
-+ ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
-+ rm -fr conftest.c
-+ case "$ac_cv_gcc_compiler_version_number" in
-+ *"gcc version 2.6"*|*"gcc version 2.7"*)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -lthread"
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$SINIX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
- if test x"$ac_cv_header_cups_cups_h" = xyes -a \
- x"$ac_cv_header_cups_language_h" = xyes; then
@@ -38504,10 +38608,14 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CUPS 1
-_ACEOF
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
++ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
++ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
++ LIBS="`getconf LFS64_LIBS` $LIBS"
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
++$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++ fi
++ ;;
- samba_cv_HAVE_CUPS=yes
- else
@@ -38517,7 +38625,10 @@
- LDFLAGS=$ac_save_LDFLAGS
- PRINT_LIBS=$ac_save_PRINT_LIBS
- fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- elif test x"$enable_cups" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located. Make sure cups-devel related files are installed." >&5
@@ -38525,26 +38636,22 @@
- { (exit 1); exit 1; }; }
- fi
-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-# Check whether --enable-iprint was given.
-if test "${enable_iprint+set}" = set; then
- enableval=$enable_iprint;
-fi
+
+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+ ;;
-+ esac
-+ else
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
-
-if test x$enable_iprint != xno; then
- if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IPRINT 1
-_ACEOF
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- elif test x"$enable_iprint" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." >&5
@@ -38552,7 +38659,7 @@
- { (exit 1); exit 1; }; }
- fi
-fi
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++ ;;
-############################################
-# check if the compiler will optimize out function calls
@@ -38560,88 +38667,72 @@
-$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-+ fi
-+ ;;
-+ esac
-+ ;;
++# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
+#
-+# IRIX uses SYSV printing. Make sure to set that here
-+#
-+ *irix*)
-
++ *linux*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ LINUX_LFS_SUPPORT=cross
+ else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+$as_echo "#define SYSV 1" >>confdefs.h
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-+ ;;
-+ *freebsd*|*dragonfly*)
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
++#include <stdlib.h>
++main() {
++#if _LFS64_LARGEFILE == 1
++ struct utsname uts;
++ char *release;
++ int major, minor;
- if (0) {
- this_function_does_not_exist();
- } else {
- return 1;
- }
-+$as_echo "#define FREEBSD 1" >>confdefs.h
++ /* Ensure this is glibc 2.2 or higher */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++ int libc_major = __GLIBC__;
++ int libc_minor = __GLIBC_MINOR__;
+
-+ ;;
-+#
-+# VOS may need to have POSIX support and System V compatibility enabled.
-+#
-+ *vos*)
-+ case "$CPPFLAGS" in
-+ *-D_POSIX_C_SOURCE*)
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
++ if (libc_major < 2)
++ exit(1);
++ if (libc_minor < 2)
++ exit(1);
++#endif
-+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++ /* Ensure this is kernel 2.4 or higher */
- ;
- return 0;
-+ ;;
-+ esac
-+ case "$CPPFLAGS" in
-+ *-D_SYSV*|*-D_SVID_SOURCE*)
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_SYSV"
++ uname(&uts);
++ release = strdup(uts.release);
++ major = atoi(strsep(&release, "."));
++ minor = atoi(strsep(&release, "."));
+
-+$as_echo "#define _SYSV 1" >>confdefs.h
-+
-+ esac
-+ ;;
-+#
-+# Tests needed for SINIX large file support.
-+#
-+ *sysv4*)
-+ if test $host = mips-sni-sysv4 ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ SINIX_LFS_SUPPORT=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
++ if (major > 2 || (major == 2 && minor > 3))
++ exit(0);
++ exit(1);
+#else
-+exit(1);
++ exit(1);
+#endif
}
++
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -38666,13 +38757,13 @@
- }; then
- samba_cv_optimize_out_funcation_calls=yes
+if ac_fn_c_try_run "$LINENO"; then :
-+ SINIX_LFS_SUPPORT=yes
++ LINUX_LFS_SUPPORT=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_optimize_out_funcation_calls=no
-+ SINIX_LFS_SUPPORT=no
++ LINUX_LFS_SUPPORT=no
fi
-
-rm -rf conftest.dSYM
@@ -38688,9 +38779,9 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
-_ACEOF
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$SINIX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$LINUX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-fi
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
@@ -38702,64 +38793,23 @@
-if test "${samba_cv_msghdr_msg_control+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
-+ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
-+ LIBS="`getconf LFS64_LIBS` $LIBS"
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
-+$as_echo "$SINIX_LFS_SUPPORT" >&6; }
-+ fi
-+ ;;
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# Systems with LFS support.
-+#
-+ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+
-+
+-/* end confdefs.h. */
+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+
-+
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+ ;;
-+
-+# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+#
-+ *linux*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ LINUX_LFS_SUPPORT=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-#include <sys/types.h>
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
- #include <stdlib.h>
+-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-int
-main ()
-{
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+ struct utsname uts;
-+ char *release;
-+ int major, minor;
- struct msghdr msg;
- union {
@@ -38768,35 +38818,12 @@
- } control_un;
- msg.msg_control = control_un.control;
- msg.msg_controllen = sizeof(control_un.control);
-+ /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+ int libc_major = __GLIBC__;
-+ int libc_minor = __GLIBC_MINOR__;
-+
-+ if (libc_major < 2)
-+ exit(1);
-+ if (libc_minor < 2)
-+ exit(1);
-+#endif
-+
-+ /* Ensure this is kernel 2.4 or higher */
-+
-+ uname(&uts);
-+ release = strdup(uts.release);
-+ major = atoi(strsep(&release, "."));
-+ minor = atoi(strsep(&release, "."));
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- ;
- return 0;
-+ if (major > 2 || (major == 2 && minor > 3))
-+ exit(0);
-+ exit(1);
-+#else
-+ exit(1);
-+#endif
- }
-+
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38816,32 +38843,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_control=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ LINUX_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++ ;;
+
- samba_cv_msghdr_msg_control=no
-+ LINUX_LFS_SUPPORT=no
- fi
--
+-fi
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++ *darwin*)
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
-$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
--
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_CONTROL 1
-_ACEOF
-fi
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$LINUX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++# Add a system specific charset module.
++ default_shared_modules="$default_shared_modules charset_macosxfs"
-#############################################
-# check for fd passing struct via msg_acctrights
@@ -38849,15 +38880,23 @@
-$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-
++ ;;
++ *hurd*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ GLIBC_LFS_SUPPORT=cross
+ else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <sys/types.h>
-#include <stdlib.h>
@@ -38867,17 +38906,23 @@
-int
-main ()
-{
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
+-
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
-
+-
- ;
- return 0;
--}
--_ACEOF
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38897,38 +38942,34 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_acctrights=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ GLIBC_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
+-
- samba_cv_msghdr_msg_acctrights=no
--fi
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+ ;;
-
++ GLIBC_LFS_SUPPORT=no
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
-$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
-if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+ *darwin*)
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
-_ACEOF
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$GLIBC_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+# Add a system specific charset module.
-+ default_shared_modules="$default_shared_modules charset_macosxfs"
-for ac_func in dirfd
-do
@@ -38937,43 +38978,38 @@
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+ ;;
-+ *hurd*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ GLIBC_LFS_SUPPORT=cross
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
++$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
++ ;;
-#ifdef __STDC__
-# include <limits.h>
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
- #else
+-#else
-# include <assert.h>
-#endif
--
++esac
+
-#undef $ac_func
--
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -38986,17 +39022,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+exit(1);
- #endif
--
+-#endif
+
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -39019,21 +39054,27 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+ GLIBC_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++echo "LIBREPLACE_BROKEN_CHECKS: START"
+
- eval "$as_ac_var=no"
-+ GLIBC_LFS_SUPPORT=no
- fi
--
+-fi
++libreplacedir=""
++libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
++for d in $libreplacepaths; do
++ if test -f "$d/replace.c"; then
++ libreplacedir="$d"
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++ break;
++ fi
++done
++if test x"$libreplacedir" = "x"; then
++ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -39048,54 +39089,53 @@
-fi
-done
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++LIBREPLACEOBJ="replace.o"
++
-if test x"$ac_cv_func_dirfd" = x"yes"; then
- default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
-{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
-$as_echo_n "checking for struct sigevent type... " >&6; }
-if test "${samba_cv_struct_sigevent+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+ ;;
-
--#include <sys/types.h>
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-
+ #include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
--#include <signal.h>
--int
--main ()
--{
+ #include <signal.h>
++
+ int
+ main ()
+ {
-struct sigevent s;
-- ;
-- return 0;
--}
--_ACEOF
++return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -39109,39 +39149,29 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_struct_sigevent=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_type_signal=int
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- samba_cv_struct_sigevent=no
--fi
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
-+
-+libreplacedir=""
-+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
-+for d in $libreplacepaths; do
-+ if test -f "$d/replace.c"; then
-+ libreplacedir="$d"
-+
-+ break;
-+ fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
++ ac_cv_type_signal=void
fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_sigevent" >&5
-$as_echo "$samba_cv_struct_sigevent" >&6; }
-if test x"$samba_cv_struct_sigevent" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_SIGEVENT 1
--_ACEOF
-+LIBREPLACEOBJ="replace.o"
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
- { $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sival_ptr" >&5
-$as_echo_n "checking for struct sigevent.sigev_value.sival_ptr... " >&6; }
@@ -39185,36 +39215,33 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
++$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
++if test "${ac_cv_type_uid_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-#include <signal.h>
+#include <sys/types.h>
- #include <signal.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct sigevent ac_aggr;
-if (sizeof ac_aggr.sigev_value.sival_ptr)
-return 0;
-+return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -39235,51 +39262,50 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_type_signal=int
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "uid_t" >/dev/null 2>&1; then :
++ ac_cv_type_uid_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no
--fi
--
++ ac_cv_type_uid_t=no
+ fi
++rm -f conftest*
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_type_signal=void
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
++$as_echo "$ac_cv_type_uid_t" >&6; }
++if test $ac_cv_type_uid_t = no; then
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&5
-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&6; }
-if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
++$as_echo "#define uid_t int" >>confdefs.h
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
+-_ACEOF
++$as_echo "#define gid_t int" >>confdefs.h
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sigval_ptr" >&5
-$as_echo_n "checking for struct sigevent.sigev_value.sigval_ptr... " >&6; }
-if test "${ac_cv_member_struct_sigevent_sigev_value_sigval_ptr+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-+if test "${ac_cv_type_uid_t+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <signal.h>
-+#include <sys/types.h>
-int
-main ()
@@ -39290,7 +39316,7 @@
- ;
- return 0;
-}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39310,15 +39336,11 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "uid_t" >/dev/null 2>&1; then :
-+ ac_cv_type_uid_t=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_type_uid_t=no
-+fi
-+rm -f conftest*
++ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
++if test "x$ac_cv_type_mode_t" = x""yes; then :
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -39327,10 +39349,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <signal.h>
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-+$as_echo "$ac_cv_type_uid_t" >&6; }
-+if test $ac_cv_type_uid_t = no; then
++else
-int
-main ()
@@ -39341,7 +39360,9 @@
- ;
- return 0;
-}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39364,37 +39385,33 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define uid_t int" >>confdefs.h
- ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
--fi
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-+$as_echo "#define gid_t int" >>confdefs.h
++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
++if test "x$ac_cv_type_off_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then
-+
-+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-+if test "x$ac_cv_type_mode_t" = x""yes; then :
-+
+else
cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+#define mode_t int
++#define off_t long int
_ACEOF
-
fi
-fi
-+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-+if test "x$ac_cv_type_off_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
-{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
-$as_echo_n "checking for struct timespec type... " >&6; }
@@ -39404,13 +39421,11 @@
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+-
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
@@ -39426,11 +39441,7 @@
-# include <time.h>
-# endif
-#endif
-+fi
-+
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
-
+-
-int
-main ()
-{
@@ -39438,7 +39449,9 @@
- ;
- return 0;
-}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39458,29 +39471,25 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_struct_timespec=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- samba_cv_struct_timespec=no
--fi
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5
-$as_echo "$samba_cv_struct_timespec" >&6; }
-if test x"$samba_cv_struct_timespec" = x"yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STRUCT_TIMESPEC 1
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
+
+else
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_TIMESPEC 1
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
_ACEOF
@@ -39666,7 +39675,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -38442,213 +8701,160 @@
+@@ -38442,44 +8701,17 @@
return 0;
}
_ACEOF
@@ -39698,23 +39707,31 @@
- $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 )
+-ac_cv_func_memcmp_working=no
+ ac_cv_func_memcmp_working=no
-+fi
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
+ fi
+
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-+$as_echo "$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+ *" memcmp.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
-+esac
-+
-+
-+
+ $as_echo "$ac_cv_func_memcmp_working" >&6; }
+ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+ *" memcmp.$ac_objext "* ) ;;
+@@ -38489,166 +8721,418 @@
+
+
+
+-###############################################
+-# Readline included by default unless explicitly asked not to
+-test "${with_readline+set}" != "set" && with_readline=yes
+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39724,11 +39741,20 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+
+
+-# test for where we get readline() from
+-{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
+-$as_echo_n "checking whether to use readline... " >&6; }
+fi
+done
-+
-+
+
+-# Check whether --with-readline was given.
+-if test "${with_readline+set}" = set; then
+- withval=$with_readline; case "$with_readline" in
+- yes)
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+
+for ac_header in stdbool.h stdint.h sys/select.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39752,13 +39778,9 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-
--( exit $ac_status )
--ac_cv_func_memcmp_working=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
++fi
++
+done
+
+
@@ -39770,10 +39792,10 @@
+ ac_config_commands="$ac_config_commands mk-stdint.h"
+
+
- fi
-
-
++fi
+
++
++
+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
+ ac_config_commands="$ac_config_commands rm-stdbool.h"
@@ -39782,44 +39804,272 @@
+ ac_config_commands="$ac_config_commands mk-stdbool.h"
+
+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--$as_echo "$ac_cv_func_memcmp_working" >&6; }
--test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-- *" memcmp.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-- ;;
--esac
-
-
-
--###############################################
--# Readline included by default unless explicitly asked not to
--test "${with_readline+set}" != "set" && with_readline=yes
-
--# test for where we get readline() from
--{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
--$as_echo_n "checking whether to use readline... " >&6; }
++fi
++
++
++
++
+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
+$ac_includes_default
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
-
--# Check whether --with-readline was given.
--if test "${with_readline+set}" = set; then
-- withval=$with_readline; case "$with_readline" in
-- yes)
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
++
+"
+if test "x$ac_cv_type_bool" = x""yes; then :
-
++
+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
-
++
+fi
++
++
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
++$ac_includes_default
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
++
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_MMAP=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include "$libreplacedir/test/shared_mmap.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_MMAP=yes
++else
++ libreplace_cv_HAVE_MMAP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
++
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
++
++fi
++
++
++for ac_header in sys/syslog.h syslog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in sys/time.h time.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in stdarg.h vararg.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in sys/mount.h mntent.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in stropts.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
++if test "x$ac_cv_header_stropts_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STROPTS_H 1
++_ACEOF
++
++fi
++
++done
++
++
++for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++for ac_func in isatty chown lchown link readlink symlink realpath
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
++$as_echo_n "checking for setresuid declaration... " >&6; }
++if test "${ac_cv_have_setresuid_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)setresuid
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresuid_decl=yes
++else
++ ac_cv_have_setresuid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
++$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
++
++$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5
++$as_echo_n "checking for setresgid declaration... " >&6; }
++if test "${ac_cv_have_setresgid_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)setresgid
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresgid_decl=yes
++else
++ ac_cv_have_setresgid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
++$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
++
++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
++ fi
+
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39827,13 +40077,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
++$as_echo_n "checking for errno declaration... " >&6; }
++if test "${ac_cv_have_errno_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -39842,11 +40095,20 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
- $ac_includes_default
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++#include <errno.h>
++int
++main ()
++{
++int i = (int)errno
++ ;
++ return 0;
++}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39866,24 +40128,23 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_errno_decl=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
-+
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
-+
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
-
+-
- ac_header_compiler=no
++ ac_cv_have_errno_decl=no
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5
++$as_echo "$ac_cv_have_errno_decl" >&6; }
++ if test x"$ac_cv_have_errno_decl" = x"yes"; then
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -39893,19 +40154,37 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
++
++ fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
++$as_echo_n "checking for secure mkstemp... " >&6; }
++if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_MMAP=cross
++ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <$ac_header>
-+#include "$libreplacedir/test/shared_mmap.c"
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++main() {
++ struct stat st;
++ char tpl[20]="/tmp/test.XXXXXX";
++ int fd = mkstemp(tpl);
++ if (fd == -1) exit(1);
++ unlink(tpl);
++ if (fstat(fd, &st) != 0) exit(1);
++ if ((st.st_mode & 0777) != 0600) exit(1);
++ exit(0);
++}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -39926,11 +40205,11 @@
- }; then
- ac_header_preproc=yes
+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_MMAP=yes
++ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_MMAP=no
++ libreplace_cv_HAVE_SECURE_MKSTEMP=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -39938,14 +40217,14 @@
- ac_header_preproc=no
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
-+$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
-+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -39993,8 +40272,7 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+for ac_header in sys/syslog.h syslog.h
++for ac_header in stdio.h strings.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -40003,7 +40281,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38657,149 +8863,40 @@
+@@ -38657,948 +9141,563 @@
done
@@ -40021,7 +40299,10 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++ ac_have_decl=1
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40033,14 +40314,11 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+for ac_header in sys/time.h time.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40061,36 +40339,60 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++ ac_have_decl=1
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_have_decl=0
++fi
- ac_header_compiler=no
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VSNPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+done
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_ASPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
++fi
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+for ac_header in stdarg.h vararg.h
++
++for ac_func in snprintf vsnprintf asprintf vasprintf
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -40116,11 +40418,12 @@
- ac_header_preproc=no
fi
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -40154,45 +40457,84 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
++$as_echo_n "checking for C99 vsnprintf... " >&6; }
++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- 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; }
-+done
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in sys/mount.h mntent.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -38808,626 +8905,234 @@
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <sys/types.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <stdlib.h>
++void foo(const char *format, ...) {
++ va_list ap;
++ int len;
++ char buf[20];
++ long long l = 1234567890;
++ l *= 100;
++
++ va_start(ap, format);
++ len = vsnprintf(buf, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(1);
++
++ va_start(ap, format);
++ len = vsnprintf(0, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(2);
++
++ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
++
++ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
++ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
++ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
++ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
++
++ exit(0);
++}
++main() { foo("hello"); }
- done
-
-+for ac_header in stropts.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stropts_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STROPTS_H 1
+_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=yes
++else
++ libreplace_cv_HAVE_C99_VSNPRINTF=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-done
+fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-+done
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
++fi
+
+
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40200,13 +40542,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
++$as_echo_n "checking for va_copy... " >&6; }
++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40215,18 +40560,20 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+
-+for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#include <stdarg.h>
++va_list ap1,ap2;
++int
++main ()
++{
++va_copy(ap1,ap2);
++ ;
++ return 0;
++}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40247,18 +40594,35 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE_VA_COPY=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ libreplace_cv_HAVE_VA_COPY=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
++
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
- ac_header_compiler=no
fi
-+done
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
++$as_echo_n "checking for __va_copy... " >&6; }
++if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40267,16 +40631,18 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
-+for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#include <stdarg.h>
++va_list ap1,ap2;
++int
++main ()
++{
++__va_copy(ap1,ap2);
++ ;
++ return 0;
++}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -40296,26 +40662,26 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE___VA_COPY=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
++ libreplace_cv_HAVE___VA_COPY=no
fi
-+done
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40358,47 +40724,23 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+done
-+
-+for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
+-
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
- for termlib in ncurses curses termcap terminfo termlib tinfo; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -40417,14 +40759,14 @@
-extern "C"
-#endif
-char tgetent ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <unistd.h>
++#include <stdio.h>
int
main ()
{
-return tgetent ();
-+int i = (int)setresuid
++printf("%s\n", __FUNCTION__);
;
return 0;
}
@@ -40452,7 +40794,7 @@
- }; then
- eval "$as_ac_Lib=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresuid_decl=yes
++ libreplace_cv_HAVE_FUNCTION_MACRO=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -40464,7 +40806,7 @@
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+ ac_cv_have_setresuid_decl=no
++ libreplace_cv_HAVE_FUNCTION_MACRO=no
fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
@@ -40476,22 +40818,20 @@
- TERMLIBS="-l${termlib}"; break
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
-+$as_echo "$ac_cv_have_setresuid_decl" >&6; }
-+ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
++if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
+
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5
-+$as_echo_n "checking for setresgid declaration... " >&6; }
-+if test "${ac_cv_have_setresgid_decl+set}" = set; then :
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
++$as_echo_n "checking for __func__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -40512,12 +40852,12 @@
-char rl_callback_handler_install ();
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <unistd.h>
++#include <stdio.h>
int
main ()
{
-return rl_callback_handler_install ();
-+int i = (int)setresgid
++printf("%s\n", __func__);
;
return 0;
}
@@ -40544,43 +40884,55 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_callback_handler_install=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_func_MACRO=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_rl_callback_handler_install=no
--fi
++ libreplace_cv_HAVE_func_MACRO=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
- TERMLIBS="-lreadline $TERMLIBS"
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
--
++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
+
- break
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresgid_decl=yes
- else
+-else
- TERMLIBS=
-+ ac_cv_have_setresgid_decl=no
++ fi
fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++for ac_header in sys/param.h limits.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
-+$as_echo "$ac_cv_have_setresgid_decl" >&6; }
-+ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
--done
--
+ done
+
- ;;
- no)
- { $as_echo "$as_me:$LINENO: result: no" >&5
@@ -40589,21 +40941,23 @@
- *)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
--
+
- # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
- # alternate readline path
- _ldflags=${LDFLAGS}
- _cppflags=${CPPFLAGS}
--
++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
+
- # Add additional search path
- LDFLAGS="-L$with_readline/lib $LDFLAGS"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
--
-+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
-+ fi
++fi
+
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40611,9 +40965,9 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
-+$as_echo_n "checking for errno declaration... " >&6; }
-+if test "${ac_cv_have_errno_decl+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
++$as_echo_n "checking for setenv declaration... " >&6; }
++if test "${ac_cv_have_setenv_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -40634,11 +40988,11 @@
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+#include <errno.h>
++#include <stdlib.h>
+int
+main ()
+{
-+int i = (int)errno
++int i = (int)setenv
+ ;
+ return 0;
+}
@@ -40663,22 +41017,22 @@
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_errno_decl=yes
++ ac_cv_have_setenv_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ ac_cv_have_errno_decl=no
++ ac_cv_have_setenv_decl=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5
-+$as_echo "$ac_cv_have_errno_decl" >&6; }
-+ if test x"$ac_cv_have_errno_decl" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40690,7 +41044,19 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
++
++ fi
++
++for ac_func in setenv unsetenv
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40712,11 +41078,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
- ac_header_preproc=no
--fi
-+ fi
+ fi
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -40755,31 +41120,74 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
-+$as_echo_n "checking for secure mkstemp... " >&6; }
-+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)environ
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_environ_decl=yes
++else
++ ac_cv_have_environ_decl=no
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
++$as_echo "$ac_cv_have_environ_decl" >&6; }
++ if test x"$ac_cv_have_environ_decl" = x"yes"; then
++
++$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
++
++ fi
++
++
++for ac_func in strnlen
++do :
++ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
++if test "x$ac_cv_func_strnlen" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STRNLEN 1
++_ACEOF
+
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++done
++
++for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
-
--fi
+ done
--done
--
--
+
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40793,9 +41201,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40804,24 +41210,15 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++# this test disabled as we don't actually need __VA_ARGS__ yet
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+main() {
-+ struct stat st;
-+ char tpl[20]="/tmp/test.XXXXXX";
-+ int fd = mkstemp(tpl);
-+ if (fd == -1) exit(1);
-+ unlink(tpl);
-+ if (fstat(fd, &st) != 0) exit(1);
-+ if ((st.st_mode & 0777) != 0600) exit(1);
-+ exit(0);
-+}
++
++#define eprintf(...) fprintf(stderr, __VA_ARGS__)
++eprintf("bla", "bar");
++
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40842,20 +41239,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
+
- ac_header_compiler=no
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=no
fi
--
++rm -f conftest.err conftest.$ac_ext
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40864,9 +41262,30 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
++$as_echo_n "checking for sig_atomic_t type... " >&6; }
++if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <signal.h>
++int
++main ()
++{
++sig_atomic_t i = 0
++ ;
++ return 0;
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40885,19 +41304,28 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_sig_atomic_t=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ libreplace_cv_sig_atomic_t=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
++$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
++if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
++
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
+
- ac_header_preproc=no
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -40931,56 +41359,58 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
-+$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
-+if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
-+
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+for ac_header in stdio.h strings.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -39436,1086 +9141,564 @@
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- done
-
-+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
-+ ac_have_decl=1
++#include <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
++#endif
++int
++main ()
++{
++int fd = open("/dev/null", O_DIRECT);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
+else
-+ ac_have_decl=0
++ libreplace_cv_HAVE_OPEN_O_DIRECT=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
+-done
+-
++$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
+
+fi
--
+
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40988,53 +41418,37 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
++$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++if test "${libreplace_cv_volatile+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ASPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+ ac_have_decl=1
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VASPRINTF $ac_have_decl
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+
-+for ac_func in snprintf vsnprintf asprintf vasprintf
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#include <sys/types.h>
++int
++main ()
++{
++volatile int i = 0
++ ;
++ return 0;
++}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -41055,17 +41469,23 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_volatile=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
++ libreplace_cv_volatile=no
fi
-+done
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
++$as_echo "$libreplace_cv_volatile" >&6; }
++if test x"$libreplace_cv_volatile" = x"yes"; then
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -41075,52 +41495,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
-+$as_echo_n "checking for C99 vsnprintf... " >&6; }
-+if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <$ac_header>
-+
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) {
-+ va_list ap;
-+ int len;
-+ char buf[20];
-+ long long l = 1234567890;
-+ l *= 100;
-+
-+ va_start(ap, format);
-+ len = vsnprintf(buf, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(1);
-+
-+ va_start(ap, format);
-+ len = vsnprintf(0, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(2);
-+
-+ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
-+
-+ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
-+ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
-+ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
-+ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
-+
-+ exit(0);
-+}
-+main() { foo("hello"); }
-+
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -41139,28 +41516,18 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_C99_VSNPRINTF=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
- ac_header_preproc=no
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
-+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -41194,31 +41561,69 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++# filesys
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <$ac_hdr>
--fi
++int
++main ()
++{
++if ((DIR *) 0)
++return 0;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "$as_ac_Header=yes"
++else
++ eval "$as_ac_Header=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++eval ac_res=\$$as_ac_Header
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
- for termlib in ncurses curses termcap terminfo termlib; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
-+$as_echo_n "checking for va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
++ac_header_dirent=$ac_hdr; break
++fi
++
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -41228,24 +41633,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+@@ -39607,72 +9706,55 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char tgetent ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++char opendir ();
int
main ()
{
-return tgetent ();
-+va_copy(ap1,ap2);
++return opendir ();
;
return 0;
}
@@ -41272,22 +41675,35 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_VA_COPY=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-+ libreplace_cv_HAVE_VA_COPY=no
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_opendir=$ac_res
fi
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then :
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++else
++ ac_cv_search_opendir=no
fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
@@ -41297,22 +41713,25 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- TERMLIBS="-l${termlib}"; break
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
-+
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
-+
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
-+$as_echo_n "checking for __va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
++fi
++
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -41322,24 +41741,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+@@ -39681,591 +9763,461 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char rl_callback_handler_install ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++char opendir ();
int
main ()
{
-return rl_callback_handler_install ();
-+__va_copy(ap1,ap2);
++return opendir ();
;
return 0;
}
@@ -41366,22 +41783,45 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_callback_handler_install=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE___VA_COPY=yes
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_opendir=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then :
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
- ac_cv_lib_readline_rl_callback_handler_install=no
-+ libreplace_cv_HAVE___VA_COPY=no
fi
--
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
@@ -41390,46 +41830,85 @@
- TERMCPPFLAGS="-I$with_readline/include"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
- TERMLIBS="-lreadline $TERMLIBS"
--
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
++for ac_header in fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
- break
-else
- TERMLIBS= CPPFLAGS=$_cppflags
--fi
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
+ fi
++done
++
++for ac_header in sys/acl.h acl/libacl.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
fi
--
--done
--
--
+
+ done
+
+
- LDFLAGS=$_ldflags
- ;;
- esac
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
--
++# select
++for ac_header in sys/select.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_select_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_SELECT_H 1
++_ACEOF
+
fi
--
--
--
++done
+
+
++# time
++for ac_header in sys/time.h utime.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
-# The readline API changed slightly from readline3 to readline4, so
-# code will generate warnings on one of them unless we have a few
-# special cases.
-{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
-+$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
++fi
++
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -41439,7 +41918,11 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41448,14 +41931,12 @@
-extern "C"
-#endif
-char rl_completion_matches ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
int
main ()
{
-return rl_completion_matches ();
-+printf("%s\n", __FUNCTION__);
++if ((struct tm *) 0)
++return 0;
;
return 0;
}
@@ -41483,44 +41964,55 @@
- }; then
- ac_cv_lib_readline_rl_completion_matches=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_FUNCTION_MACRO=yes
++ ac_cv_header_time=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_rl_completion_matches=no
--fi
--
++ ac_cv_header_time=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
++
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+ libreplace_cv_HAVE_FUNCTION_MACRO=no
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
--
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++for ac_func in utime utimes
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++done
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
-# not all readline libs have rl_event_hook or history_list
-{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
-$as_echo_n "checking whether rl_event_hook is declared... " >&6; }
-if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
-+$as_echo_n "checking for __func__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
++# wait
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
++$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
++if test "${ac_cv_header_sys_wait_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -41528,12 +42020,18 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <readline/readline.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++#ifndef WEXITSTATUS
++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
++#endif
++#ifndef WIFEXITED
++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
++#endif
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
int
main ()
{
@@ -41541,7 +42039,9 @@
- (void) rl_event_hook;
-#endif
-
-+printf("%s\n", __func__);
++ int s;
++ wait (&s);
++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
;
return 0;
}
@@ -41566,13 +42066,13 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_rl_event_hook=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_func_MACRO=yes
++ ac_cv_header_sys_wait_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_rl_event_hook=no
-+ libreplace_cv_HAVE_func_MACRO=no
++ ac_cv_header_sys_wait_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -41580,60 +42080,96 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
-+ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
++$as_echo "$ac_cv_header_sys_wait_h" >&6; }
++if test $ac_cv_header_sys_wait_h = yes; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 1
-_ACEOF
-+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
-
-+ fi
++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
++
+fi
+
-else
-+for ac_header in sys/param.h limits.h
++# capability
++for ac_header in sys/capability.h
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 0
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_CAPABILITY_H 1
_ACEOF
-+fi
-+
-+done
-+
-+
-+ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
-+if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
-+
-+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
-
+-
fi
++done
-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
-$as_echo_n "checking for history_list in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_history_list+set}" = set; then
+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
-+$as_echo_n "checking for setenv declaration... " >&6; }
-+if test "${ac_cv_have_setenv_decl+set}" = set; then :
++case "$host_os" in
++*linux*)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
++$as_echo_n "checking for broken RedHat 7.2 system header files... " >&6; }
++if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $TERMLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #ifdef HAVE_SYS_VFS_H
++ #include <sys/vfs.h>
++ #endif
++ #ifdef HAVE_SYS_CAPABILITY_H
++ #include <sys/capability.h>
++ #endif
++
++int
++main ()
++{
++
++ int i;
++
++ ;
++ return 0;
++}
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
++else
++ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
++$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
++if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
++
++$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
++$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
++if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41642,14 +42178,18 @@
-extern "C"
-#endif
-char history_list ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
++ #ifdef HAVE_SYS_CAPABILITY_H
++ #include <sys/capability.h>
++ #endif
++ #include <linux/types.h>
++
int
main ()
{
-return history_list ();
-+int i = (int)setenv
++
++ __s8 i;
++
;
return 0;
}
@@ -41677,35 +42217,52 @@
- }; then
- ac_cv_lib_readline_history_list=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setenv_decl=yes
++ libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=no
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5
++$as_echo "$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&6; }
++if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
++
++$as_echo "#define BROKEN_RHEL5_SYS_CAP_HEADER 1" >>confdefs.h
++
++fi
++;;
++esac
++
++# passwd
++for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
- ac_cv_lib_readline_history_list=no
-+ ac_cv_have_setenv_decl=no
fi
--
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
-$as_echo "$ac_cv_lib_readline_history_list" >&6; }
-if test "x$ac_cv_lib_readline_history_list" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
-+$as_echo "$ac_cv_have_setenv_decl" >&6; }
-+ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
++done
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HISTORY_LIST 1
-+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+for ac_func in setenv unsetenv
++for ac_func in getpwnam_r getpwuid_r getpwent_r
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -41724,9 +42281,9 @@
-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
-+$as_echo_n "checking for environ declaration... " >&6; }
-+if test "${ac_cv_have_environ_decl+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
++$as_echo_n "checking for getpwent_r declaration... " >&6; }
++if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
@@ -41735,7 +42292,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41744,14 +42303,14 @@
-extern "C"
-#endif
-char yp_get_default_domain ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
++ #include <unistd.h>
++ #include <pwd.h>
++
int
main ()
{
-return yp_get_default_domain ();
-+int i = (int)environ
++int i = (int)getpwent_r
;
return 0;
}
@@ -41785,67 +42344,45 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_search_yp_get_default_domain=$ac_res
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_environ_decl=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_have_environ_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
-+$as_echo "$ac_cv_have_environ_decl" >&6; }
-+ if test x"$ac_cv_have_environ_decl" = x"yes"; then
-
-+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
-
+-
+-
-fi
-+ fi
-+
-+
-+for ac_func in strnlen
-+do :
-+ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-+if test "x$ac_cv_func_strnlen" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRNLEN 1
-+_ACEOF
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- break
- fi
- done
+-fi
+-done
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- :
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_getpwent_r_decl=yes
+ else
- ac_cv_search_yp_get_default_domain=no
--fi
++ ac_cv_have_getpwent_r_decl=no
+ fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
-$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
-ac_res=$ac_cv_search_yp_get_default_domain
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
++$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
++ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
- fi
-+done
+-fi
++$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
++ fi
-for ac_func in yp_get_default_domain
-do
@@ -41853,15 +42390,17 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
++$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
++if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# this test disabled as we don't actually need __VA_ARGS__ yet
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
@@ -41871,22 +42410,19 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
-+eprintf("bla", "bar");
++ $ac_includes_default
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
++ #include <unistd.h>
++ #include <pwd.h>
-#undef $ac_func
-+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
-+
-+fi
-+rm -f conftest.err conftest.$ac_ext
++ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
++ {
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41901,30 +42437,20 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ #ifndef HAVE_GETPWENT_R_DECL
++ #error missing getpwent_r prototype
++ #endif
++ return NULL;
++
++ }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
-+$as_echo_n "checking for sig_atomic_t type... " >&6; }
-+if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <signal.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+sig_atomic_t i = 0
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -41949,19 +42475,20 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_sig_atomic_t=yes
++
++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ libreplace_cv_sig_atomic_t=no
- fi
--
+-fi
++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -41973,17 +42500,17 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
-+$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-done
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then :
-+fi
-# Check if we have execl, if not we need to compile smbrun.
++$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
-for ac_func in execl
-do
@@ -41991,36 +42518,47 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
-+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
++$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; }
++if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
$as_echo_n "(cached) " >&6
--else
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ $ac_includes_default
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+else
++ #include <unistd.h>
++ #include <pwd.h>
++
++ struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)
++ {
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ #ifndef HAVE_GETPWENT_R_DECL
++ #error missing getpwent_r prototype
++ #endif
++ return NULL;
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42034,19 +42572,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
- #endif
--
- int
- main ()
- {
+-#endif
++ }
+
+-int
+-main ()
+-{
-return $ac_func ();
-+int fd = open("/dev/null", O_DIRECT);
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42071,19 +42606,22 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
++
++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=no
++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=no
++
fi
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42092,36 +42630,77 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then :
++
++
++$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
++
++
++fi
++
++for ac_func in getgrnam_r getgrgid_r getgrent_r
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -40273,353 +10225,211 @@
+ fi
+ done
--fi
--done
-+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
-
-if test x"$ac_cv_func_execl" = x"no"; then
- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
- fi
+-fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
++$as_echo_n "checking for getgrent_r declaration... " >&6; }
++if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
--
--
--
--
--
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++ #include <unistd.h>
++ #include <grp.h>
+
++int
++main ()
++{
++int i = (int)getgrent_r
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_getgrent_r_decl=yes
++else
++ ac_cv_have_getgrent_r_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5
++$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
++ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
+
++$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
+
++ fi
+
-for ac_func in getcwd fchown chmod fchmod mknod mknod64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
-+$as_echo_n "checking that the C compiler understands volatile... " >&6; }
-+if test "${libreplace_cv_volatile+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
++$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
++if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42129,24 +42708,30 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ $ac_includes_default
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++ #include <unistd.h>
++ #include <grp.h>
+
-#undef $ac_func
--
++ struct group *getgrent_r(struct group *src, char *buf, int buflen)
++ {
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -42160,18 +42745,20 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ #ifndef HAVE_GETGRENT_R_DECL
++ #error missing getgrent_r prototype
++ #endif
++ return NULL;
++
++ }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+volatile int i = 0
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42196,19 +42783,22 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_volatile=yes
++
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ libreplace_cv_volatile=no
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
++
fi
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42220,15 +42810,17 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
++
++
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
++
--fi
+ fi
-done
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
-+fi
-for ac_func in strtol
-do
@@ -42236,13 +42828,9 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
++$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
++if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42255,20 +42843,30 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ $ac_includes_default
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++ #include <unistd.h>
++ #include <grp.h>
++
++ struct group *getgrent_r(struct group *src, char *buf, size_t buflen)
++ {
+
-#undef $ac_func
--
++ #ifndef HAVE_GETGRENT_R_DECL
++ #error missing getgrent_r prototype
++ #endif
++ return NULL;
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -42282,18 +42880,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+#include <sys/types.h>
-+#include <$ac_hdr>
++ }
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+if ((DIR *) 0)
-+return 0;
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42318,64 +42913,80 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "$as_ac_Header=yes"
++
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ eval "$as_ac_Header=no"
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no
++
fi
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Header
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
+-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
++
++
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
++
++
++fi
++
++
++# locale
++for ac_header in ctype.h locale.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-+ac_header_dirent=$ac_hdr; break
fi
-done
--
--
++done
+
+
-for ac_func in strchr chflags
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# glob
++for ac_header in fnmatch.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default"
++if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_FNMATCH_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -42384,21 +42995,23 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
+
-#undef $ac_func
++done
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -40523,103 +9706,56 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -42406,16 +43019,23 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char opendir ();
- int
- main ()
- {
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return opendir ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++# shmem
++for ac_header in sys/ipc.h sys/mman.h sys/shm.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42442,23 +43062,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
--fi
--
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_opendir=$ac_res
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -42466,44 +43077,41 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++done
++
++
++# terminal
++for ac_header in termios.h termio.h sys/termio.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then :
-+ break
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
fi
- done
-+if test "${ac_cv_search_opendir+set}" = set; then :
+-done
-+else
-+ ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++done
-+fi
--
--
+
++save_LIBS="$LIBS"
++LIBS=""
+
-for ac_func in getrlimit fsync fdatasync setpgid
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then :
++libreplace_cv_dlfcn=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
++$as_echo_n "checking for library containing dlopen... " >&6; }
++if test "${ac_cv_search_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42533,7 +43141,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40627,167 +9763,148 @@
+@@ -40627,104 +10437,85 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -42545,12 +43153,12 @@
-choke me
-#endif
-
-+char opendir ();
++char dlopen ();
int
main ()
{
-return $ac_func ();
-+return opendir ();
++return dlopen ();
;
return 0;
}
@@ -42577,7 +43185,7 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+for ac_lib in '' x; do
++for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
@@ -42585,27 +43193,27 @@
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_opendir=$ac_res
++ ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then :
++ if test "${ac_cv_search_dlopen+set}" = set; then :
+ break
+fi
+done
-+if test "${ac_cv_search_opendir+set}" = set; then :
++if test "${ac_cv_search_dlopen+set}" = set; then :
+
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_search_opendir=no
++ ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
++$as_echo "$ac_cv_search_dlopen" >&6; }
++ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -42615,6 +43223,15 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++
++for ac_header in dlfcn.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
++_ACEOF
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42624,83 +43241,71 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
-+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
++done
++
++for ac_func in dlopen dlsym dlerror dlclose
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
++else
++ libreplace_cv_dlfcn=yes
fi
--done
+ done
-+done
-+for ac_header in sys/acl.h acl/libacl.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
-
+-
+-
+-
+-
-for ac_func in setsid glob strpbrk crypt16 getauthuid
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++libreplace_cv_shl=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
++$as_echo_n "checking for library containing shl_load... " >&6; }
++if test "${ac_cv_search_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# select
-+for ac_header in sys/select.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SELECT_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-
+-
-#undef $ac_func
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -40732,945 +10523,612 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -42708,38 +43313,13 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+# time
-+for ac_header in sys/time.h utime.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-+if test "${ac_cv_header_time+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-
+-
++char shl_load ();
int
main ()
{
-return $ac_func ();
-+if ((struct tm *) 0)
-+return 0;
++return shl_load ();
;
return 0;
}
@@ -42766,26 +43346,52 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_time=yes
++for ac_lib in '' sl; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_shl_load=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_shl_load+set}" = set; then :
++ break
++fi
++done
++if test "${ac_cv_search_shl_load+set}" = set; then :
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_search_shl_load=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5
++$as_echo "$ac_cv_search_shl_load" >&6; }
++ac_res=$ac_cv_search_shl_load
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
- eval "$as_ac_var=no"
-+ ac_cv_header_time=no
fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-+$as_echo "$ac_cv_header_time" >&6; }
-+if test $ac_cv_header_time = yes; then
-+
-+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++for ac_header in dl.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
++if test "x$ac_cv_header_dl_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DL_H 1
++_ACEOF
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42795,7 +43401,9 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
-+for ac_func in utime utimes
++done
++
++for ac_func in shl_load shl_unload shl_findsym
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -42804,84 +43412,97 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40796,638 +9913,311 @@
+
++else
++ libreplace_cv_shl=yes
+ fi
done
--
--
--
--
--
--
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
++$as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; }
++if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ $ac_includes_default
+
++ #include <dlfcn.h>
+
++ void *dlopen(const char* filename, unsigned int flags)
++ {
+
++ return 0;
+
++ }
+
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
++ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
+
-for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+# wait
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-#undef $ac_func
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
++$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
++if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#ifndef WEXITSTATUS
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#ifndef WIFEXITED
-+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
+-#endif
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+ int s;
-+ wait (&s);
-+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -42904,19 +43525,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_sys_wait_h=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
+
- eval "$as_ac_var=no"
-fi
--
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ ac_cv_header_sys_wait_h=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42928,46 +43547,40 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
fi
-done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
-+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
-+if test $ac_cv_header_sys_wait_h = yes; then
-+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
++LIBDL="$LIBS"
++LIBS="$save_LIBS"
+
++ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
++if test "x$ac_cv_func_getpass" = x""yes; then :
++ libreplace_cv_HAVE_GETPASS=yes
+fi
++ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
++if test "x$ac_cv_func_getpassphrase" = x""yes; then :
++ libreplace_cv_HAVE_GETPASSPHRASE=yes
++fi
-+# capability
-+for ac_header in sys/capability.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_CAPABILITY_H 1
-+_ACEOF
++if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
-+fi
++$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
-+done
-
-for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+case "$host_os" in
-+*linux*)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
-+$as_echo_n "checking for broken RedHat 7.2 system header files... " >&6; }
-+if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -42977,19 +43590,29 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
++else
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
++$as_echo_n "checking whether getpass should be replaced... " >&6; }
++if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
-#undef $ac_func
++SAVE_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -43006,20 +43629,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifdef HAVE_SYS_VFS_H
-+ #include <sys/vfs.h>
-+ #endif
-+ #ifdef HAVE_SYS_CAPABILITY_H
-+ #include <sys/capability.h>
-+ #endif
++#include "confdefs.h"
++#define NO_CONFIG_H
++#include "$libreplacedir/getpass.c"
int
main ()
{
-return $ac_func ();
+
-+ int i;
-+
;
return 0;
}
@@ -43047,18 +43665,28 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
++ libreplace_cv_REPLACE_GETPASS=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ libreplace_cv_REPLACE_GETPASS=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CPPFLAGS="$SAVE_CPPFLAGS"
+
- eval "$as_ac_var=no"
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
++$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
++if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
++
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -43069,60 +43697,86 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
fi
-done
--
--
--
--
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
++$as_echo_n "checking whether strptime is available and works... " >&6; }
++if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ if test "$cross_compiling" = yes; then :
++ libreplace_cv_STRPTIME_OK="assuming not"
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME
++ #include "$libreplacedir/test/strptime.c"
+
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_STRPTIME_OK=yes
++else
++ libreplace_cv_STRPTIME_OK=no
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
-+$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
-+if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
-+$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
+fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
++$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
++if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
++$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
+
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
++fi
+
-for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
-+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++done
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43137,17 +43791,27 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifdef HAVE_SYS_CAPABILITY_H
-+ #include <sys/capability.h>
-+ #endif
-+ #include <linux/types.h>
++#######################################
++# Check for mkdir mode
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
++$as_echo_n "checking whether mkdir supports mode... " >&6; }
++if test "${libreplace_cv_mkdir_has_mode+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++ #include <stdio.h>
++ #ifdef HAVE_DIRECT_H
++ #include <direct.h>
++ #endif
int
main ()
{
-return $ac_func ();
+
-+ __s8 i;
++ mkdir("foo",0777);
++ return 0;
+
;
return 0;
@@ -43176,21 +43840,23 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=no
++ libreplace_cv_mkdir_has_mode="yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes
-
+-
- eval "$as_ac_var=no"
++ libreplace_cv_mkdir_has_mode="no"
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5
-+$as_echo "$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&6; }
-+if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_mkdir_has_mode" >&5
++$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
+
-+$as_echo "#define BROKEN_RHEL5_SYS_CAP_HEADER 1" >>confdefs.h
++if test "$libreplace_cv_mkdir_has_mode" = "yes"
++then
++
++$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -43203,56 +43869,68 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+;;
-+esac
+
-+# passwd
-+for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h
++for ac_func in timegm
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
++if test "x$ac_cv_func_timegm" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_TIMEGM 1
_ACEOF
++else
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
fi
--done
--
--
+ done
-+done
-+for ac_func in getpwnam_r getpwuid_r getpwent_r
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
++$as_echo_n "checking for broken readdir... " >&6; }
++if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++ if test "$cross_compiling" = yes; then :
++ libreplace_cv_READDIR_NEEDED="assuming not"
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
+_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_READDIR_NEEDED=no
++else
++ libreplace_cv_READDIR_NEEDED=yes
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
+fi
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
++$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
-
-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
-+$as_echo_n "checking for getpwent_r declaration... " >&6; }
-+if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in dirfd
++do :
++ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
++if test "x$ac_cv_func_dirfd" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DIRFD 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -43264,16 +43942,16 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++fi
++done
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43288,14 +43966,20 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #include <unistd.h>
-+ #include <pwd.h>
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
++$as_echo_n "checking for dirfd declaration... " >&6; }
++if test "${ac_cv_have_dirfd_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <dirent.h>
int
main ()
{
-return $ac_func ();
-+int i = (int)getpwent_r
++int i = (int)dirfd
;
return 0;
}
@@ -43323,7 +44007,7 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_getpwent_r_decl=yes
++ ac_cv_have_dirfd_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -43334,7 +44018,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ ac_cv_have_getpwent_r_decl=no
++ ac_cv_have_dirfd_decl=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43351,26 +44035,39 @@
fi
-done
-
--
--
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
-+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
++$as_echo "$ac_cv_have_dirfd_decl" >&6; }
++ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
-+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
+ fi
+
++#
++# try to replace with getdirentries() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdirentries
++do :
++ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
++if test "x$ac_cv_func_getdirentries" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETDIRENTRIES 1
++_ACEOF
+
++fi
++done
+
-for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
-+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5
++$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
++if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -43395,17 +44092,11 @@
-#else
-# include <assert.h>
-#endif
-+ #include <unistd.h>
-+ #include <pwd.h>
-+
-+ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
-+ {
++ #include <dirent.h>
-#undef $ac_func
-+ #ifndef HAVE_GETPWENT_R_DECL
-+ #error missing getpwent_r prototype
-+ #endif
-+ return NULL;
++ long telldir(const DIR *dir)
++ {
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43420,6 +44111,8 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ return 0;
++
+ }
-int
@@ -43454,7 +44147,7 @@
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
++ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
+
else
- $as_echo "$as_me: failed program was:" >&5
@@ -43462,7 +44155,7 @@
- eval "$as_ac_var=no"
-fi
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
++ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -43483,26 +44176,26 @@
fi
-done
-
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
++$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
++if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
-+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
++$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
+fi
+
-for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
-+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
++$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
++if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -43527,11 +44220,10 @@
-#else
-# include <assert.h>
-#endif
-+ #include <unistd.h>
-+ #include <pwd.h>
++ #include <dirent.h>
-#undef $ac_func
-+ struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)
++ int seekdir(DIR *dir, long ofs)
+ {
-/* Override any GCC internal prototype to avoid an error.
@@ -43547,10 +44239,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETPWENT_R_DECL
-+ #error missing getpwent_r prototype
-+ #endif
-+ return NULL;
++ return 0;
+
+ }
@@ -43586,14 +44275,14 @@
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=yes
++ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
+
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=no
++ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
+
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -43609,38 +44298,30 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then :
-+
-+
-+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
-+
-+
-+fi
-+
-+for ac_func in getgrnam_r getgrgid_r getgrent_r
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -41436,344 +10226,210 @@
- done
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
++$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
++if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
+-fi
+-done
++$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
+
-for ac_func in getpwent_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
-+$as_echo_n "checking for getgrent_r declaration... " >&6; }
-+if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
++$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -43648,16 +44329,37 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++#define _LIBREPLACE_REPLACE_H
++#include "$libreplacedir/repdir_getdirentries.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_READDIR_GETDIRENTRIES=yes
++else
++ libreplace_cv_READDIR_GETDIRENTRIES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -43665,8 +44367,11 @@
-#endif
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
++$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++fi
++if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43681,18 +44386,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #include <unistd.h>
-+ #include <grp.h>
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+int i = (int)getgrent_r
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -43715,20 +44418,19 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_getgrent_r_decl=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_have_getgrent_r_decl=no
- fi
--
+-fi
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
++ libreplace_cv_READDIR_NEEDED=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43737,28 +44439,33 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++ ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5
-+$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
++#define HAVE_GETDENTS 1
+ _ACEOF
--fi
--done
-+$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
+ fi
+ done
-+ fi
-
+-
-for ac_func in getdents64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
-+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
++$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -43766,6 +44473,13 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
@@ -43776,24 +44490,33 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ $ac_includes_default
++#define _LIBREPLACE_REPLACE_H
++#error _donot_use_getdents_replacement_anymore
++#include "$libreplacedir/repdir_getdents.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_READDIR_GETDENTS=yes
++else
++ libreplace_cv_READDIR_GETDENTS=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ #include <unistd.h>
-+ #include <grp.h>
-+
-+ struct group *getgrent_r(struct group *src, char *buf, int buflen)
-+ {
-#undef $ac_func
-+ #ifndef HAVE_GETGRENT_R_DECL
-+ #error missing getgrent_r prototype
-+ #endif
-+ return NULL;
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
++$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
++fi
++if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43808,7 +44531,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ }
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-int
-main ()
@@ -43817,7 +44540,7 @@
- ;
- return 0;
-}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -43840,21 +44563,30 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
--fi
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
++
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
++ libreplace_cv_READDIR_NEEDED=no
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
++$as_echo_n "checking a usable readdir()... " >&6; }
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
++$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43863,33 +44595,35 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++###############################################
++# test for where we get crypt() from
++for ac_header in crypt.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
++if test "x$ac_cv_header_crypt_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++#define HAVE_CRYPT_H 1
+ _ACEOF
fi
-done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
+-
+-
+-
++done
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-
-
-+fi
-
-for ac_func in setenv strcasecmp fcvt fcvtl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
-+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
++$as_echo_n "checking for library containing crypt... " >&6; }
++if test "${ac_cv_search_ext_crypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -43897,36 +44631,34 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ $ac_includes_default
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ #include <unistd.h>
-+ #include <grp.h>
-#undef $ac_func
-+ struct group *getgrent_r(struct group *src, char *buf, size_t buflen)
-+ {
++ac_func_search_ext_save_LIBS=$LIBS
++ac_cv_search_ext_crypt=no
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -41678,102 +11136,25 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -43934,20 +44666,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETGRENT_R_DECL
-+ #error missing getgrent_r prototype
-+ #endif
-+ return NULL;
-+
-+ }
-
--int
--main ()
--{
+-
++char crypt ();
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
++return crypt ();
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -43971,24 +44699,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=yes
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no
-+
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -43996,61 +44717,18 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
-+
-+
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+# locale
-+for ac_header in ctype.h locale.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+# glob
-+for ac_header in fnmatch.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default"
-+if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_FNMATCH_H 1
- _ACEOF
-
+-_ACEOF
+-
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_ext_crypt="none required"
fi
-+
- done
-
-
-+# shmem
-+for ac_header in sys/ipc.h sys/mman.h sys/shm.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
+-done
+-
+-
+-
+-
-for ac_func in syslog vsyslog timegm
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44061,58 +44739,36 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+done
-+
-+
-+# terminal
-+for ac_header in termios.h termio.h sys/termio.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_ext_crypt" = no; then
++ for ac_lib in crypt; do
++ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_LIBS"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-+
-+done
-+
-+
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+save_LIBS="$LIBS"
-+LIBS=""
-
+-
-#undef $ac_func
-+libreplace_cv_dlfcn=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-+$as_echo_n "checking for library containing dlopen... " >&6; }
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41781,101 +10437,85 @@
+@@ -41781,1209 +11162,653 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44124,12 +44780,12 @@
-choke me
-#endif
-
-+char dlopen ();
++char crypt ();
int
main ()
{
-return $ac_func ();
-+return dlopen ();
++return crypt ();
;
return 0;
}
@@ -44156,53 +44812,33 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+for ac_lib in '' dl; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_dlopen=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_dlopen+set}" = set; then :
-+ break
-+fi
-+done
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_search_dlopen=no
+-
+- eval "$as_ac_var=no"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_ext_crypt="-l$ac_lib"
++break
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ done
+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
++LIBS=$ac_func_search_ext_save_LIBS
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-+$as_echo "$ac_cv_search_dlopen" >&6; }
-+ac_res=$ac_cv_search_dlopen
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
++$as_echo "$ac_cv_search_ext_crypt" >&6; }
++if test "$ac_cv_search_ext_crypt" != no; then :
++ test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS"
-- eval "$as_ac_var=no"
- fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+
-+for ac_header in dlfcn.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
-+_ACEOF
-+
++else
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -44212,9 +44848,8 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
-+done
+
-+for ac_func in dlopen dlsym dlerror dlclose
++for ac_func in syslog printf memset memcpy
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -44225,55 +44860,52 @@
_ACEOF
+else
-+ libreplace_cv_dlfcn=yes
++ as_fn_error "Required function not found" "$LINENO" 5
fi
done
--
++echo "LIBREPLACE_BROKEN_CHECKS: END"
+
-for ac_func in setlocale nl_langinfo
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+libreplace_cv_shl=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
-+$as_echo_n "checking for library containing shl_load... " >&6; }
-+if test "${ac_cv_search_shl_load+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++echo "LIBREPLACE_NETWORK_CHECKS: START"
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
++$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -41883,1000 +10523,611 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -44281,16 +44913,24 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char shl_load ();
- int
- main ()
- {
++LIBREPLACE_NETWORK_OBJS=""
++LIBREPLACE_NETWORK_LIBS=""
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return shl_load ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -44314,37 +44954,9 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+for ac_lib in '' sl; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_shl_load=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_shl_load+set}" = set; then :
-+ break
-+fi
-+done
-+if test "${ac_cv_search_shl_load+set}" = set; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_search_shl_load=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5
-+$as_echo "$ac_cv_search_shl_load" >&6; }
-+ac_res=$ac_cv_search_shl_load
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- eval "$as_ac_var=no"
fi
@@ -44352,15 +44964,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+for ac_header in dl.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dl_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DL_H 1
-+_ACEOF
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44368,24 +44972,31 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+done
+
-+for ac_func in shl_load shl_unload shl_findsym
++for ac_header in netinet/in_systm.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
++if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_NETINET_IN_SYSTM_H 1
_ACEOF
-+else
-+ libreplace_cv_shl=yes
fi
++
done
++for ac_header in netinet/ip.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
++ #include <sys/types.h>
++ #ifdef HAVE_NETINET_IN_H
++ #include <netinet/in.h>
++ #endif
++ #ifdef HAVE_NETINET_IN_SYSTM_H
++ #include <netinet/in_systm.h>
++ #endif
-for ac_func in nanosleep
-do
@@ -44393,18 +45004,18 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
-+$as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; }
-+if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++"
++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETINET_IP_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -44413,18 +45024,25 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ $ac_includes_default
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ #include <dlfcn.h>
++done
-#undef $ac_func
-+ void *dlopen(const char* filename, unsigned int flags)
-+ {
++for ac_header in netinet/tcp.h netinet/in_ip.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -44439,9 +45057,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ return 0;
-+
-+ }
++fi
-int
-main ()
@@ -44450,6 +45066,16 @@
- ;
- return 0;
-}
++done
++
++for ac_header in sys/sockio.h sys/un.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -44473,33 +45099,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
-+ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
-+$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
-+if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
-+
-+
-+$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
-+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44507,48 +45117,66 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++done
++
++for ac_header in sys/uio.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_uio_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++#define HAVE_SYS_UIO_H 1
+ _ACEOF
--else
++fi
++
++done
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5
++$as_echo_n "checking for usable net/if.h... " >&6; }
++if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ $ac_includes_default
++ #if HAVE_SYS_SOCKET_H
++ # include <sys/socket.h>
++ #endif
++ #include <net/if.h>
++ int main(void) {return 0;}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_USABLE_NET_IF_H=yes
+ else
++ libreplace_cv_USABLE_NET_IF_H=no
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+LIBDL="$LIBS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5
++$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
++if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
-ac_check_lib_ext_save_LIBS=$LIBS
-LIBS="-lrt $LIBS $LIBS"
-+LIBS="$save_LIBS"
++$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
-+ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
-+if test "x$ac_cv_func_getpass" = x""yes; then :
-+ libreplace_cv_HAVE_GETPASS=yes
+fi
-+ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
-+if test "x$ac_cv_func_getpassphrase" = x""yes; then :
-+ libreplace_cv_HAVE_GETPASSPHRASE=yes
-+fi
-+if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
- { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
-$as_echo_n "checking for nanosleep in -lrt... " >&6; }
-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
-+$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
-+
-+
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
-+else
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
-+$as_echo_n "checking whether getpass should be replaced... " >&6; }
-+if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
++cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
++$as_echo_n "checking for socklen_t... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -44556,10 +45184,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
@@ -44569,15 +45194,13 @@
-extern "C"
-#endif
-char nanosleep ();
-+#include "confdefs.h"
-+#define NO_CONFIG_H
-+#include "$libreplacedir/getpass.c"
-+
++$ac_includes_default
++#include <sys/socket.h>
int
main ()
{
-return nanosleep ();
-+
++socklen_t foo;
;
return 0;
}
@@ -44606,49 +45229,47 @@
- ac_cv_lib_ext_rt_nanosleep=yes;
- ac_cv_lib_ext_rt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_REPLACE_GETPASS=yes
++ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_REPLACE_GETPASS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CPPFLAGS="$SAVE_CPPFLAGS"
-
+-
- ac_cv_lib_ext_rt_nanosleep=no;
- ac_cv_lib_ext_rt=no
++ eval "ac_cv_type_$cv=no"
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
-+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
-+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
- fi
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_NANOSLEEP 1
-_ACEOF
-
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
++if test "x$ac_cv_type_socklen_t" = x""yes; then :
-LIBS=$ac_check_lib_ext_save_LIBS
-
-if test $ac_cv_lib_ext_rt = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRT 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
-+$as_echo_n "checking whether strptime is available and works... " >&6; }
-+if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKLEN_T 1
+ _ACEOF
- case "$LIBS" in
- *-lrt*)
@@ -44657,38 +45278,17 @@
- LIBS="-lrt $LIBS"
- ;;
- esac
-+ if test "$cross_compiling" = yes; then :
-+ libreplace_cv_STRPTIME_OK="assuming not"
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+-
-+ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME
-+ #include "$libreplacedir/test/strptime.c"
+ fi
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_STRPTIME_OK=yes
-+else
-+ libreplace_cv_STRPTIME_OK=no
fi
+-done
-
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
--done
+-
+-
-
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
-+$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
-+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
-
-+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
-
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
-+fi
-
+-
-for ac_func in mlock munlock mlockall munlockall
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44699,14 +45299,8 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -44726,7 +45320,6 @@
-#else
-# include <assert.h>
-#endif
-+done
-#undef $ac_func
@@ -44743,28 +45336,22 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+#######################################
-+# Check for mkdir mode
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
-+$as_echo_n "checking whether mkdir supports mode... " >&6; }
-+if test "${libreplace_cv_mkdir_has_mode+set}" = set; then :
++cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
++$as_echo_n "checking for sa_family_t... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+ #include <stdio.h>
-+ #ifdef HAVE_DIRECT_H
-+ #include <direct.h>
-+ #endif
++$ac_includes_default
++#include <sys/socket.h>
int
main ()
{
-return $ac_func ();
-+
-+ mkdir("foo",0777);
-+ return 0;
-+
++sa_family_t foo;
;
return 0;
}
@@ -44792,24 +45379,31 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_mkdir_has_mode="yes"
++ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ libreplace_cv_mkdir_has_mode="no"
++ eval "ac_cv_type_$cv=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_mkdir_has_mode" >&5
-+$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
++if test "x$ac_cv_type_sa_family_t" = x""yes; then :
+
-+if test "$libreplace_cv_mkdir_has_mode" = "yes"
-+then
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SA_FAMILY_T 1
++_ACEOF
+
-+$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
+- eval "$as_ac_var=no"
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -44821,33 +45415,29 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+
-+for ac_func in timegm
-+do :
-+ ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
-+if test "x$ac_cv_func_timegm" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_TIMEGM 1
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
_ACEOF
-+else
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
fi
- done
+-done
+
-
--
-for ac_func in memalign posix_memalign hstrerror
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
-+$as_echo_n "checking for broken readdir... " >&6; }
-+if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
++cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
++$as_echo_n "checking for struct addrinfo... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -44855,43 +45445,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ if test "$cross_compiling" = yes; then :
-+ libreplace_cv_READDIR_NEEDED="assuming not"
-+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_NEEDED=no
-+else
-+ libreplace_cv_READDIR_NEEDED=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
-+$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -44905,32 +45477,14 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+for ac_func in dirfd
-+do :
-+ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-+if test "x$ac_cv_func_dirfd" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DIRFD 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
-+$as_echo_n "checking for dirfd declaration... " >&6; }
-+if test "${ac_cv_have_dirfd_decl+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <dirent.h>
++$ac_includes_default
++#include <netdb.h>
int
main ()
{
-return $ac_func ();
-+int i = (int)dirfd
++struct addrinfo foo;
;
return 0;
}
@@ -44958,19 +45512,34 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_dirfd_decl=yes
++ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
++if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_ADDRINFO 1
++_ACEOF
++
+
- eval "$as_ac_var=no"
-+ ac_cv_have_dirfd_decl=no
fi
--
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -44979,32 +45548,17 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
-+$as_echo "$ac_cv_have_dirfd_decl" >&6; }
-+ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+
-+$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+#
-+# try to replace with getdirentries() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdirentries
-+do :
-+ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
-+if test "x$ac_cv_func_getdirentries" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETDIRENTRIES 1
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
_ACEOF
fi
- done
+-done
--
+
-for ac_header in sys/mman.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -45012,9 +45566,11 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5
-+$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
-+if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then :
++
++cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
++$as_echo_n "checking for struct sockaddr... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -45032,9 +45588,18 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--$ac_includes_default
++
+ $ac_includes_default
-#include <$ac_header>
--_ACEOF
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr foo;
++ ;
++ return 0;
++}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -45054,18 +45619,28 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
--fi
-+ $ac_includes_default
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ eval "ac_cv_type_$cv=no"
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+ #include <dirent.h>
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45077,7 +45652,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45099,22 +45676,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ long telldir(const DIR *dir)
-+ {
-
+-
- ac_header_preproc=no
-fi
-+ return 0;
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+ }
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -45150,15 +45718,13 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- else
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ 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_cv_c_prototype_long_telldir_const_DIR_pdir_=no
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -45166,18 +45732,16 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
+ _ACEOF
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
-+$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
-+if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
-done
-
+-
-# setbuffer, shmget, shm_open are needed for smbtorture
-+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
-for ac_func in shmget shm_open
@@ -45186,12 +45750,10 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
-+$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
-+if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
++cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
++$as_echo_n "checking for struct sockaddr_storage... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -45204,25 +45766,20 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ $ac_includes_default
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ #include <dirent.h>
-+
-+ int seekdir(DIR *dir, long ofs)
-+ {
-#undef $ac_func
-+ return 0;
++$ac_includes_default
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -45237,15 +45794,18 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ }
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
++struct sockaddr_storage foo;
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -45270,16 +45830,30 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
-+
++ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
++_ACEOF
++
- eval "$as_ac_var=no"
--fi
-+ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -45294,17 +45868,15 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
+ _ACEOF
fi
-done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
-+$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
-+if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
-+$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
-for ac_func in gettext dgettext
-do
@@ -45312,12 +45884,10 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
-+$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
++cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
++$as_echo_n "checking for struct sockaddr_in6... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -45325,49 +45895,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#define _LIBREPLACE_REPLACE_H
-+#include "$libreplacedir/repdir_getdirentries.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_GETDIRENTRIES=yes
-+else
-+ libreplace_cv_READDIR_GETDIRENTRIES=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
-+fi
-+if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
++$ac_includes_default
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -45382,16 +45928,19 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++struct sockaddr_in6 foo;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -45414,19 +45963,35 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_IN6 1
++_ACEOF
++
- eval "$as_ac_var=no"
--fi
-+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
-+ libreplace_cv_READDIR_NEEDED=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -45435,28 +46000,29 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdents
-+do :
-+ ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-+if test "x$ac_cv_func_getdents" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETDENTS 1
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
_ACEOF
fi
- done
+-done
--
+
-# Find a method of generating a stack trace
--
--
--
++if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
+
++"
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
+
++$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
+
-for ac_header in execinfo.h libexc.h libunwind.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -45464,16 +46030,13 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
-+$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
- $as_echo_n "(cached) " >&6
--fi
+- $as_echo_n "(cached) " >&6
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -45482,24 +46045,10 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+
-+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -45519,29 +46068,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_GETDENTS=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_READDIR_GETDENTS=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- ac_header_compiler=no
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
- fi
-+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
++if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45575,17 +46116,19 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++"
++if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
++
++$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
- ac_header_preproc=no
--fi
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
+ fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
-+ libreplace_cv_READDIR_NEEDED=no
+fi
++fi
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -45620,19 +46163,13 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
-+$as_echo_n "checking a usable readdir()... " >&6; }
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
-+$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
++$as_echo_n "checking for sin_len in sock... " >&6; }
++if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -45642,28 +46179,55 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+###############################################
-+# test for where we get crypt() from
-+for ac_header in crypt.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-+if test "x$ac_cv_header_crypt_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_CRYPT_H 1
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++int
++main ()
++{
++
++struct sockaddr_in sock; sock.sin_len = sizeof(sock);
++
++ ;
++ return 0;
++}
_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ libreplace_cv_HAVE_SOCK_SIN_LEN=yes
++
++else
++
++ libreplace_cv_HAVE_SOCK_SIN_LEN=no
fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+-done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
++$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
++if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
-# libexecinfo provides backtrace_symbols on FreeBSD
-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
-$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-+$as_echo_n "checking for library containing crypt... " >&6; }
-+if test "${ac_cv_search_ext_crypt+set}" = set; then :
++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
++
++fi
++
++############################################
++# check for unix domain sockets
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
++$as_echo_n "checking for unix domain sockets... " >&6; }
++if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
@@ -45673,23 +46237,30 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
-+ac_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_crypt=no
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -42885,105 +11136,25 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char backtrace_symbols ();
-+char crypt ();
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++
int
main ()
{
-return backtrace_symbols ();
-+return crypt ();
++
++struct sockaddr_un sunaddr;
++sunaddr.sun_family = AF_UNIX;
++
;
return 0;
}
@@ -45723,58 +46294,82 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_search_backtrace_symbols=$ac_res
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ libreplace_cv_HAVE_UNIXSOCKET=yes
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
+
++ libreplace_cv_HAVE_UNIXSOCKET=no
+
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
- break
--fi
+ fi
-done
-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
- :
-else
- ac_cv_search_backtrace_symbols=no
--fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
++$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
++if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
++
++$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
++
+ fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
--fi
++
++for ac_func in connect
++do :
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
++
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
-$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
-ac_res=$ac_cv_search_backtrace_symbols
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_ext_crypt="none required"
- fi
--
--
++done
++
++if test x"$ac_cv_func_connect" = x"no"; then
+
+-fi
+
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
+
-for ac_func in backtrace_symbols
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
++$as_echo_n "checking for connect in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_ext_crypt" = no; then
-+ for ac_lib in crypt; do
-+ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
@@ -45795,7 +46390,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -42991,1042 +11162,653 @@
+@@ -42991,82 +11816,64 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -45807,12 +46402,12 @@
-choke me
-#endif
-
-+char crypt ();
++char connect ();
int
main ()
{
-return $ac_func ();
-+return crypt ();
++return connect ();
;
return 0;
}
@@ -45839,33 +46434,30 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_s_connect=yes;
++ ac_cv_lib_ext_nsl_s=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_ext_crypt="-l$ac_lib"
-+break
- fi
++ ac_cv_lib_ext_nsl_s_connect=no;
++ ac_cv_lib_ext_nsl_s=no
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+ done
-+fi
-+LIBS=$ac_func_search_ext_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
-+$as_echo "$ac_cv_search_ext_crypt" >&6; }
-+if test "$ac_cv_search_ext_crypt" != no; then :
-+ test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS"
+- eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
++ if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
-+
-+else
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -45874,29 +46466,40 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++LIBS=$ac_check_lib_ext_save_LIBS
+
-+
-+for ac_func in syslog printf memset memcpy
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if test $ac_cv_lib_ext_nsl_s = yes; then :
cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LIBNSL_S 1
_ACEOF
-+else
-+ as_fn_error "Required function not found" "$LINENO" 5
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl_s*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
++
fi
- done
+-done
-{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
-$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
-if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
++$as_echo_n "checking for connect in -lnsl... " >&6; }
++if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -45904,40 +46507,24 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+@@ -43075,93 +11882,65 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char trace_back_stack ();
--int
--main ()
--{
++char connect ();
+ int
+ main ()
+ {
-return trace_back_stack ();
-- ;
-- return 0;
--}
-+
-+echo "LIBREPLACE_NETWORK_CHECKS: START"
-+
-+
-+$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
-+
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
-+
-+for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++return connect ();
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -45961,49 +46548,59 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_exc_trace_back_stack=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_connect=yes;
++ ac_cv_lib_ext_nsl=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_ext_nsl_connect=no;
++ ac_cv_lib_ext_nsl=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- ac_cv_lib_exc_trace_back_stack=no
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
++ if test $ac_cv_lib_ext_nsl_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
-+done
++LIBS=$ac_check_lib_ext_save_LIBS
+
-+for ac_header in netinet/in_systm.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
++if test $ac_cv_lib_ext_nsl = yes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEXC 1
-+#define HAVE_NETINET_IN_SYSTM_H 1
++#define HAVE_LIBNSL 1
_ACEOF
- LIBS="-lexc $LIBS"
--
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
+
fi
-+done
-# check for sysctlbyname for BSD systems
-+for ac_header in netinet/ip.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
-+ #include <sys/types.h>
-+ #ifdef HAVE_NETINET_IN_H
-+ #include <netinet/in.h>
-+ #endif
-+ #ifdef HAVE_NETINET_IN_SYSTM_H
-+ #include <netinet/in_systm.h>
-+ #endif
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
-for ac_func in sysctlbyname
-do
@@ -46011,52 +46608,43 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+"
-+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IP_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-
+-
-#undef $ac_func
-+for ac_header in netinet/tcp.h netinet/in_ip.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -43169,513 +11948,373 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -46064,25 +46652,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
-
--int
--main ()
--{
+-
++char connect ();
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
-+done
-+
-+for ac_header in sys/sockio.h sys/un.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++return connect ();
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -46106,17 +46685,31 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_socket_connect=yes;
++ ac_cv_lib_ext_socket=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_ext_socket_connect=no;
++ ac_cv_lib_ext_socket=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- eval "$as_ac_var=no"
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
++$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
++ if test $ac_cv_lib_ext_socket_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -46124,20 +46717,25 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
++LIBS=$ac_check_lib_ext_save_LIBS
+
-+for ac_header in sys/uio.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_uio_h" = x""yes; then :
++if test $ac_cv_lib_ext_socket = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SYS_UIO_H 1
++#define HAVE_LIBSOCKET 1
_ACEOF
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lsocket*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
++
fi
-+
- done
+-done
-printf "%s" "checking for GPFS GPL libs... "
@@ -46145,60 +46743,35 @@
-LIBS="$LIBS -lgpfs_gpl"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5
-+$as_echo_n "checking for usable net/if.h... " >&6; }
-+if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ $ac_includes_default
-+ #if HAVE_SYS_SOCKET_H
-+ # include <sys/socket.h>
-+ #endif
-+ #include <net/if.h>
-+ int main(void) {return 0;}
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_USABLE_NET_IF_H=yes
-+else
-+ libreplace_cv_USABLE_NET_IF_H=no
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5
-+$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
-+if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
+
-+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
-+$as_echo_n "checking for socklen_t... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
++$as_echo_n "checking for connect in -linet... " >&6; }
++if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <gpfs_gpl.h>
+
-+$ac_includes_default
-+#include <sys/socket.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char connect ();
int
main ()
{
-gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
-+socklen_t foo;
++return connect ();
;
return 0;
}
@@ -46225,31 +46798,26 @@
- $as_test_x conftest$ac_exeext
- }; then
- samba_cv_HAVE_GPFS=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_inet_connect=yes;
++ ac_cv_lib_ext_inet=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "ac_cv_type_$cv=no"
++ ac_cv_lib_ext_inet_connect=no;
++ ac_cv_lib_ext_inet=no
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
-+if test "x$ac_cv_type_socklen_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKLEN_T 1
-+_ACEOF
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- samba_cv_HAVE_GPFS=no
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
++$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
++ if test $ac_cv_lib_ext_inet_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -46257,44 +46825,85 @@
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
+fi
++LIBS=$ac_check_lib_ext_save_LIBS
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GPFS 1
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++if test $ac_cv_lib_ext_inet = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBINET 1
_ACEOF
- default_shared_modules="$default_shared_modules vfs_gpfs"
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-linet*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
++
fi
-LIBS="$save_LIBS"
++ if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
++ test x"$ac_cv_lib_ext_nsl_connect" = x"yes" ||
++ test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
++ test x"$ac_cv_lib_ext_inet_connect" = x"yes"
++ then
-printf "%s" "checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
++
++ fi
++fi
++
++for ac_func in gethostbyname
++do :
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
++fi
++done
+
-+cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
-+$as_echo_n "checking for sa_family_t... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
++$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <gpfs.h>
+
-+$ac_includes_default
-+#include <sys/socket.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
int
main ()
{
-gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
-+sa_family_t foo;
++return gethostbyname ();
;
return 0;
}
@@ -46321,31 +46930,26 @@
- $as_test_x conftest$ac_exeext
- }; then
- samba_cv_HAVE_GPFS=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_s_gethostbyname=yes;
++ ac_cv_lib_ext_nsl_s=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "ac_cv_type_$cv=no"
++ ac_cv_lib_ext_nsl_s_gethostbyname=no;
++ ac_cv_lib_ext_nsl_s=no
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
-+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SA_FAMILY_T 1
-+_ACEOF
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- samba_cv_HAVE_GPFS=no
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -46353,14 +46957,25 @@
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
+fi
++LIBS=$ac_check_lib_ext_save_LIBS
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GPFS 1
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++if test $ac_cv_lib_ext_nsl_s = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL_S 1
_ACEOF
- default_shared_modules="$default_shared_modules vfs_gpfs"
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl_s*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
++
fi
-LIBS="$save_LIBS"
@@ -46375,24 +46990,32 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
+
-+cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
-+$as_echo_n "checking for struct addrinfo... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <isi_version/isi_version.h>
+
-+$ac_includes_default
-+#include <netdb.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
int
main ()
{
-get_isilon_copyright()
-+struct addrinfo foo;
++return gethostbyname ();
;
return 0;
}
@@ -46419,36 +47042,40 @@
- $as_test_x conftest$ac_exeext
- }; then
- samba_cv_HAVE_ONEFS=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_gethostbyname=yes;
++ ac_cv_lib_ext_nsl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_lib_ext_nsl_gethostbyname=no;
++ ac_cv_lib_ext_nsl=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
- samba_cv_HAVE_ONEFS=no
-+ eval "ac_cv_type_$cv=no"
fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-echo $samba_cv_HAVE_ONEFS
-if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
--
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ONEFS 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_ADDRINFO 1
++if test $ac_cv_lib_ext_nsl = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 1
_ACEOF
- default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
@@ -46456,11 +47083,18 @@
- ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
- # Need to also add general libs for oplocks support
- save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
+
++
fi
-LIBS="$save_LIBS"
-+fi
-# Note that all the libunwind symbols in the API are defined to internal
-# platform-specific version, so we must include libunwind.h before checking
@@ -46468,9 +47102,8 @@
-{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
-$as_echo_n "checking for libunwind... " >&6; }
-save_LIBS=$LIBS
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
-+_ACEOF
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
-UNWIND_ARCH="unknown"
-if test x"$UNAME_I" != x"unknown"; then
@@ -46479,7 +47112,7 @@
- UNWIND_ARCH="$UNAME_M"
-elif test x"$UNAME_P" != x"unknown"; then
- UNWIND_ARCH="$UNAME_P"
- fi
+-fi
-case "$UNWIND_ARCH" in
- unknown)
@@ -46503,22 +47136,24 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--#ifdef HAVE_LIBUNWIND_H
--#include <libunwind.h>
--#endif
-+cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
-+$as_echo_n "checking for struct sockaddr... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
++$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
++if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
-+$ac_includes_default
-+#include <sys/socket.h>
+-#ifdef HAVE_LIBUNWIND_H
+-#include <libunwind.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
+ #endif
+-
++char gethostbyname ();
int
main ()
{
@@ -46528,7 +47163,7 @@
- unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
- unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-
-+struct sockaddr foo;
++return gethostbyname ();
;
return 0;
}
@@ -46554,44 +47189,27 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
-+else
-+ eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
-
+-
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR 1
-+_ACEOF
-+
-+
-+fi
-+
-+fi
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBUNWIND 1
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
-
-+fi
-
+-_ACEOF
+-
+-
- # If we have libunwind, test whether we also have libunwind-ptrace
- # which would let us unwind arbitrary processes.
- save_LIBS=$LIBS
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_socket_gethostbyname=yes;
++ ac_cv_lib_ext_socket=yes
++else
++ ac_cv_lib_ext_socket_gethostbyname=no;
++ ac_cv_lib_ext_socket=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
-for ac_header in libunwind-ptrace.h
-do
@@ -46600,18 +47218,13 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
--fi
+- $as_echo_n "(cached) " >&6
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -46620,23 +47233,14 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+
- $ac_includes_default
+-/* end confdefs.h. */
+-$ac_includes_default
-#include <$ac_header>
-+
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+int
-+main ()
-+{
-+struct sockaddr_storage foo;
-+ ;
-+ return 0;
-+}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -46657,29 +47261,18 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-+ eval "ac_cv_type_$cv=no"
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++LIBS=$ac_check_lib_ext_save_LIBS
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -46690,8 +47283,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
++if test $ac_cv_lib_ext_socket = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSOCKET 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -46716,11 +47310,25 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
--fi
--
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lsocket*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
++
++
+ fi
++ if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
++ test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
++ test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
++ then
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -46758,35 +47366,44 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
++ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- fi
+-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
++for ac_func in if_nametoindex
++do :
++ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++#define HAVE_IF_NAMETOINDEX 1
_ACEOF
fi
+-
+ done
--done
-
- { $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
-$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
-if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
++if test x"$ac_cv_func_if_nametoindex" = x"no"; then
+
-+cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
-+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
++$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
++if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -46799,24 +47416,18 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+@@ -43684,3344 +12323,2215 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char _UPT_create ();
-+$ac_includes_default
-+
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
++char if_nametoindex ();
int
main ()
{
-return _UPT_create ();
-+struct sockaddr_in6 foo;
++return if_nametoindex ();
;
return 0;
}
@@ -46843,92 +47454,99 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_unwind_ptrace__UPT_create=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_ipv6_if_nametoindex=yes;
++ ac_cv_lib_ext_ipv6=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_unwind_ptrace__UPT_create=no
-+ eval "ac_cv_type_$cv=no"
++ ac_cv_lib_ext_ipv6_if_nametoindex=no;
++ ac_cv_lib_ext_ipv6=no
fi
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
++$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
++ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_IF_NAMETOINDEX 1
++_ACEOF
+
- LIBUNWIND_PTRACE="-lunwind-ptrace";
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBUNWIND_PTRACE 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_IN6 1
++if test $ac_cv_lib_ext_ipv6 = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBIPV6 1
_ACEOF
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lipv6*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
-else
- LIBUNWIND_PTRACE=""
- fi
+-fi
+fi
++ if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
++ then
- LIBS=$save_LIBS
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
-+_ACEOF
++$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ fi
+fi
++# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
++old_LIBS=$LIBS
++LIBS="${LIBREPLACE_NETWORK_LIBS}"
++libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS -I$libreplacedir"
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- LIBS=$save_LIBS
-+if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
-+
-+$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
++for ac_func in socketpair
++do :
++ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
++if test "x$ac_cv_func_socketpair" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKETPAIR 1
++_ACEOF
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
fi
++done
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
+-
-# To use libunwind-ptrace, we also need to make some ptrace system calls.
-if test x"$LIBUNWIND_PTRACE" != x"" ; then
-+if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
-+
-+$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
-for ac_header in sys/ptrace.h
-do
@@ -46937,13 +47555,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
++$as_echo_n "checking for broken inet_ntoa... " >&6; }
++if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -46952,10 +47573,27 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_REPLACE_INET_NTOA=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++main() { struct in_addr ip; ip.s_addr = 0x12345678;
++if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
++ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
++exit(1);}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -46975,22 +47613,25 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_REPLACE_INET_NTOA=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
++ libreplace_cv_REPLACE_INET_NTOA=no
+fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
-+$as_echo_n "checking for sin_len in sock... " >&6; }
-+if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
++$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -47000,10 +47641,15 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++for ac_func in inet_ntoa
++do :
++ ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
++if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_NTOA 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -47022,32 +47668,32 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ libreplace_cv_REPLACE_INET_NTOA=yes
++fi
++done
- ac_header_preproc=no
--fi
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
++if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
++
++$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
++
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
+ fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+int
-+main ()
-+{
-+
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+
-+ ;
-+ return 0;
-+}
++for ac_func in inet_aton
++do :
++ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
++if test "x$ac_cv_func_inet_aton" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_ATON 1
+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -47085,61 +47731,76 @@
- $as_echo_n "(cached) " >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
-+
-+ libreplace_cv_HAVE_SOCK_SIN_LEN=no
-+
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++for ac_func in inet_ntop
++do :
++ ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
++if test "x$ac_cv_func_inet_ntop" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
-+$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
-+if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
-+
-+$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
++#define HAVE_INET_NTOP 1
+ _ACEOF
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
fi
+-
+ done
--done
-+############################################
-+# check for unix domain sockets
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
-+$as_echo_n "checking for unix domain sockets... " >&6; }
-+if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
- { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++for ac_func in inet_pton
++do :
++ ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
++if test "x$ac_cv_func_inet_pton" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_PTON 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
++fi
++done
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
++$as_echo_n "checking for getaddrinfo... " >&6; }
++if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if HAVE_SYS_TYPES_H
#include <sys/types.h>
--#endif
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
+ #endif
-#if HAVE_SYS_PTRACE_H
-#include <sys/ptrace.h>
-#endif
-+#include <stdlib.h>
-+#include <stddef.h>
+-
+#include <sys/socket.h>
-+#include <sys/un.h>
-
++#include <netdb.h>
int
main ()
{
@@ -47148,8 +47809,17 @@
- ptrace(PTRACE_ATTACH, me, 0, 0);
- ptrace(PTRACE_DETACH, me, 0, 0);
- return 0;
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
++struct sockaddr sa;
++struct addrinfo *ai = NULL;
++int ret = getaddrinfo(NULL, NULL, NULL, &ai);
++if (ret != 0) {
++ const char *es = gai_strerror(ret);
++}
++freeaddrinfo(ai);
++ret = getnameinfo(&sa, sizeof(sa),
++ NULL, 0,
++ NULL, 0, 0);
++
;
return 0;
@@ -47176,70 +47846,84 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
--
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE_GETADDRINFO=yes
++else
++ libreplace_cv_HAVE_GETADDRINFO=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
++$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
++if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
--
++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_PTRACE 1
-_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_UNIXSOCKET=yes
++$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
+
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- LIBUNWIND_PTRACE=""
-+ libreplace_cv_HAVE_UNIXSOCKET=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
++$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
-+$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
-+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
-+$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
-
-+fi
-
-+for ac_func in connect
++for ac_header in ifaddrs.h
+do :
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
++if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
++#define HAVE_IFADDRS_H 1
+_ACEOF
++
++fi
-+fi
+done
-+if test x"$ac_cv_func_connect" = x"no"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
++"
++if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
++_ACEOF
++$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
++fi
+
+
-for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
-+$as_echo_n "checking for connect in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -47247,8 +47931,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -47263,29 +47946,43 @@
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44034,106 +11816,65 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
+ #endif
-
-+char connect ();
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <ifaddrs.h>
++#include <netdb.h>
int
main ()
{
-return $ac_func ();
-+return connect ();
++
++struct ifaddrs *ifp = NULL;
++int ret = getifaddrs (&ifp);
++freeifaddrs(ifp);
++
;
return 0;
}
@@ -47313,22 +48010,18 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_s_connect=yes;
-+ ac_cv_lib_ext_nsl_s=yes
++ libreplace_cv_HAVE_GETIFADDRS=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_nsl_s_connect=no;
-+ ac_cv_lib_ext_nsl_s=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++ libreplace_cv_HAVE_GETIFADDRS=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -47337,49 +48030,41 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
-+ if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CONNECT 1
- _ACEOF
-
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
-done
-+LIBS=$ac_check_lib_ext_save_LIBS
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL_S 1
-+_ACEOF
++$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl_s*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
++$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
-+fi
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
++fi
-
-for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
-+$as_echo_n "checking for connect in -lnsl... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
++##################
++# look for a method of finding the list of network interfaces
++iface=no;
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
++$as_echo_n "checking for iface getifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -47387,31 +48072,63 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++#define HAVE_IFACE_GETIFADDRS 1
++#define NO_CONFIG_H 1
++#define AUTOCONF_TEST 1
++#define SOCKET_WRAPPER_NOT_REPLACE
++#include "$libreplacedir/replace.c"
++#include "$libreplacedir/inet_ntop.c"
++#include "$libreplacedir/snprintf.c"
++#include "$libreplacedir/getifaddrs.c"
++#define getifaddrs_test main
++#include "$libreplacedir/test/getifaddrs.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
++else
++ libreplace_cv_HAVE_IFACE_GETIFADDRS=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
++ iface=yes;
++$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
+
-#undef $ac_func
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
++fi
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44141,101 +11882,65 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -47419,16 +48136,38 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char connect ();
- int
- main ()
- {
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return connect ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++if test $iface = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
++$as_echo_n "checking for iface AIX... " >&6; }
++if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_IFACE_AIX=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#define HAVE_IFACE_AIX 1
++#define NO_CONFIG_H 1
++#define AUTOCONF_TEST 1
++#undef _XOPEN_SOURCE_EXTENDED
++#define SOCKET_WRAPPER_NOT_REPLACE
++#include "$libreplacedir/replace.c"
++#include "$libreplacedir/inet_ntop.c"
++#include "$libreplacedir/snprintf.c"
++#include "$libreplacedir/getifaddrs.c"
++#define getifaddrs_test main
++#include "$libreplacedir/test/getifaddrs.c"
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -47452,26 +48191,24 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_connect=yes;
-+ ac_cv_lib_ext_nsl=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_IFACE_AIX=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_ext_nsl_connect=no;
-+ ac_cv_lib_ext_nsl=no
++ libreplace_cv_HAVE_IFACE_AIX=no
+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
- eval "$as_ac_var=no"
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
-+ if test $ac_cv_lib_ext_nsl_connect = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
-+_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
++$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
++if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
++ iface=yes;
++$as_echo "#define HAVE_IFACE_AIX 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -47484,31 +48221,55 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_nsl = yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBNSL 1
- _ACEOF
-
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
+-_ACEOF
++fi
+
+
++if test $iface = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
++$as_echo_n "checking for iface ifconf... " >&6; }
++if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_IFACE_IFCONF=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++#define HAVE_IFACE_IFCONF 1
++#define NO_CONFIG_H 1
++#define AUTOCONF_TEST 1
++#define SOCKET_WRAPPER_NOT_REPLACE
++#include "$libreplacedir/replace.c"
++#include "$libreplacedir/inet_ntop.c"
++#include "$libreplacedir/snprintf.c"
++#include "$libreplacedir/getifaddrs.c"
++#define getifaddrs_test main
++#include "$libreplacedir/test/getifaddrs.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_IFACE_IFCONF=yes
++else
++ libreplace_cv_HAVE_IFACE_IFCONF=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-done
-+
-+
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
++$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
++if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
++ iface=yes;
++$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
++fi
++fi
-for ac_func in __getcwd _getcwd
-do
@@ -47516,9 +48277,10 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
++if test $iface = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifreq" >&5
++$as_echo_n "checking for iface ifreq... " >&6; }
++if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -47526,31 +48288,68 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_IFACE_IFREQ=cross
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++#define HAVE_IFACE_IFREQ 1
++#define NO_CONFIG_H 1
++#define AUTOCONF_TEST 1
++#define SOCKET_WRAPPER_NOT_REPLACE
++#include "$libreplacedir/replace.c"
++#include "$libreplacedir/inet_ntop.c"
++#include "$libreplacedir/snprintf.c"
++#include "$libreplacedir/getifaddrs.c"
++#define getifaddrs_test main
++#include "$libreplacedir/test/getifaddrs.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_IFACE_IFREQ=yes
++else
++ libreplace_cv_HAVE_IFACE_IFREQ=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
++$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
++if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
++ iface=yes;
++$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
++
++fi
++fi
+
-#undef $ac_func
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5
++$as_echo_n "checking for ipv6 support... " >&6; }
++if test "${libreplace_cv_HAVE_IPV6+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44243,102 +11948,65 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -47558,13 +48357,31 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char connect ();
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <stdlib.h> /* for NULL */
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netdb.h>
++#include <netinet/in.h>
+
int
main ()
{
-return $ac_func ();
-+return connect ();
++
++struct sockaddr_storage sa_store;
++struct addrinfo *ai = NULL;
++struct in6_addr in6addr;
++int idx = if_nametoindex("iface1");
++int s = socket(AF_INET6, SOCK_STREAM, 0);
++int ret = getaddrinfo(NULL, NULL, NULL, &ai);
++if (ret != 0) {
++ const char *es = gai_strerror(ret);
++}
++freeaddrinfo(ai);
++
;
return 0;
}
@@ -47592,25 +48409,19 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_socket_connect=yes;
-+ ac_cv_lib_ext_socket=yes
++
++ libreplace_cv_HAVE_IPV6=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_ext_socket_connect=no;
-+ ac_cv_lib_ext_socket=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- eval "$as_ac_var=no"
++ libreplace_cv_HAVE_IPV6=no
++
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
-+$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
-+ if test $ac_cv_lib_ext_socket_connect = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
-+_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -47623,30 +48434,24 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6" >&5
++$as_echo "$libreplace_cv_HAVE_IPV6" >&6; }
++if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
+
-+if test $ac_cv_lib_ext_socket = yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBSOCKET 1
- _ACEOF
++$as_echo "#define HAVE_IPV6 1" >>confdefs.h
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lsocket*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
-+
-+
fi
-done
++LIBS=$old_LIBS
++CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
++LIBREPLACEOBJ="${LIBREPLACEOBJ} ${LIBREPLACE_NETWORK_OBJS}"
++echo "LIBREPLACE_NETWORK_CHECKS: END"
-for ac_func in __xstat __fxstat __lxstat
-do
@@ -47654,42 +48459,43 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
-+$as_echo_n "checking for connect in -linet... " >&6; }
-+if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++CPPFLAGS="${SAVE_CPPFLAGS}"
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
+
-#undef $ac_func
++LIBREPLACE_OBJS=""
++for obj in ${LIBREPLACEOBJ}; do
++ LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
++done
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44346,105 +12014,88 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -47697,16 +48503,27 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char connect ();
- int
- main ()
- {
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return connect ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
++
++
++for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -47730,24 +48547,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_inet_connect=yes;
-+ ac_cv_lib_ext_inet=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_inet_connect=no;
-+ ac_cv_lib_ext_inet=no
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -47755,44 +48565,51 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
-+$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
-+ if test $ac_cv_lib_ext_inet_connect = yes; then :
++done
++
++for ac_header in unistd.h grp.h sys/id.h memory.h alloca.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CONNECT 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
++
+ done
-+if test $ac_cv_lib_ext_inet = yes; then :
++for ac_header in limits.h float.h pthread.h libintl.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBINET 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-linet*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
++fi
++done
++for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
+fi
-+ if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
-+ test x"$ac_cv_lib_ext_nsl_connect" = x"yes" ||
-+ test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
-+ test x"$ac_cv_lib_ext_inet_connect" = x"yes"
-+ then
-+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
++done
-+ fi
-+fi
-
-for ac_func in _stat _lstat _fstat __stat __lstat __fstat
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -47803,12 +48620,14 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in gethostbyname
++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 :
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -47822,36 +48641,31 @@
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+if test x"$ac_cv_func_gethostbyname" = x"no"; then
++done
-#undef $ac_func
-+
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
-+
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44452,107 +12103,65 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -47859,16 +48673,25 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char gethostbyname ();
- int
- main ()
- {
++fi
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return gethostbyname ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++done
++
++for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -47892,23 +48715,28 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_s_gethostbyname=yes;
-+ ac_cv_lib_ext_nsl_s=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_nsl_s_gethostbyname=no;
-+ ac_cv_lib_ext_nsl_s=no
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++done
++
++for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -47917,39 +48745,61 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then :
++
++done
++
++for ac_header in sys/sysmacros.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETHOSTBYNAME 1
++#define HAVE_SYS_SYSMACROS_H 1
_ACEOF
fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
++
+ done
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
++for ac_header in sys/syslog.h syslog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL_S 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
++
++fi
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl_s*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
++done
++for ac_header in langinfo.h locale.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+fi
++done
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
++for ac_header in xfs/libxfs.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
++if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_XFS_LIBXFS_H 1
++_ACEOF
++fi
++done
-for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
-do
@@ -47957,58 +48807,69 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_header in netgroup.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
++if test "x$ac_cv_header_netgroup_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETGROUP_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++done
+
-#undef $ac_func
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44560,105 +12169,65 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
--
-+char gethostbyname ();
- int
- main ()
- {
++for ac_header in rpcsvc/yp_prot.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
++#if HAVE_RPC_RPC_H
++#include <rpc/rpc.h>
+ #endif
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return gethostbyname ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++"
++if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_RPCSVC_YP_PROT_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -48032,24 +48893,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_gethostbyname=yes;
-+ ac_cv_lib_ext_nsl=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_nsl_gethostbyname=no;
-+ ac_cv_lib_ext_nsl=no
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48057,81 +48911,101 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
++done
++
++
++## These fail to compile on IRIX so just check for their presence
++for ac_header in sys/mode.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETHOSTBYNAME 1
++#define HAVE_SYS_MODE_H 1
_ACEOF
fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
+
-+if test $ac_cv_lib_ext_nsl = yes; then :
+ done
+
+
++# Look for Darwin headers
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-Iinclude $CPPFLAGS"
++for ac_header in CoreFoundation/CFStringEncodingConverter.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
++#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
+_ACEOF
-+
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
++else
++ for ac_header in CFStringEncodingConverter.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
++_ACEOF
+fi
++done
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
++fi
-
-
-for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
-+$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
-+if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++done
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++CPPFLAGS="$old_CPPFLAGS"
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
++# subdirectory of headers.
++for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
-#undef $ac_func
++fi
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44666,210 +12235,87 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -48139,13 +49013,23 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char gethostbyname ();
++done
+
++
++#
++# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
++# This causes configure to fail to detect it. Check for shadow separately on HPUX.
++#
++case "$host_os" in
++ *hpux*)
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <shadow.h>
int
main ()
{
-return $ac_func ();
-+return gethostbyname ();
++struct spwd testme
;
return 0;
}
@@ -48172,24 +49056,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_socket_gethostbyname=yes;
-+ ac_cv_lib_ext_socket=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_shadow_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_socket_gethostbyname=no;
-+ ac_cv_lib_ext_socket=no
++ ac_cv_header_shadow_h=no
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ if test x"$ac_cv_header_shadow_h" = x"yes"; then
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48197,24 +49079,41 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
++$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
++
++ fi
++ ;;
++esac
++for ac_header in shadow.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
++if test "x$ac_cv_header_shadow_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETHOSTBYNAME 1
++#define HAVE_SHADOW_H 1
_ACEOF
fi
-done
-
-
--
--
--
--
-+LIBS=$ac_check_lib_ext_save_LIBS
++done
+
++for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
++fi
+
++done
+
-for ac_func in getdents __getdents _lseek __lseek _read __read
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -48225,9 +49124,14 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+if test $ac_cv_lib_ext_socket = yes; then :
++for ac_header in syscall.h sys/syscall.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -48240,21 +49144,16 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++fi
-#undef $ac_func
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lsocket*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
++done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48277,7 +49176,15 @@
- ;
- return 0;
-}
--_ACEOF
++for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -48303,21 +49210,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+ if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
-+ test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
-+ test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
-+ then
- eval "$as_ac_var=no"
--fi
-+$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ fi
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48325,25 +49225,37 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++done
+
-+for ac_func in if_nametoindex
++for ac_header in sys/ea.h sys/proplist.h
+do :
-+ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-+if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IF_NAMETOINDEX 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
++
done
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
++for ac_header in sys/cdefs.h glob.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
++fi
++done
-for ac_func in getdirentries _write __write _fork __fork
@@ -48352,22 +49264,27 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
-+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
-+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# For experimental utmp support (lastlog on some BSD-like systems)
++for ac_header in utmp.h utmpx.h lastlog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -48380,13 +49297,14 @@
-#endif
-
-#undef $ac_func
++fi
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -44877,2756 +12323,2216 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -48394,17 +49312,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char if_nametoindex ();
- int
- main ()
- {
++done
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return if_nametoindex ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -48427,23 +49344,36 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_ipv6_if_nametoindex=yes;
-+ ac_cv_lib_ext_ipv6=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_lib_ext_ipv6_if_nametoindex=no;
-+ ac_cv_lib_ext_ipv6=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
+-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:${as_lineno-$LINENO}: checking size of int" >&5
++$as_echo_n "checking size of int... " >&6; }
++if test "${ac_cv_sizeof_int+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++else
++ if test "$ac_cv_type_int" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48452,92 +49382,76 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
-+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
-+ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IF_NAMETOINDEX 1
- _ACEOF
+-_ACEOF
fi
-done
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_ipv6 = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBIPV6 1
-+_ACEOF
+-
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lipv6*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
-+fi
-+ if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
-+ then
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
-+$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
-+ fi
-+fi
-
-+# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
-+old_LIBS=$LIBS
-+LIBS="${LIBREPLACE_NETWORK_LIBS}"
-+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
-
-for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in socketpair
-+do :
-+ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-+if test "x$ac_cv_func_socketpair" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKETPAIR 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
++ if test "$ac_cv_type_long" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
-#undef $ac_func
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
-+$as_echo_n "checking for broken inet_ntoa... " >&6; }
-+if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48552,11 +49466,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_REPLACE_INET_NTOA=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-int
-main ()
@@ -48565,17 +49474,8 @@
- ;
- return 0;
-}
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
-+main() { struct in_addr ip; ip.s_addr = 0x12345678;
-+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
-+ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
-+exit(1);}
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -48599,17 +49499,32 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_REPLACE_INET_NTOA=yes
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
++$as_echo_n "checking size of long long... " >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+
- eval "$as_ac_var=no"
-+ libreplace_cv_REPLACE_INET_NTOA=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++else
++ if test "$ac_cv_type_long_long" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_long_long=0
++ fi
fi
-rm -rf conftest.dSYM
@@ -48623,52 +49538,50 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
-+$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
-+
-+for ac_func in inet_ntoa
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-+if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_INET_NTOA 1
- _ACEOF
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
++$as_echo "$ac_cv_sizeof_long_long" >&6; }
-+else
-+ libreplace_cv_REPLACE_INET_NTOA=yes
- fi
- done
+-fi
+-done
-+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
-
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
-+fi
-
-+for ac_func in inet_aton
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-+if test "x$ac_cv_func_inet_aton" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_ATON 1
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
++$as_echo_n "checking size of short... " >&6; }
++if test "${ac_cv_sizeof_short+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+
++else
++ if test "$ac_cv_type_short" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (short)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
+fi
-+done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
++$as_echo "$ac_cv_sizeof_short" >&6; }
-+for ac_func in inet_ntop
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-+if test "x$ac_cv_func_inet_ntop" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_NTOP 1
-+_ACEOF
+
-for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -48676,20 +49589,11 @@
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
-+fi
-+done
-+
-+
-+for ac_func in inet_pton
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-+if test "x$ac_cv_func_inet_pton" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_PTON 1
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -48697,15 +49601,11 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
-+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
@@ -48714,11 +49614,6 @@
-#endif
-#undef $ac_func
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
-+$as_echo_n "checking for getaddrinfo... " >&6; }
-+if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48733,33 +49628,68 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++if test "${ac_cv_c_const+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <sys/socket.h>
-+#include <netdb.h>
int
main ()
{
-return $ac_func ();
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++ /* Ultrix mips cc rejects this. */
++ typedef int charset[2];
++ const charset cs;
++ /* SunOS 4.1.1 cc rejects this. */
++ char const *const *pcpcc;
++ char **ppc;
++ /* NEC SVR4.0.2 mips cc rejects this. */
++ struct point {int x, y;};
++ static struct point const zero = {0,0};
++ /* AIX XL C 1.02.0.0 rejects this.
++ It does not let you subtract one const X* pointer from another in
++ an arm of an if-expression whose if-part is not a constant
++ expression */
++ const char *g = "string";
++ pcpcc = &g + (g ? g-g : 0);
++ /* HPUX 7.0 cc rejects these. */
++ ++pcpcc;
++ ppc = (char**) pcpcc;
++ pcpcc = (char const *const *) ppc;
++ { /* SCO 3.2v4 cc rejects this. */
++ char *t;
++ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
-+struct sockaddr sa;
-+struct addrinfo *ai = NULL;
-+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
-+if (ret != 0) {
-+ const char *es = gai_strerror(ret);
-+}
-+freeaddrinfo(ai);
-+ret = getnameinfo(&sa, sizeof(sa),
-+ NULL, 0,
-+ NULL, 0, 0);
++ *t++ = 0;
++ if (s) return 0;
++ }
++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
++ int x[] = {25, 17};
++ const int *foo = &x[0];
++ ++foo;
++ }
++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++ typedef const int *iptr;
++ iptr p = 0;
++ ++p;
++ }
++ { /* AIX XL C 1.02.0.0 rejects this saying
++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++ struct s { int j; const int *ap[3]; };
++ struct s *b; b->j = 5;
++ }
++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++ const int foo = 10;
++ if (!foo) return 0;
++ }
++ return !cs[0] && !zero.x;
++#endif
+
-+
;
return 0;
}
@@ -48786,38 +49716,19 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_GETADDRINFO=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_const=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_GETADDRINFO=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
-+$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
-+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+
-+$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-+
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
++ ac_cv_c_const=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48826,34 +49737,62 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+for ac_header in ifaddrs.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IFADDRS_H 1
- _ACEOF
-
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+
- done
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
++if test $ac_cv_c_const = no; then
++$as_echo "#define const /**/" >>confdefs.h
-+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
-+"
-+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-+_ACEOF
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
-+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_inline=$ac_kw
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ test "$ac_cv_c_inline" != no && break
++done
+fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
++case $ac_cv_c_inline in
++ inline | yes) ;;
++ *)
++ 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
-for ac_func in pread _pread __pread pread64 _pread64 __pread64
-do
@@ -48861,9 +49800,9 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
-+$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
-+if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -48871,25 +49810,69 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_cv_c_bigendian=unknown
++ # See if we're dealing with a universal compiler.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++#ifndef __APPLE_CC__
++ not a universal capable compiler
++ #endif
++ typedef int dummy;
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ # Check for potential -arch flags. It is not universal unless
++ # there are at least two -arch flags with different values.
++ ac_arch=
++ ac_prev=
++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++ if test -n "$ac_prev"; then
++ case $ac_word in
++ i?86 | x86_64 | ppc | ppc64)
++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++ ac_arch=$ac_word
++ else
++ ac_cv_c_bigendian=universal
++ break
++ fi
++ ;;
++ esac
++ ac_prev=
++ elif test "x$ac_word" = "x-arch"; then
++ ac_prev=arch
++ fi
++ done
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if sys/param.h defines the BYTE_ORDER macro.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++ #include <sys/param.h>
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++int
++main ()
++{
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++ && LITTLE_ENDIAN)
++ bogus endian macros
++ #endif
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48903,26 +49886,26 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
+-#endif
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ # It does; now see whether it defined to BIG_ENDIAN or not.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
- #endif
--
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <ifaddrs.h>
-+#include <netdb.h>
++ #include <sys/param.h>
+
int
main ()
{
-return $ac_func ();
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++ #endif
+
-+struct ifaddrs *ifp = NULL;
-+int ret = getifaddrs (&ifp);
-+freeifaddrs(ifp);
-+
;
return 0;
}
@@ -48949,33 +49932,19 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_GETIFADDRS=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_GETIFADDRS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
-+$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
-+if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
-+
-+
-+$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++ ac_cv_c_bigendian=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48986,215 +49955,68 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+
-+##################
-+# look for a method of finding the list of network interfaces
-+iface=no;
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
-+$as_echo_n "checking for iface getifaddrs... " >&6; }
-+if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#define HAVE_IFACE_GETIFADDRS 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
-+else
-+ libreplace_cv_HAVE_IFACE_GETIFADDRS=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
-+$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
-+if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
-+ iface=yes;
-+$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
-+
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
-+fi
-
-
-+if test $iface = no; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
-+$as_echo_n "checking for iface AIX... " >&6; }
-+if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_IFACE_AIX=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-
+-
+-
+-
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
++#include <limits.h>
-+#define HAVE_IFACE_AIX 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#undef _XOPEN_SOURCE_EXTENDED
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_IFACE_AIX=yes
-+else
-+ libreplace_cv_HAVE_IFACE_AIX=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
++int
++main ()
++{
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++ bogus endian macros
++ #endif
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
-+$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
-+if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
-+ iface=yes;
-+$as_echo "#define HAVE_IFACE_AIX 1" >>confdefs.h
-
-+fi
-+fi
-
-
-for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+if test $iface = no; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
-+$as_echo_n "checking for iface ifconf... " >&6; }
-+if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_IFACE_IFCONF=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#define HAVE_IFACE_IFCONF 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"
++ ;
++ return 0;
++}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_IFACE_IFCONF=yes
-+else
-+ libreplace_cv_HAVE_IFACE_IFCONF=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
-+$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
-+if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
-+ iface=yes;
-+$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-+
-+fi
-+fi
-+
-+if test $iface = no; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifreq" >&5
-+$as_echo_n "checking for iface ifreq... " >&6; }
-+if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_IFACE_IFREQ=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++if ac_fn_c_try_compile "$LINENO"; then :
++ # It does; now see whether it defined to _BIG_ENDIAN or not.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#define HAVE_IFACE_IFREQ 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_IFACE_IFREQ=yes
-+else
-+ libreplace_cv_HAVE_IFACE_IFREQ=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
-+$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
-+if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
-+ iface=yes;
-+$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
-+
-+fi
-+fi
-
+-
-#undef $ac_func
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5
-+$as_echo_n "checking for ipv6 support... " >&6; }
-+if test "${libreplace_cv_HAVE_IPV6+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -49208,31 +50030,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <stdlib.h> /* for NULL */
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
++#include <limits.h>
int
main ()
{
-return $ac_func ();
++#ifndef _BIG_ENDIAN
++ not big endian
++ #endif
+
-+struct sockaddr_storage sa_store;
-+struct addrinfo *ai = NULL;
-+struct in6_addr in6addr;
-+int idx = if_nametoindex("iface1");
-+int s = socket(AF_INET6, SOCK_STREAM, 0);
-+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
-+if (ret != 0) {
-+ const char *es = gai_strerror(ret);
-+}
-+freeaddrinfo(ai);
-+
;
return 0;
}
@@ -49259,24 +50066,20 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+ libreplace_cv_HAVE_IPV6=yes
-+
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_IPV6=no
-+
++ ac_cv_c_bigendian=no
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -49288,23 +50091,57 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6" >&5
-+$as_echo "$libreplace_cv_HAVE_IPV6" >&6; }
-+if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-+
-+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # Compile a test program.
++ if test "$cross_compiling" = yes; then :
++ # Try to guess by grepping values from an object file.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++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
++if ac_fn_c_try_compile "$LINENO"; then :
++ 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
fi
-done
-
-+LIBS=$old_LIBS
-+CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
-
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} ${LIBREPLACE_NETWORK_OBJS}"
-
-+echo "LIBREPLACE_NETWORK_CHECKS: END"
-
-
+-
+-
+-
+-
+-
-for ac_func in open64 _open64 __open64 creat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -49312,36 +50149,32 @@
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+CPPFLAGS="${SAVE_CPPFLAGS}"
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+LIBREPLACE_OBJS=""
-+for obj in ${LIBREPLACEOBJ}; do
-+ LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
-+done
-
+-
-#undef $ac_func
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -49355,26 +50188,25 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-
--int
--main ()
--{
+-
++$ac_includes_default
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
+
-+for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long int l;
++ char c[sizeof (long int)];
++ } u;
++ u.l = 1;
++ return u.c[sizeof (long int) - 1] == 1;
++
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49398,17 +50230,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_c_bigendian=no
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
++ ac_cv_c_bigendian=yes
fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49416,23 +50253,24 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_header in unistd.h grp.h sys/id.h memory.h alloca.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
++ fi
fi
-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
++$as_echo "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++ yes)
++ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
++;; #(
++ no)
++ ;; #(
++ universal)
-+done
++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-for ac_func in prctl
-do
@@ -49440,50 +50278,41 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++ ;; #(
++ *)
++ as_fn_error "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ esac
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
++$as_echo_n "checking whether char is unsigned... " >&6; }
++if test "${ac_cv_c_char_unsigned+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in limits.h float.h pthread.h libintl.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-
+-
-#undef $ac_func
-+for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -49497,25 +50326,18 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
-
--int
--main ()
--{
+-
++$ac_includes_default
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
-+done
++static int test_array [1 - 2 * !(((char) -1) < 0)];
++test_array [0] = 0
+
-+for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49539,17 +50361,21 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_char_unsigned=no
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
++ ac_cv_c_char_unsigned=yes
fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49557,52 +50383,46 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
++$as_echo "$ac_cv_c_char_unsigned" >&6; }
++if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
++ $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
fi
-done
-+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-+fi
++#include <sys/types.h>
++#include <signal.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-int i; i = prtcl(0);
-- ;
-- return 0;
--}
--_ACEOF
++return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -49621,40 +50441,26 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+done
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 1
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
--else
+-_ACEOF
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_type_signal=int
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
++ ac_cv_type_signal=void
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-+
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
-+for ac_header in sys/sysmacros.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SYSMACROS_H 1
-+_ACEOF
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-
-#
-#
-#
@@ -49672,14 +50478,8 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/syslog.h syslog.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -49692,7 +50492,6 @@
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- int libc_major = __GLIBC__;
- int libc_minor = __GLIBC_MINOR__;
-+fi
- if (libc_major < 2)
- exit(1);
@@ -49701,16 +50500,15 @@
-#endif
- exit(0);
-}
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
++$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
++if test "${ac_cv_type_uid_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
-+for ac_header in langinfo.h locale.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49735,31 +50533,35 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- linux_getgrouplist_ok=yes
--else
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "uid_t" >/dev/null 2>&1; then :
++ ac_cv_type_uid_t=yes
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-( exit $ac_status )
-linux_getgrouplist_ok=no
++ ac_cv_type_uid_t=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
++rm -f conftest*
++
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
++$as_echo "$ac_cv_type_uid_t" >&6; }
++if test $ac_cv_type_uid_t = no; then
++$as_echo "#define uid_t int" >>confdefs.h
+
- if test x"$linux_getgrouplist_ok" = x"yes"; then
-+done
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETGROUPLIST 1
-+for ac_header in xfs/libxfs.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_XFS_LIBXFS_H 1
- _ACEOF
+-_ACEOF
++$as_echo "#define gid_t int" >>confdefs.h
- fi
- ;;
@@ -49776,36 +50578,33 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+done
-+
-+for ac_header in netgroup.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netgroup_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETGROUP_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
++ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
++if test "x$ac_cv_type_mode_t" = x""yes; then :
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
++else
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
++_ACEOF
-#undef $ac_func
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -49819,12 +50618,9 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+for ac_header in rpcsvc/yp_prot.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
- #endif
+-#endif
++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
++if test "x$ac_cv_type_off_t" = x""yes; then :
-int
-main ()
@@ -49833,11 +50629,7 @@
- ;
- return 0;
-}
-+"
-+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_RPCSVC_YP_PROT_H 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -49860,12 +50652,12 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -49878,17 +50670,10 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SYS_MODE_H 1
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
_ACEOF
fi
@@ -49896,35 +50681,34 @@
- ;;
-esac
-+done
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
-#
-# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
-#
++else
-if test x$ac_cv_func_stat64 = xno ; then
- { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
-$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+for ac_header in CoreFoundation/CFStringEncodingConverter.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
++fi
++
++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
++if test "x$ac_cv_type_pid_t" = x""yes; then :
-int
-main ()
@@ -49959,18 +50743,11 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ for ac_header in CFStringEncodingConverter.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
+
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
+_ACEOF
-+
-+fi
-+done
-
fi
-rm -rf conftest.dSYM
@@ -49979,25 +50756,19 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
-$as_echo "$ac_cv_func_stat64" >&6; }
- if test x$ac_cv_func_stat64 = xyes ; then
-+done
-+
-+CPPFLAGS="$old_CPPFLAGS"
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT64 1
-+# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
-+# subdirectory of headers.
-+for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_RDEV 1
_ACEOF
- fi
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++
fi
-if test x$ac_cv_func_lstat64 = xno ; then
@@ -50008,28 +50779,27 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
++$as_echo_n "checking for d_off in dirent... " >&6; }
++if test "${ac_cv_dirent_d_off+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
+ #include <unistd.h>
-#endif
-#include <sys/stat.h>
-
-+#
-+# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-+# This causes configure to fail to detect it. Check for shadow separately on HPUX.
-+#
-+case "$host_os" in
-+ *hpux*)
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <shadow.h>
+-
++#include <sys/types.h>
++#include <dirent.h>
int
main ()
{
-struct stat64 st64; exit(lstat64(".",&st64));
-+struct spwd testme
++struct dirent d; d.d_off;
;
return 0;
}
@@ -50057,17 +50827,22 @@
- }; then
- ac_cv_func_lstat64=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_shadow_h=yes
++ ac_cv_dirent_d_off=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ ac_cv_header_shadow_h=no
- fi
++ ac_cv_dirent_d_off=no
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ if test x"$ac_cv_header_shadow_h" = x"yes"; then
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_off" >&5
++$as_echo "$ac_cv_dirent_d_off" >&6; }
++if test $ac_cv_dirent_d_off = yes; then
++$as_echo "#define HAVE_DIRENT_D_OFF 1" >>confdefs.h
+
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -50076,37 +50851,34 @@
- if test x$ac_cv_func_lstat64 = xyes ; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LSTAT64 Whether lstat64() is available
-+$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
-+
-+ fi
-+ ;;
-+esac
-+for ac_header in shadow.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
-+if test "x$ac_cv_header_shadow_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SHADOW_H 1
- _ACEOF
+-_ACEOF
++ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
++if test "x$ac_cv_type_ssize_t" = x""yes; then :
- fi
- fi
+-fi
++else
-if test x$ac_cv_func_fstat64 = xno ; then
- { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
-$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define ssize_t int
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
-+done
++fi
++
++ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
++if test "x$ac_cv_type_wchar_t" = x""yes; then :
-int
-main ()
@@ -50115,15 +50887,7 @@
- ;
- return 0;
-}
-+for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -50146,11 +50910,14 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_fstat64=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++cat >>confdefs.h <<_ACEOF
++#define wchar_t unsigned short
++_ACEOF
+
fi
-rm -rf conftest.dSYM
@@ -50159,34 +50926,35 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
-$as_echo "$ac_cv_func_fstat64" >&6; }
- if test x$ac_cv_func_fstat64 = xyes ; then
-+done
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSTAT64 1
-+for ac_header in syscall.h sys/syscall.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
++############################################
++# for cups support we need libcups, and a handful of header files
- fi
++# Check whether --enable-cups was given.
++if test "${enable_cups+set}" = set; then :
++ enableval=$enable_cups;
fi
-#################################################
-# Check whether struct stat has timestamps with sub-second resolution.
-#
-+done
-samba_cv_stat_hires=no
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test x$enable_cups != xno; then
++ # Extract the first word of "cups-config", so it can be a program name with args.
++set dummy cups-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -50226,18 +50994,29 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ case $CUPS_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -50251,26 +51030,14 @@
- ;
- return 0;
-}
-+
-+fi
-+
-+done
-+
-+for ac_header in sys/ea.h sys/proplist.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -50284,41 +51051,40 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
--else
++fi
++CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
++if test -n "$CUPS_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5
++$as_echo "$CUPS_CONFIG" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_member_struct_stat_st_mtim_tv_nsec=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-+done
-+
-+
-+for ac_header in sys/cdefs.h glob.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+done
++ if test "x$CUPS_CONFIG" != x; then
+
-+
-+# For experimental utmp support (lastlog on some BSD-like systems)
-+for ac_header in utmp.h utmpx.h lastlog.h
++ ac_save_CFLAGS=$CFLAGS
++ ac_save_LDFLAGS=$LDFLAGS
++ ac_save_PRINT_LIBS=$PRINT_LIBS
++ CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
++ LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
++ PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
++ for ac_header in cups/cups.h cups/language.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -50335,18 +51101,8 @@
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
-$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
-+done
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of 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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -50383,21 +51139,10 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimensec=yes
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if test "$ac_cv_type_int" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (int)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_int=0
-+ fi
-+fi
++done
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -50415,15 +51160,7 @@
- ;
- return 0;
-}
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -50443,65 +51180,64 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimensec=yes
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
++ if test x"$ac_cv_header_cups_cups_h" = xyes -a \
++ x"$ac_cv_header_cups_language_h" = xyes; then
- ac_cv_member_struct_stat_st_mtimensec=no
-+else
-+ if test "$ac_cv_type_long" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi
- fi
+-fi
++$as_echo "#define HAVE_CUPS 1" >>confdefs.h
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ samba_cv_HAVE_CUPS=yes
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups-config around but cups-devel not installed" >&5
++$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
++ CFLAGS=$ac_save_CFLAGS
++ LDFLAGS=$ac_save_LDFLAGS
++ PRINT_LIBS=$ac_save_PRINT_LIBS
++ fi
++
++ elif test x"$enable_cups" = x"yes"; then
++ as_fn_error "Cups support required but cups-config not located. Make sure cups-devel related files are installed." "$LINENO" 5
++ fi
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
-+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++# Check whether --enable-iprint was given.
++if test "${enable_iprint+set}" = set; then :
++ enableval=$enable_iprint;
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-+#define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
+-_ACEOF
-# BSD, if defined _POSIX_SOURCE
- samba_cv_stat_hires=yes
--fi
++if test x$enable_iprint != xno; then
++ if test x"$samba_cv_HAVE_CUPS" = xyes; then
++
++$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
++
++ elif test x"$enable_iprint" = x"yes"; then
++ as_fn_error "iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
++ fi
+ fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-+$as_echo_n "checking size of long long... " >&6; }
-+if test "${ac_cv_sizeof_long_long+set}" = set; then :
++############################################
++# check if the compiler will optimize out function calls
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
++$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
++if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -50540,46 +51276,37 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if test "$ac_cv_type_long_long" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_long_long=0
-+ fi
-+fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++
++#include <stdio.h>
+ int
+ main ()
+ {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
-return 0;
-- ;
-- return 0;
--}
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
++ if (0) {
++ this_function_does_not_exist();
++ } else {
++ return 1;
++ }
+
+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -50600,62 +51327,47 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-+$as_echo_n "checking size of short... " >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_link "$LINENO"; then :
++ samba_cv_optimize_out_funcation_calls=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
-
+-
- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
-+else
-+ if test "$ac_cv_type_short" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (short)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_short=0
-+ fi
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ samba_cv_optimize_out_funcation_calls=no
fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-+$as_echo "$ac_cv_sizeof_short" >&6; }
-+
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_optimize_out_funcation_calls" >&5
++$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
++if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
+-_ACEOF
++$as_echo "#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1" >>confdefs.h
-# BSD, if not defined _POSIX_SOURCE
- samba_cv_stat_hires=yes
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
-$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
-if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-+if test "${ac_cv_c_const+set}" = set; then :
++#############################################
++# check for fd passing struct via msg_control
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_control" >&5
++$as_echo_n "checking for fd passing via msg_control... " >&6; }
++if test "${samba_cv_msghdr_msg_control+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -50663,8 +51375,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -50704,63 +51415,29 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
++
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
int
main ()
{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtime_n)
-return 0;
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset cs;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *pcpcc;
-+ char **ppc;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ pcpcc = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
-+ *t++ = 0;
-+ if (s) return 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ if (!foo) return 0;
-+ }
-+ return !cs[0] && !zero.x;
-+#endif
++ struct msghdr msg;
++ union {
++ struct cmsghdr cm;
++ char control[CMSG_SPACE(sizeof(int))];
++ } control_un;
++ msg.msg_control = control_un.control;
++ msg.msg_controllen = sizeof(control_un.control);
+
;
return 0;
@@ -50786,146 +51463,63 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_mtime_n=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_const=yes
++ samba_cv_msghdr_msg_control=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_mtime_n=no
-+ ac_cv_c_const=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ samba_cv_msghdr_msg_control=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
-+
-+$as_echo "#define const /**/" >>confdefs.h
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
-$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_control" >&5
++$as_echo "$samba_cv_msghdr_msg_control" >&6; }
++if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIME_N 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
- _ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
-+done
+-_ACEOF
++$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
-# AIX
- samba_cv_stat_hires=yes
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-+
-+case $ac_cv_c_inline in
-+ inline | yes) ;;
-+ *)
-+ 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 for struct stat.st_umtime" >&5
-$as_echo_n "checking for struct stat.st_umtime... " >&6; }
-if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then :
++#############################################
++# check for fd passing struct via msg_acctrights
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
++$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
++if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ ac_cv_c_bigendian=unknown
-+ # See if we're dealing with a universal compiler.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifndef __APPLE_CC__
-+ not a universal capable compiler
-+ #endif
-+ typedef int dummy;
-+
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ # Check for potential -arch flags. It is not universal unless
-+ # there are at least two -arch flags with different values.
-+ ac_arch=
-+ ac_prev=
-+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+ if test -n "$ac_prev"; then
-+ case $ac_word in
-+ i?86 | x86_64 | ppc | ppc64)
-+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+ ac_arch=$ac_word
-+ else
-+ ac_cv_c_bigendian=universal
-+ break
-+ fi
-+ ;;
-+ esac
-+ ac_prev=
-+ elif test "x$ac_word" = "x-arch"; then
-+ ac_prev=arch
-+ fi
-+ done
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if sys/param.h defines the BYTE_ORDER macro.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <sys/types.h>
-+ #include <sys/param.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (ac_aggr.st_umtime)
-return 0;
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+ && LITTLE_ENDIAN)
-+ bogus endian macros
-+ #endif
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -50948,30 +51542,33 @@
-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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ # It does; now see whether it defined to BIG_ENDIAN or not.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
++
+#include <sys/types.h>
-+ #include <sys/param.h>
-+
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
int
main ()
{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_umtime)
-return 0;
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+ #endif
+
++ struct msghdr msg;
++ int fd;
++ msg.msg_acctrights = (caddr_t) &fd;
++ msg.msg_acctrightslen = sizeof(fd);
++
;
return 0;
}
@@ -50996,74 +51593,81 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_umtime=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_bigendian=yes
++ samba_cv_msghdr_msg_acctrights=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_umtime=no
-+ ac_cv_c_bigendian=no
++ samba_cv_msghdr_msg_acctrights=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_acctrights" >&5
++$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
++if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
++
++$as_echo "#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1" >>confdefs.h
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_umtime" >&5
-$as_echo "$ac_cv_member_struct_stat_st_umtime" >&6; }
-if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then
--
+
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_UMTIME 1
--_ACEOF
--
++for ac_func in dirfd
++do :
++ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
++if test "x$ac_cv_func_dirfd" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DIRFD 1
+ _ACEOF
+
-# Tru64
- samba_cv_stat_hires=yes
--fi
+ fi
++done
+
-
--
-if test x"$samba_cv_stat_hires" = x"yes" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_HIRES_TIMESTAMPS 1
-_ACEOF
-
--fi
--
++if test x"$ac_cv_func_dirfd" = x"yes"; then
++ default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
+ fi
+
-# recent FreeBSD, NetBSD have creation timestamps called birthtime:
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimespec.tv_nsec" >&5
-$as_echo_n "checking for struct stat.st_birthtimespec.tv_nsec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_birthtimespec_tv_nsec+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
++$as_echo_n "checking for struct sigevent type... " >&6; }
++if test "${samba_cv_struct_sigevent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <limits.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (ac_aggr.st_birthtimespec.tv_nsec)
-return 0;
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+ bogus endian macros
-+ #endif
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -51086,29 +51690,29 @@
-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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ # It does; now see whether it defined to _BIG_ENDIAN or not.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-+#include <limits.h>
+
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <signal.h>
int
main ()
{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
-return 0;
-+#ifndef _BIG_ENDIAN
-+ not big endian
-+ #endif
-+
++struct sigevent s;
;
return 0;
}
@@ -51133,76 +51737,76 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_bigendian=yes
++ samba_cv_struct_sigevent=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
-+ ac_cv_c_bigendian=no
++ samba_cv_struct_sigevent=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_sigevent" >&5
++$as_echo "$samba_cv_struct_sigevent" >&6; }
++if test x"$samba_cv_struct_sigevent" = x"yes"; then
++
++$as_echo "#define HAVE_STRUCT_SIGEVENT 1" >>confdefs.h
++
++ ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
++"
++if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
++_ACEOF
++
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
++ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sigval_ptr" "ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" "#include <signal.h>
++"
++if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
--_ACEOF
--
--
--fi
--
++#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
+ _ACEOF
+
+
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
-$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
-if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
++$as_echo_n "checking for struct timespec type... " >&6; }
++if test "${samba_cv_struct_timespec+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ fi
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # Compile a test program.
-+ if test "$cross_compiling" = yes; then :
-+ # Try to guess by grepping values from an object file.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+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 ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (ac_aggr.st_birthtime)
-return 0;
-+return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -51222,52 +51826,42 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_birthtime=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ 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
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+
-+ /* Are we little or big endian? From Harbison&Steele. */
-+ union
-+ {
-+ long int l;
-+ char c[sizeof (long int)];
-+ } u;
-+ u.l = 1;
-+ return u.c[sizeof (long int) - 1] == 1;
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++# include <sys/time.h>
++# else
++# include <time.h>
++# endif
++#endif
++
+ int
+ main ()
+ {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_birthtime)
-return 0;
++struct timespec ts;
;
return 0;
}
@@ -51291,54 +51885,42 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_birthtime=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_c_bigendian=no
++if ac_fn_c_try_compile "$LINENO"; then :
++ samba_cv_struct_timespec=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_birthtime=no
-+ ac_cv_c_bigendian=yes
++ samba_cv_struct_timespec=no
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_timespec" >&5
++$as_echo "$samba_cv_struct_timespec" >&6; }
++if test x"$samba_cv_struct_timespec" = x"yes"; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
-$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
-if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-+$as_echo "$ac_cv_c_bigendian" >&6; }
-+ case $ac_cv_c_bigendian in #(
-+ yes)
-+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-+;; #(
-+ no)
-+ ;; #(
-+ universal)
++$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-_ACEOF
-+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
-+ ;; #(
-+ *)
-+ as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ esac
++fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimensec" >&5
-$as_echo_n "checking for struct stat.st_birthtimensec... " >&6; }
-if test "${ac_cv_member_struct_stat_st_birthtimensec+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
-+$as_echo_n "checking whether char is unsigned... " >&6; }
-+if test "${ac_cv_c_char_unsigned+set}" = set; then :
++# and glibc has setresuid under linux but the function does
++# nothing until kernel 2.1.44! very dumb.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
++$as_echo_n "checking for real setresuid... " >&6; }
++if test "${samba_cv_have_setresuid+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -51346,22 +51928,18 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- $ac_includes_default
- int
- main ()
- {
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (ac_aggr.st_birthtimensec)
-return 0;
-+static int test_array [1 - 2 * !(((char) -1) < 0)];
-+test_array [0] = 0
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -51381,49 +51959,32 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_birthtimensec=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_char_unsigned=no
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_c_char_unsigned=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
-+$as_echo "$ac_cv_c_char_unsigned" >&6; }
-+if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-+ $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++ if test "$cross_compiling" = yes; then :
++ samba_cv_have_setresuid=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-+#include <sys/types.h>
-+#include <signal.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_birthtimensec)
-return 0;
-+return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++#include <errno.h>
++main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -51444,84 +52005,96 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_birthtimensec=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_type_signal=int
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_have_setresuid=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_birthtimensec=no
-+ ac_cv_type_signal=void
++ samba_cv_have_setresuid=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimensec" >&5
-$as_echo "$ac_cv_member_struct_stat_st_birthtimensec" >&6; }
-if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresuid" >&5
++$as_echo "$samba_cv_have_setresuid" >&6; }
++if test x"$samba_cv_have_setresuid" = x"yes"; then
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
-+#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
+-_ACEOF
++$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-+if test "${ac_cv_type_uid_t+set}" = set; then :
++fi
++
++# Do the same check for setresguid...
++#
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresgid" >&5
++$as_echo_n "checking for real setresgid... " >&6; }
++if test "${samba_cv_have_setresgid+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+
++ if test "$cross_compiling" = yes; then :
++ samba_cv_have_setresgid=cross
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <sys/types.h>
-+
++#include <unistd.h>
++#include <errno.h>
++main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "uid_t" >/dev/null 2>&1; then :
-+ ac_cv_type_uid_t=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_have_setresgid=yes
+else
-+ ac_cv_type_uid_t=no
++ samba_cv_have_setresgid=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-+rm -f conftest*
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-+$as_echo "$ac_cv_type_uid_t" >&6; }
-+if test $ac_cv_type_uid_t = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresgid" >&5
++$as_echo "$samba_cv_have_setresgid" >&6; }
++if test x"$samba_cv_have_setresgid" = x"yes"; then
-+$as_echo "#define uid_t int" >>confdefs.h
++$as_echo "#define HAVE_SETRESGID 1" >>confdefs.h
++fi
-{ $as_echo "$as_me:$LINENO: checking whether there is DOS flags support in the stat struct" >&5
-$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
-if test "${samba_cv_stat_dos_flags+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+$as_echo "#define gid_t int" >>confdefs.h
-+
-+fi
-+
-+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-+if test "x$ac_cv_type_mode_t" = x""yes; then :
-+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
++$as_echo_n "checking for working memcmp... " >&6; }
++if test "${ac_cv_func_memcmp_working+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ if test "$cross_compiling" = yes; then :
++ ac_cv_func_memcmp_working=no
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <sys/stat.h>
--int
--main ()
--{
++$ac_includes_default
+ int
+ main ()
+ {
- int a = UF_DOS_ARCHIVE;
- int h = UF_DOS_HIDDEN;
@@ -51529,18 +52102,33 @@
- int s = UF_DOS_SYSTEM;
- int i = UF_DOS_NOINDEX;
- int f = UF_DOS_FLAGS;
-+fi
++ /* Some versions of memcmp are not 8-bit clean. */
++ char c0 = '\100', c1 = '\200', c2 = '\201';
++ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
++ return 1;
++
++ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
++ or more and with at least one buffer not starting on a 4-byte boundary.
++ William Lewis provided this test program. */
++ {
++ char foo[21];
++ char bar[21];
++ int i;
++ for (i = 0; i < 4; i++)
++ {
++ char *a = foo + i;
++ char *b = bar + i;
++ strcpy (a, "--------01111111");
++ strcpy (b, "--------10000000");
++ if (memcmp (a, b, 16) >= 0)
++ return 1;
++ }
++ return 0;
++ }
-- ;
-- return 0;
--}
-+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-+if test "x$ac_cv_type_off_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -51561,63 +52149,51 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_stat_dos_flags=yes
-+
-+fi
-+
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
-+
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_memcmp_working=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- samba_cv_stat_dos_flags=no
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
-+
++ ac_cv_func_memcmp_working=no
fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
-
+-
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
-$as_echo "$samba_cv_stat_dos_flags" >&6; }
-if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
++$as_echo "$ac_cv_func_memcmp_working" >&6; }
++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
++ *" memcmp.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
++ ;;
++esac
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_DOS_FLAGS 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
- _ACEOF
+-_ACEOF
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
- fi
+-fi
-#####################################
-# needed for SRV lookups
++###############################################
++# Readline included by default unless explicitly asked not to
++test "${with_readline+set}" != "set" && with_readline=yes
-{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
-+$as_echo_n "checking for d_off in dirent... " >&6; }
-+if test "${ac_cv_dirent_d_off+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -51625,8 +52201,10 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
++# test for where we get readline() from
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
++$as_echo_n "checking whether to use readline... " >&6; }
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -51635,18 +52213,14 @@
-extern "C"
-#endif
-char dn_expand ();
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <dirent.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return dn_expand ();
-+struct dirent d; d.d_off;
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -51669,267 +52243,98 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_resolv_dn_expand=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_dirent_d_off=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_dirent_d_off=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_off" >&5
-+$as_echo "$ac_cv_dirent_d_off" >&6; }
-+if test $ac_cv_dirent_d_off = yes; then
-+
-+$as_echo "#define HAVE_DIRENT_D_OFF 1" >>confdefs.h
++# Check whether --with-readline was given.
++if test "${with_readline+set}" = set; then :
++ withval=$with_readline; case "$with_readline" in
++ yes)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
- ac_cv_lib_resolv_dn_expand=no
- fi
+-fi
++ for ac_header in readline.h history.h readline/readline.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ssize_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ssize_t int
-+_ACEOF
-+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
+
-+ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
-+if test "x$ac_cv_type_wchar_t" = x""yes; then :
++done
+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define wchar_t unsigned short
++ for ac_header in readline/history.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
++if test "x$ac_cv_header_readline_history_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
++#define HAVE_READLINE_HISTORY_H 1
_ACEOF
- LIBS="-lresolv $LIBS"
-+fi
-+
-+
-+############################################
-+# for cups support we need libcups, and a handful of header files
-
-+# Check whether --enable-cups was given.
-+if test "${enable_cups+set}" = set; then :
-+ enableval=$enable_cups;
+-
fi
++done
++
-{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
-$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
-+if test x$enable_cups != xno; then
-+ # Extract the first word of "cups-config", so it can be a program name with args.
-+set dummy cups-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ case $CUPS_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char _dn_expand ();
--int
--main ()
--{
--return _dn_expand ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+ ;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_resolv__dn_expand=yes
-+fi
-+CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-+if test -n "$CUPS_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5
-+$as_echo "$CUPS_CONFIG" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_resolv__dn_expand=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
-+
-+
-+ if test "x$CUPS_CONFIG" != x; then
-+
-+ ac_save_CFLAGS=$CFLAGS
-+ ac_save_LDFLAGS=$LDFLAGS
-+ ac_save_PRINT_LIBS=$PRINT_LIBS
-+ CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
-+ LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-+ PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
-+ for ac_header in cups/cups.h cups/language.h
++ for ac_header in readline.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
++ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
-- LIBS="-lresolv $LIBS"
-+fi
++_ACEOF
+
-+done
-+
-+ if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-+ x"$ac_cv_header_cups_language_h" = xyes; then
-+
-+$as_echo "#define HAVE_CUPS 1" >>confdefs.h
-+
-+ samba_cv_HAVE_CUPS=yes
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups-config around but cups-devel not installed" >&5
-+$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
-+ CFLAGS=$ac_save_CFLAGS
-+ LDFLAGS=$ac_save_LDFLAGS
-+ PRINT_LIBS=$ac_save_PRINT_LIBS
-+ fi
-
-+ elif test x"$enable_cups" = x"yes"; then
-+ as_fn_error "Cups support required but cups-config not located. Make sure cups-devel related files are installed." "$LINENO" 5
-+ fi
-+fi
-+
-+# Check whether --enable-iprint was given.
-+if test "${enable_iprint+set}" = set; then :
-+ enableval=$enable_iprint;
- fi
-
-
--{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
--$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
-+if test x$enable_iprint != xno; then
-+ if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+
-+$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
-+
-+ elif test x"$enable_iprint" = x"yes"; then
-+ as_fn_error "iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
-+ fi
-+fi
-+
-+############################################
-+# check if the compiler will optimize out function calls
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
-+$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-+if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then :
++ for termlib in ncurses curses termcap terminfo termlib tinfo; do
++ as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
++$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
-- ac_check_lib_save_LIBS=$LIBS
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++LIBS="-l${termlib} $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char __dn_expand ();
-+#include <stdio.h>
+ /* Override any GCC internal prototype to avoid an error.
+@@ -47030,73 +14540,41 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char _dn_expand ();
++char tgetent ();
int
main ()
{
--return __dn_expand ();
-+
-+ if (0) {
-+ this_function_does_not_exist();
-+ } else {
-+ return 1;
-+ }
-+
-+
+-return _dn_expand ();
++return tgetent ();
;
return 0;
}
@@ -51955,282 +52360,74 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_resolv___dn_expand=yes
+- ac_cv_lib_resolv__dn_expand=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_optimize_out_funcation_calls=yes
++ eval "$as_ac_Lib=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_resolv___dn_expand=no
-+ samba_cv_optimize_out_funcation_calls=no
+- ac_cv_lib_resolv__dn_expand=no
++ eval "$as_ac_Lib=no"
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_optimize_out_funcation_calls" >&5
-+$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
-+if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
-
+-
- LIBS="-lresolv $LIBS"
-+$as_echo "#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1" >>confdefs.h
-
- fi
-
-+#############################################
-+# check for fd passing struct via msg_control
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_control" >&5
-+$as_echo_n "checking for fd passing via msg_control... " >&6; }
-+if test "${samba_cv_msghdr_msg_control+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
--#
--# Check for the functions putprpwnam, set_auth_parameters,
--# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
--# Needed for OSF1 and HPUX.
--#
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+int
-+main ()
-+{
-
-+ struct msghdr msg;
-+ union {
-+ struct cmsghdr cm;
-+ char control[CMSG_SPACE(sizeof(int))];
-+ } control_un;
-+ msg.msg_control = control_un.control;
-+ msg.msg_controllen = sizeof(control_un.control);
-
--for ac_func in putprpwnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+ ;
-+ return 0;
-+}
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_msghdr_msg_control=yes
-+else
-+ samba_cv_msghdr_msg_control=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_control" >&5
-+$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-+if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
-
--#undef $ac_func
-+#############################################
-+# check for fd passing struct via msg_acctrights
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
-+$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-+if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
- int
- main ()
- {
--return $ac_func ();
-+
-+ struct msghdr msg;
-+ int fd;
-+ msg.msg_acctrights = (caddr_t) &fd;
-+ msg.msg_acctrightslen = sizeof(fd);
-+
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_msghdr_msg_acctrights=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+ samba_cv_msghdr_msg_acctrights=no
++eval ac_res=\$$as_ac_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Lib
++ if test "x$as_val" = x""yes; then :
++ TERMLIBS="-l${termlib}"; break
fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_acctrights" >&5
-+$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
-+if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
-- # putprpwnam was found in libc or existing $LIBS
-+$as_echo "#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1" >>confdefs.h
-
-+fi
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
-+for ac_func in dirfd
-+do :
-+ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-+if test "x$ac_cv_func_dirfd" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DIRFD 1
- _ACEOF
-
-+fi
-+done
-
-+if test x"$ac_cv_func_dirfd" = x"yes"; then
-+ default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+fi
-
--else
-
-- # putprpwnam was not found, try adding libsecurity
-- case " $LIBS " in
-- *\ -lsecurity\ *)
--
-- # putprpwnam was not found and we already had libsecurity
-- # nothing to do here by default
-- true
--
-- ;;
-- *)
-- # putprpwnam was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
--$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
-+$as_echo_n "checking for struct sigevent type... " >&6; }
-+if test "${samba_cv_struct_sigevent+set}" = set; then :
+-{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
+-$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
++ done
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
++$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
++if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++LIBS="-lreadline $TERMLIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
+ /* Override any GCC internal prototype to avoid an error.
+@@ -47105,99 +14583,106 @@
+ #ifdef __cplusplus
+ extern "C"
#endif
--char putprpwnam ();
-+#include <signal.h>
+-char __dn_expand ();
++char rl_callback_handler_install ();
int
main ()
{
--return putprpwnam ();
-+struct sigevent s;
+-return __dn_expand ();
++return rl_callback_handler_install ();
;
return 0;
}
@@ -52256,374 +52453,29 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_putprpwnam=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_struct_sigevent=yes
+- ac_cv_lib_resolv___dn_expand=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_readline_rl_callback_handler_install=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_security_putprpwnam=no
-+ samba_cv_struct_sigevent=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
--$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
--if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_sigevent" >&5
-+$as_echo "$samba_cv_struct_sigevent" >&6; }
-+if test x"$samba_cv_struct_sigevent" = x"yes"; then
-
-- LIBS="-lsecurity $LIBS"
-+$as_echo "#define HAVE_STRUCT_SIGEVENT 1" >>confdefs.h
-
-+ ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
-+"
-+if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
- _ACEOF
-
-
++ ac_cv_lib_readline_rl_callback_handler_install=no
+fi
-+ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sigval_ptr" "ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" "#include <signal.h>
-+"
-+if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then :
-
--else
--
--
-- # putprpwnam was not found in libsecurity
-- # nothing to do here by default
-- true
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+_ACEOF
-
-
- fi
-
-- ;;
-- esac
--
- fi
--done
--
--
-
--
--for ac_func in putprpwnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
-+$as_echo_n "checking for struct timespec type... " >&6; }
-+if test "${samba_cv_struct_timespec+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+# include <sys/time.h>
-+# else
-+# include <time.h>
-+# endif
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+struct timespec ts;
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_struct_timespec=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ samba_cv_struct_timespec=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_timespec" >&5
-+$as_echo "$samba_cv_struct_timespec" >&6; }
-+if test x"$samba_cv_struct_timespec" = x"yes"; then
-
-- # putprpwnam was found in libc or existing $LIBS
-+$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
-+
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+fi
-
-+# and glibc has setresuid under linux but the function does
-+# nothing until kernel 2.1.44! very dumb.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
-+$as_echo_n "checking for real setresuid... " >&6; }
-+if test "${samba_cv_have_setresuid+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_have_setresuid=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <errno.h>
-+main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
- _ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_have_setresuid=yes
-+else
-+ samba_cv_have_setresuid=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresuid" >&5
-+$as_echo "$samba_cv_have_setresuid" >&6; }
-+if test x"$samba_cv_have_setresuid" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
++$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
++if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
++ TERMLIBS="-lreadline $TERMLIBS"
+
-+$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
++$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
-+fi
-
-+# Do the same check for setresguid...
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresgid" >&5
-+$as_echo_n "checking for real setresgid... " >&6; }
-+if test "${samba_cv_have_setresgid+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-
-- # putprpwnam was not found, try adding libsec
-- case " $LIBS " in
-- *\ -lsec\ *)
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_have_setresgid=cross
+- ac_cv_lib_resolv___dn_expand=no
++ break
+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
-+#include <errno.h>
-+main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_have_setresgid=yes
-+else
-+ samba_cv_have_setresgid=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
-- # putprpwnam was not found and we already had libsec
-- # nothing to do here by default
-- true
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresgid" >&5
-+$as_echo "$samba_cv_have_setresgid" >&6; }
-+if test x"$samba_cv_have_setresgid" = x"yes"; then
-
-- ;;
-- *)
-- # putprpwnam was not found, try adding libsec
-- { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
--$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
-+$as_echo "#define HAVE_SETRESGID 1" >>confdefs.h
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-+$as_echo_n "checking for working memcmp... " >&6; }
-+if test "${ac_cv_func_memcmp_working+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ if test "$cross_compiling" = yes; then :
-+ ac_cv_func_memcmp_working=no
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char putprpwnam ();
-+$ac_includes_default
- int
- main ()
- {
--return putprpwnam ();
-+
-+ /* Some versions of memcmp are not 8-bit clean. */
-+ char c0 = '\100', c1 = '\200', c2 = '\201';
-+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+ return 1;
-+
-+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+ or more and with at least one buffer not starting on a 4-byte boundary.
-+ William Lewis provided this test program. */
-+ {
-+ char foo[21];
-+ char bar[21];
-+ int i;
-+ for (i = 0; i < 4; i++)
-+ {
-+ char *a = foo + i;
-+ char *b = bar + i;
-+ strcpy (a, "--------01111111");
-+ strcpy (b, "--------10000000");
-+ if (memcmp (a, b, 16) >= 0)
-+ return 1;
-+ }
-+ return 0;
-+ }
-+
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_sec_putprpwnam=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_func_memcmp_working=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_sec_putprpwnam=no
-+ ac_cv_func_memcmp_working=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++ TERMLIBS=
fi
-rm -rf conftest.dSYM
@@ -52631,56 +52483,52 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
--$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
--if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-+$as_echo "$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+ *" memcmp.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
-+esac
-
-- LIBS="-lsec $LIBS"
-
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
-+###############################################
-+# Readline included by default unless explicitly asked not to
-+test "${with_readline+set}" != "set" && with_readline=yes
-
-+# test for where we get readline() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
-+$as_echo_n "checking whether to use readline... " >&6; }
-
-+# Check whether --with-readline was given.
-+if test "${with_readline+set}" = set; then :
-+ withval=$with_readline; case "$with_readline" in
-+ yes)
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
++
++done
++
++ ;;
++ no)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ ;;
++ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-
--else
++
++ # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
++ # alternate readline path
++ _ldflags=${LDFLAGS}
++ _cppflags=${CPPFLAGS}
++
++ # Add additional search path
++ LDFLAGS="-L$with_readline/lib $LDFLAGS"
++ CPPFLAGS="-I$with_readline/include $CPPFLAGS"
++
+ for ac_header in readline.h history.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
-+fi
+- LIBS="-lresolv $LIBS"
+-
+ fi
-- # putprpwnam was not found in libsec
-- # nothing to do here by default
-- true
+done
+-#
+-# Check for the functions putprpwnam, set_auth_parameters,
+-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+-# Needed for OSF1 and HPUX.
+-#
+ for ac_header in readline/history.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
@@ -52689,15 +52537,17 @@
+#define HAVE_READLINE_HISTORY_H 1
+_ACEOF
- fi
++fi
++
++done
-- ;;
-- esac
--
--fi
- done
-
+-for ac_func in putprpwnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ for ac_header in readline.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52707,16 +52557,8 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-
--
--
--for ac_func in set_auth_parameters
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ for termlib in ncurses curses termcap terminfo termlib tinfo; do
++
++ for termlib in ncurses curses termcap terminfo termlib; do
+ as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
+$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
@@ -52751,7 +52593,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47634,100 +14540,41 @@
+@@ -47205,100 +14690,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52825,22 +52667,22 @@
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-- # set_auth_parameters was found in libc or existing $LIBS
+- # putprpwnam was found in libc or existing $LIBS
-
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
-_ACEOF
-
-
-
-else
-
-- # set_auth_parameters was not found, try adding libsecurity
+- # putprpwnam was not found, try adding libsecurity
- case " $LIBS " in
- *\ -lsecurity\ *)
-
-- # set_auth_parameters was not found and we already had libsecurity
+- # putprpwnam was not found and we already had libsecurity
- # nothing to do here by default
- true
+eval as_val=\$$as_ac_Lib
@@ -52850,10 +52692,10 @@
- ;;
- *)
-- # set_auth_parameters was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
--$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
+- # putprpwnam was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
+$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
@@ -52872,16 +52714,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47736,111 +14583,149 @@
+@@ -47307,111 +14733,68 @@
#ifdef __cplusplus
extern "C"
#endif
--char set_auth_parameters ();
+-char putprpwnam ();
+char rl_callback_handler_install ();
int
main ()
{
--return set_auth_parameters ();
+-return putprpwnam ();
+return rl_callback_handler_install ();
;
return 0;
@@ -52908,14 +52750,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_set_auth_parameters=yes
+- ac_cv_lib_security_putprpwnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_readline_rl_callback_handler_install=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_security_set_auth_parameters=no
+- ac_cv_lib_security_putprpwnam=no
+ ac_cv_lib_readline_rl_callback_handler_install=no
fi
-
@@ -52926,103 +52768,69 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
-
- LIBS="-lsecurity $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PUTPRPWNAM 1
+-_ACEOF
+-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
-+ TERMLIBS="-lreadline $TERMLIBS"
++ TERMLDFLAGS="-L$with_readline/lib"
++ TERMCPPFLAGS="-I$with_readline/include"
++ CPPFLAGS="-I$with_readline/include $CPPFLAGS"
++ TERMLIBS="-lreadline $TERMLIBS"
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
--_ACEOF
+ break
-+else
-+ TERMLIBS=
+ else
++ TERMLIBS= CPPFLAGS=$_cppflags
+fi
+fi
-+done
-
--else
-+ ;;
-+ no)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-
-+ # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-+ # alternate readline path
-+ _ldflags=${LDFLAGS}
-+ _cppflags=${CPPFLAGS}
-
-- # set_auth_parameters was not found in libsecurity
+- # putprpwnam was not found in libsecurity
- # nothing to do here by default
- true
-+ # Add additional search path
-+ LDFLAGS="-L$with_readline/lib $LDFLAGS"
-+ CPPFLAGS="-I$with_readline/include $CPPFLAGS"
+-
++done
-+ for ac_header in readline.h history.h readline/readline.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+-fi
- fi
-
- ;;
- esac
-+done
-+
-+ for ac_header in readline/history.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
-+if test "x$ac_cv_header_readline_history_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_READLINE_HISTORY_H 1
-+_ACEOF
++ LDFLAGS=$_ldflags
++ ;;
++ esac
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-done
-+done
-+ for ac_header in readline.h readline/readline.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
--for ac_func in set_auth_parameters
+-for ac_func in putprpwnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ for termlib in ncurses curses termcap terminfo termlib; do
-+ as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
-+$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++# The readline API changed slightly from readline3 to readline4, so
++# code will generate warnings on one of them unless we have a few
++# special cases.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
++$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
++if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -53031,7 +52839,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l${termlib} $LIBS"
++LIBS="-lreadline $TERMLIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
@@ -53042,58 +52850,18 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
- #endif
-+char tgetent ();
-+int
-+main ()
-+{
-+return tgetent ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
-+else
-+ eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Lib
-+ if test "x$as_val" = x""yes; then :
-+ TERMLIBS="-l${termlib}"; break
-+fi
-
+-#endif
+-
-#undef $ac_func
-+ done
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
-+$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-+if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lreadline $TERMLIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47848,100 +14733,67 @@
+@@ -47419,100 +14802,54 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53105,12 +52873,12 @@
-choke me
-#endif
-
-+char rl_callback_handler_install ();
++char rl_completion_matches ();
int
main ()
{
-return $ac_func ();
-+return rl_callback_handler_install ();
++return rl_completion_matches ();
;
return 0;
}
@@ -53138,13 +52906,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_readline_rl_callback_handler_install=yes
++ ac_cv_lib_readline_rl_completion_matches=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_lib_readline_rl_callback_handler_install=no
++ ac_cv_lib_readline_rl_completion_matches=no
fi
-
-rm -rf conftest.dSYM
@@ -53164,60 +52932,50 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-+$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
-+ TERMLDFLAGS="-L$with_readline/lib"
-+ TERMCPPFLAGS="-I$with_readline/include"
-+ CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+ TERMLIBS="-lreadline $TERMLIBS"
+-
+- # putprpwnam was found in libc or existing $LIBS
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
++$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
++if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
-- # set_auth_parameters was found in libc or existing $LIBS
-+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
-
-+ break
-+else
-+ TERMLIBS= CPPFLAGS=$_cppflags
-+fi
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
-_ACEOF
++$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
+
+fi
-+done
-
-+ LDFLAGS=$_ldflags
-+ ;;
-+ esac
++# not all readline libs have rl_event_hook or history_list
++ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
++"
++if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
++ ac_have_decl=1
else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ ac_have_decl=0
++fi
-- # set_auth_parameters was not found, try adding libsec
+- # putprpwnam was not found, try adding libsec
- case " $LIBS " in
- *\ -lsec\ *)
-+fi
-
-- # set_auth_parameters was not found and we already had libsec
+-
+- # putprpwnam was not found and we already had libsec
- # nothing to do here by default
- true
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
++_ACEOF
- ;;
- *)
-- # set_auth_parameters was not found, try adding libsec
-- { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
--$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
-+
-+
-+# The readline API changed slightly from readline3 to readline4, so
-+# code will generate warnings on one of them unless we have a few
-+# special cases.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
-+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
+- # putprpwnam was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
+-$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
++$as_echo_n "checking for history_list in -lreadline... " >&6; }
++if test "${ac_cv_lib_readline_history_list+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -53232,17 +52990,17 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47950,113 +14802,55 @@
+@@ -47521,112 +14858,43 @@
#ifdef __cplusplus
extern "C"
#endif
--char set_auth_parameters ();
-+char rl_completion_matches ();
+-char putprpwnam ();
++char history_list ();
int
main ()
{
--return set_auth_parameters ();
-+return rl_completion_matches ();
+-return putprpwnam ();
++return history_list ();
;
return 0;
}
@@ -53268,15 +53026,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_set_auth_parameters=yes
+- ac_cv_lib_sec_putprpwnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_readline_rl_completion_matches=yes
++ ac_cv_lib_readline_history_list=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_sec_set_auth_parameters=no
-+ ac_cv_lib_readline_rl_completion_matches=no
+- ac_cv_lib_sec_putprpwnam=no
++ ac_cv_lib_readline_history_list=no
fi
-
-rm -rf conftest.dSYM
@@ -53286,15 +53044,15 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
-
- LIBS="-lsec $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
-_ACEOF
-
-
@@ -53302,47 +53060,38 @@
-else
-
-
-- # set_auth_parameters was not found in libsec
+- # putprpwnam was not found in libsec
- # nothing to do here by default
- true
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
+-
+-
+-fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5
++$as_echo "$ac_cv_lib_readline_history_list" >&6; }
++if test "x$ac_cv_lib_readline_history_list" = x""yes; then :
-+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
-
- fi
-
- ;;
- esac
++$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
-+# not all readline libs have rl_event_hook or history_list
-+ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
-+"
-+if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
fi
-done
-
+
+
-
-
--# UnixWare 7.x has its getspnam in -lgen
-
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
-+_ACEOF
-
--for ac_func in getspnam
+-for ac_func in set_auth_parameters
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
-+$as_echo_n "checking for history_list in -lreadline... " >&6; }
-+if test "${ac_cv_lib_readline_history_list+set}" = set; then :
++###############################################
++# test for where we get yp_get_default_domain() from
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_get_default_domain" >&5
++$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
++if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -53350,8 +53099,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lreadline $TERMLIBS $LIBS"
++ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
@@ -53373,7 +53121,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48064,100 +14858,42 @@
+@@ -47634,314 +14902,299 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53385,12 +53133,12 @@
-choke me
-#endif
-
-+char history_list ();
++char yp_get_default_domain ();
int
main ()
{
-return $ac_func ();
-+return history_list ();
++return yp_get_default_domain ();
;
return 0;
}
@@ -53417,22 +53165,43 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_readline_history_list=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++for ac_lib in '' nsl; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_yp_get_default_domain=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
++ break
++fi
++done
++if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
+
- eval "$as_ac_var=no"
-+ ac_cv_lib_readline_history_list=no
++else
++ ac_cv_search_yp_get_default_domain=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yp_get_default_domain" >&5
++$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
++ac_res=$ac_cv_search_yp_get_default_domain
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -53441,73 +53210,108 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++for ac_func in yp_get_default_domain
++do :
++ ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
++if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-- # getspnam was found in libc or existing $LIBS
--
--
++#define HAVE_YP_GET_DEFAULT_DOMAIN 1
+ _ACEOF
+
+- # set_auth_parameters was found in libc or existing $LIBS
++fi
++done
+
+
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
--_ACEOF
--
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5
-+$as_echo "$ac_cv_lib_readline_history_list" >&6; }
-+if test "x$ac_cv_lib_readline_history_list" = x""yes; then :
+-#define HAVE_SET_AUTH_PARAMETERS 1
++# Check if we have execl, if not we need to compile smbrun.
++for ac_func in execl
++do :
++ ac_fn_c_check_func "$LINENO" "execl" "ac_cv_func_execl"
++if test "x$ac_cv_func_execl" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_EXECL 1
+ _ACEOF
--else
-+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
++fi
++done
-- # getspnam was not found, try adding libgen
-- case " $LIBS " in
-- *\ -lgen\ *)
++if test x"$ac_cv_func_execl" = x"no"; then
++ EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+fi
-- # getspnam was not found and we already had libgen
+-else
+-
+- # set_auth_parameters was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
++for ac_func in getcwd fchown chmod fchmod mknod mknod64
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+- # set_auth_parameters was not found and we already had libsecurity
- # nothing to do here by default
- true
++fi
++done
- ;;
- *)
-- # getspnam was not found, try adding libgen
-- { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
--$as_echo_n "checking for getspnam in -lgen... " >&6; }
--if test "${ac_cv_lib_gen_getspnam+set}" = set; then
-+###############################################
-+# test for where we get yp_get_default_domain() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_get_default_domain" >&5
-+$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-+if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- # set_auth_parameters was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgen $LIBS"
+-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in strtol
++do :
++ ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
++if test "x$ac_cv_func_strtol" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STRTOL 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -48166,213 +14902,299 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char getspnam ();
-+char yp_get_default_domain ();
- int
- main ()
- {
--return getspnam ();
-+return yp_get_default_domain ();
- ;
- return 0;
- }
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char set_auth_parameters ();
+-int
+-main ()
+-{
+-return set_auth_parameters ();
+- ;
+- return 0;
+-}
++fi
++done
++
++for ac_func in strchr chflags
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -53530,81 +53334,52 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_gen_getspnam=yes
-+for ac_lib in '' nsl; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_yp_get_default_domain=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
-+ break
-+fi
-+done
-+if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
-+
- else
+- ac_cv_lib_security_set_auth_parameters=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_search_yp_get_default_domain=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yp_get_default_domain" >&5
-+$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
-+ac_res=$ac_cv_search_yp_get_default_domain
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- ac_cv_lib_gen_getspnam=no
+- ac_cv_lib_security_set_auth_parameters=no
fi
++done
++
++for ac_func in getrlimit fsync fdatasync setpgid
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+for ac_func in yp_get_default_domain
-+do :
-+ ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
-+if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_YP_GET_DEFAULT_DOMAIN 1
-+_ACEOF
-+
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
--$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
--if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
+done
-- LIBS="-lgen $LIBS"
-
-+# Check if we have execl, if not we need to compile smbrun.
-+for ac_func in execl
+- LIBS="-lsecurity $LIBS"
++for ac_func in setsid glob strpbrk crypt16 getauthuid
+do :
-+ ac_fn_c_check_func "$LINENO" "execl" "ac_cv_func_execl"
-+if test "x$ac_cv_func_execl" = x""yes; then :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXECL 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+fi
+done
-+
-+if test x"$ac_cv_func_execl" = x"no"; then
-+ EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
-+fi
-+
-+for ac_func in getcwd fchown chmod fchmod mknod mknod64
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
++for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53617,19 +53392,21 @@
+fi
+done
-+for ac_func in strtol
++for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+do :
-+ ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-+if test "x$ac_cv_func_strtol" = x""yes; then :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRTOL 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-else
+fi
+done
-+for ac_func in strchr chflags
++for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53639,13 +53416,13 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-- # getspnam was not found in libgen
+- # set_auth_parameters was not found in libsecurity
- # nothing to do here by default
- true
+fi
+done
-+for ac_func in getrlimit fsync fdatasync setpgid
++for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53660,7 +53437,7 @@
- ;;
- esac
-+for ac_func in setsid glob strpbrk crypt16 getauthuid
++for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53673,7 +53450,7 @@
fi
done
-+for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
++for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53686,20 +53463,8 @@
+fi
+done
-+for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-+done
-
--for ac_func in getspnam
+-
+-for ac_func in set_auth_parameters
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -53709,14 +53474,12 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
++for ac_func in getpwent_r
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
++if test "x$ac_cv_func_getpwent_r" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETPWENT_R 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -53724,33 +53487,29 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
++fi
++done
+
+-#undef $ac_func
++for ac_func in getdents64
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
++if test "x$ac_cv_func_getdents64" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDENTS64 1
+_ACEOF
--#undef $ac_func
-+fi
-+done
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -53764,15 +53523,8 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++fi
++done
-int
-main ()
@@ -53781,10 +53533,7 @@
- ;
- return 0;
-}
-+fi
-+done
-+
-+for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
++for ac_func in setenv strcasecmp fcvt fcvtl
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53822,19 +53571,11 @@
- eval "$as_ac_var=no"
fi
+done
-+
-+for ac_func in getpwent_r
-+do :
-+ ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
-+if test "x$ac_cv_func_getpwent_r" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETPWENT_R 1
-+_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -53842,21 +53583,8 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in getdents64
++for ac_func in syslog vsyslog timegm
+do :
-+ ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
-+if test "x$ac_cv_func_getdents64" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETDENTS64 1
-+_ACEOF
-+
-+fi
-+done
-+
-+for ac_func in setenv strcasecmp fcvt fcvtl
-+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
@@ -53865,25 +53593,13 @@
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-- # getspnam was found in libc or existing $LIBS
+- # set_auth_parameters was found in libc or existing $LIBS
+-
+fi
+done
-+for ac_func in syslog vsyslog timegm
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
-+fi
-+done
-+
+-#define HAVE_SET_AUTH_PARAMETERS 1
+for ac_func in setlocale nl_langinfo
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53907,11 +53623,11 @@
else
-- # getspnam was not found, try adding libsecurity
+- # set_auth_parameters was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
+- *\ -lsec\ *)
-- # getspnam was not found and we already had libsecurity
+- # set_auth_parameters was not found and we already had libsec
- # nothing to do here by default
- true
+ac_check_lib_ext_save_LIBS=$LIBS
@@ -53919,10 +53635,10 @@
- ;;
- *)
-- # getspnam was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
--$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_getspnam+set}" = set; then
+- # set_auth_parameters was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
@@ -53931,7 +53647,7 @@
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -53941,16 +53657,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48381,111 +15203,144 @@
+@@ -47950,214 +15203,143 @@
#ifdef __cplusplus
extern "C"
#endif
--char getspnam ();
+-char set_auth_parameters ();
+char nanosleep ();
int
main ()
{
--return getspnam ();
+-return set_auth_parameters ();
+return nanosleep ();
;
return 0;
@@ -53977,44 +53693,56 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_getspnam=yes
+- ac_cv_lib_sec_set_auth_parameters=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_rt_nanosleep=yes;
+ ac_cv_lib_ext_rt=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_sec_set_auth_parameters=no
+ ac_cv_lib_ext_rt_nanosleep=no;
+ ac_cv_lib_ext_rt=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- ac_cv_lib_security_getspnam=no
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
+-
+- LIBS="-lsec $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+ if test $ac_cv_lib_ext_rt_nanosleep = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_NANOSLEEP 1
-+_ACEOF
+ _ACEOF
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
--$as_echo "$ac_cv_lib_security_getspnam" >&6; }
--if test "x$ac_cv_lib_security_getspnam" = x""yes; then
++fi
+LIBS=$ac_check_lib_ext_save_LIBS
-- LIBS="-lsecurity $LIBS"
+if test $ac_cv_lib_ext_rt = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRT 1
+_ACEOF
-+
+
+-else
+-
+-
+- # set_auth_parameters was not found in libsec
+- # nothing to do here by default
+- true
+ case "$LIBS" in
+ *-lrt*)
+ ;;
@@ -54024,12 +53752,14 @@
+ esac
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
-+fi
-+fi
-+done
-+
+ fi
+-
+- ;;
+- esac
+-
+ fi
+ done
+
+for ac_func in mlock munlock mlockall munlockall
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54038,11 +53768,24 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
+fi
+done
-+
+
+-# UnixWare 7.x has its getspnam in -lgen
+-
+-
+-for ac_func in getspnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+for ac_func in memalign posix_memalign hstrerror
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54051,12 +53794,26 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+fi
+done
--else
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+for ac_header in sys/mman.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
@@ -54065,13 +53822,31 @@
+#define HAVE_SYS_MMAN_H 1
+_ACEOF
+-#undef $ac_func
+fi
-- # getspnam was not found in libsecurity
-- # nothing to do here by default
-- true
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+done
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+# setbuffer, shmget, shm_open are needed for smbtorture
+for ac_func in shmget shm_open
+do :
@@ -54081,27 +53856,65 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+- eval "$as_ac_var=no"
fi
+done
-- ;;
-- esac
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+for ac_func in gettext dgettext
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
- fi
- done
+- # getspnam was found in libc or existing $LIBS
++fi
++done
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+# Find a method of generating a stack trace
+for ac_header in execinfo.h libexc.h libunwind.h
+do :
@@ -54111,25 +53924,37 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
+ _ACEOF
+
+fi
+done
--for ac_func in getspnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-else
+-
+- # getspnam was not found, try adding libgen
+- case " $LIBS " in
+- *\ -lgen\ *)
+-
+- # getspnam was not found and we already had libgen
+- # nothing to do here by default
+- true
+-
+- ;;
+- *)
+- # getspnam was not found, try adding libgen
+- { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
+-$as_echo_n "checking for getspnam in -lgen... " >&6; }
+-if test "${ac_cv_lib_gen_getspnam+set}" = set; then
+# libexecinfo provides backtrace_symbols on FreeBSD
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
+$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
+if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgen $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -54137,42 +53962,18 @@
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -48493,100 +15348,66 @@
+@@ -48166,112 +15348,67 @@
#ifdef __cplusplus
extern "C"
#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
+-char getspnam ();
+char backtrace_symbols ();
int
main ()
{
--return $ac_func ();
+-return getspnam ();
+return backtrace_symbols ();
;
return 0;
@@ -54199,12 +54000,12 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_lib_gen_getspnam=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
+- ac_cv_lib_gen_getspnam=no
+for ac_lib in '' execinfo; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -54219,23 +54020,17 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
+ break
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
+-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
-
-- # getspnam was found in libc or existing $LIBS
+- LIBS="-lgen $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
@@ -54247,6 +54042,12 @@
+if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
else
+-
+-
+- # getspnam was not found in libgen
+- # nothing to do here by default
+- true
+-
+ ac_cv_search_backtrace_symbols=no
+fi
+rm conftest.$ac_ext
@@ -54258,11 +54059,10 @@
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- # getspnam was not found, try adding libsec
-- case " $LIBS " in
-- *\ -lsec\ *)
-+fi
-+
+ fi
+
+- ;;
+- esac
+for ac_func in backtrace_symbols
+do :
+ ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
@@ -54271,45 +54071,69 @@
+#define HAVE_BACKTRACE_SYMBOLS 1
+_ACEOF
-- # getspnam was not found and we already had libsec
-- # nothing to do here by default
-- true
-+fi
-+done
+ fi
+ done
-- ;;
-- *)
-- # getspnam was not found, try adding libsec
-- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
--$as_echo_n "checking for getspnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_getspnam+set}" = set; then
+-
+-
+-
+-
+-for ac_func in getspnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trace_back_stack in -lexc" >&5
+$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
+if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
-@@ -48595,213 +15416,230 @@
+ Use char because int might match the return type of a GCC
+@@ -48279,314 +15416,230 @@
#ifdef __cplusplus
extern "C"
#endif
--char getspnam ();
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char trace_back_stack ();
int
main ()
{
--return getspnam ();
+-return $ac_func ();
+return trace_back_stack ();
;
return 0;
@@ -54336,14 +54160,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_getspnam=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_exc_trace_back_stack=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_sec_getspnam=no
+- eval "$as_ac_var=no"
+ ac_cv_lib_exc_trace_back_stack=no
fi
-
@@ -54352,26 +54176,35 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
++LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
--$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
--if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exc_trace_back_stack" >&5
+$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBEXC 1
-+_ACEOF
+ _ACEOF
-- LIBS="-lsec $LIBS"
+- # getspnam was found in libc or existing $LIBS
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_ACEOF
+ LIBS="-lexc $LIBS"
-+
+
+fi
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-else
+# check for sysctlbyname for BSD systems
+for ac_func in sysctlbyname
+do :
@@ -54379,46 +54212,110 @@
+if test "x$ac_cv_func_sysctlbyname" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSCTLBYNAME 1
- _ACEOF
++_ACEOF
+- # getspnam was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
+fi
+done
+- # getspnam was not found and we already had libsecurity
+- # nothing to do here by default
+- true
+- ;;
+- *)
+- # getspnam was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
+-$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_getspnam+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+printf "%s" "checking for GPFS GPL libs... "
+save_LIBS="$LIBS"
+LIBS="$LIBS -lgpfs_gpl"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char getspnam ();
+#include <gpfs_gpl.h>
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return getspnam ();
+gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
-+ ;
-+ return 0;
-+}
-+_ACEOF
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_security_getspnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ samba_cv_HAVE_GPFS=yes
else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_security_getspnam=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ samba_cv_HAVE_GPFS=no
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
+-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+echo $samba_cv_HAVE_GPFS
+if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
+- LIBS="-lsecurity $LIBS"
+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
-- # getspnam was not found in libsec
-- # nothing to do here by default
-- true
--
+ default_shared_modules="$default_shared_modules vfs_gpfs"
+fi
+LIBS="$save_LIBS"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+printf "%s" "checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... "
+save_LIBS="$LIBS"
+LIBS="$LIBS -lgpfs"
@@ -54432,24 +54329,21 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ samba_cv_HAVE_GPFS=yes
+else
+ samba_cv_HAVE_GPFS=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+echo $samba_cv_HAVE_GPFS
+if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-- ;;
-- esac
+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+ default_shared_modules="$default_shared_modules vfs_gpfs"
- fi
--done
++fi
+LIBS="$save_LIBS"
+#############################################
@@ -54470,14 +54364,23 @@
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ samba_cv_HAVE_ONEFS=yes
-+else
+ else
+-
+-
+- # getspnam was not found in libsecurity
+- # nothing to do here by default
+- true
+-
+-
+ samba_cv_HAVE_ONEFS=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+echo $samba_cv_HAVE_ONEFS
+if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
+- ;;
+- esac
+$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
+ default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
@@ -54485,11 +54388,14 @@
+ ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
+ # Need to also add general libs for oplocks support
+ save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
-+fi
+ fi
+-done
+-
+-
+LIBS="$save_LIBS"
--for ac_func in bigcrypt
+-for ac_func in getspnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -54629,12 +54535,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-- # bigcrypt was found in libc or existing $LIBS
+- # getspnam was found in libc or existing $LIBS
+$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-#define HAVE_GETSPNAM 1
+ # If we have libunwind, test whether we also have libunwind-ptrace
+ # which would let us unwind arbitrary processes.
+ save_LIBS=$LIBS
@@ -54652,27 +54558,27 @@
-else
-
-- # bigcrypt was not found, try adding libsecurity
+- # getspnam was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
+- *\ -lsec\ *)
-
-- # bigcrypt was not found and we already had libsecurity
+- # getspnam was not found and we already had libsec
- # nothing to do here by default
- true
-
- ;;
- *)
-- # bigcrypt was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
--$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
+- # getspnam was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
+-$as_echo_n "checking for getspnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_getspnam+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
+$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
+if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -54683,16 +54589,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48810,754 +15648,641 @@
+@@ -48595,969 +15648,641 @@
#ifdef __cplusplus
extern "C"
#endif
--char bigcrypt ();
+-char getspnam ();
+char _UPT_create ();
int
main ()
{
--return bigcrypt ();
+-return getspnam ();
+return _UPT_create ();
;
return 0;
@@ -54719,53 +54625,81 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_bigcrypt=yes
+- ac_cv_lib_sec_getspnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_unwind_ptrace__UPT_create=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_sec_getspnam=no
+ ac_cv_lib_unwind_ptrace__UPT_create=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
+-$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
+-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
+-
+- LIBS="-lsec $LIBS"
+-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_ACEOF
+ LIBUNWIND_PTRACE="-lunwind-ptrace";
-+
+
+$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
-- ac_cv_lib_security_bigcrypt=no
-+
-+else
+
+ else
+-
+-
+- # getspnam was not found in libsec
+- # nothing to do here by default
+- true
+-
+-
+ LIBUNWIND_PTRACE=""
fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
+- ;;
+- esac
+-
+-fi
+-done
+
+ LIBS=$save_LIBS
-+
+
+else
-+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ LIBS=$save_LIBS
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
--if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
+
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- LIBS="-lsecurity $LIBS"
+-for ac_func in bigcrypt
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+# To use libunwind-ptrace, we also need to make some ptrace system calls.
+if test x"$LIBUNWIND_PTRACE" != x"" ; then
+ for ac_header in sys/ptrace.h
@@ -54774,63 +54708,171 @@
+if test "x$ac_cv_header_sys_ptrace_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PTRACE_H 1
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+fi
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+done
-+
+
+-#undef $ac_func
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
+$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
-+#endif
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+#if HAVE_SYS_PTRACE_H
+#include <sys/ptrace.h>
-+#endif
+ #endif
+
+ int
+ main ()
+ {
+-return $ac_func ();
+
-+int
-+main ()
-+{
-+
+ pid_t me = (pid_t)-1;
+ ptrace(PTRACE_ATTACH, me, 0, 0);
+ ptrace(PTRACE_DETACH, me, 0, 0);
+ return 0;
+
-+ ;
-+ return 0;
-+}
+ ;
+ return 0;
+ }
_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+- # bigcrypt was found in libc or existing $LIBS
+-
+if ac_fn_c_try_link "$LINENO"; then :
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-+
+
+$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
else
+- # bigcrypt was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ LIBUNWIND_PTRACE=""
-+
+
+- # bigcrypt was not found and we already had libsecurity
+- # nothing to do here by default
+- true
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
-- # bigcrypt was not found in libsecurity
-- # nothing to do here by default
-- true
+- ;;
+- *)
+- # bigcrypt was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
+-$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bigcrypt ();
+-int
+-main ()
+-{
+-return bigcrypt ();
+- ;
+- return 0;
+-}
++
+for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54839,13 +54881,37 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_security_bigcrypt=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_lib_security_bigcrypt=no
fi
+done
-
-- ;;
-- esac
++
+for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54856,9 +54922,17 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
fi
- done
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
++done
+- LIBS="-lsecurity $LIBS"
+for ac_func in __getcwd _getcwd
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54872,6 +54946,8 @@
+fi
+done
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+for ac_func in __xstat __fxstat __lxstat
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54880,8 +54956,83 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
++fi
++done
+
++for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+-else
++fi
++done
+
++for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+- # bigcrypt was not found in libsecurity
+- # nothing to do here by default
+- true
++fi
++done
+
++for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+ fi
++done
+
+- ;;
+- esac
++for ac_func in getdents __getdents _lseek __lseek _read __read
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+ fi
+ done
+
++for ac_func in getdirentries _write __write _fork __fork
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
++fi
++done
+
+-
-for ac_func in bigcrypt
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54892,10 +55043,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+fi
-+done
-+
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54910,20 +55058,22 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++fi
++done
+
+-#undef $ac_func
++for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54933,10 +55083,6 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
--#undef $ac_func
-+fi
-+done
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -54950,15 +55096,8 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++fi
++done
-int
-main ()
@@ -54967,10 +55106,7 @@
- ;
- return 0;
-}
-+fi
-+done
-+
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++for ac_func in pread _pread __pread pread64 _pread64 __pread64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -55008,21 +55144,11 @@
- eval "$as_ac_var=no"
fi
+done
-+
-+for ac_func in getdirentries _write __write _fork __fork
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -55030,9 +55156,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -55043,25 +55167,13 @@
_ACEOF
- # bigcrypt was found in libc or existing $LIBS
+-
+fi
+done
-+
-+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+fi
-+done
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIGCRYPT 1
-+for ac_func in pread _pread __pread pread64 _pread64 __pread64
++for ac_func in open64 _open64 __open64 creat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -55074,38 +55186,25 @@
+fi
+done
-+for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++for ac_func in prctl
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
++if test "x$ac_cv_func_prctl" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_PRCTL 1
+_ACEOF
-else
-+fi
-+done
-
+-
- # bigcrypt was not found, try adding libsec
- case " $LIBS " in
- *\ -lsec\ *)
-+for ac_func in open64 _open64 __open64 creat64
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++fi
++done
- # bigcrypt was not found and we already had libsec
- # nothing to do here by default
- true
-+fi
-+done
- ;;
- *)
@@ -55119,20 +55218,9 @@
-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in prctl
-+do :
-+ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
-+if test "x$ac_cv_func_prctl" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_PRCTL 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+done
-+
-+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -55194,9 +55282,14 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
-$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
-if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
+-
+- LIBS="-lsec $LIBS"
+-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- LIBS="-lsec $LIBS"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+-_ACEOF
+#
+#
+#
@@ -55211,7 +55304,7 @@
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+#include <unistd.h>
+#include <sys/utsname.h>
+main() {
@@ -55228,12 +55321,7 @@
+ exit(0);
+}
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
- _ACEOF
--
--
--
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ linux_getgrouplist_ok=yes
else
@@ -55577,11 +55665,11 @@
- esac
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
-
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+_ACEOF
-+
+
+# AIX
+ samba_cv_stat_hires=yes
fi
@@ -55706,16 +55794,16 @@
- # getprpwnam was found in libc or existing $LIBS
+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
-
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+_ACEOF
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETPRPWNAM 1
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
-+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
_ACEOF
@@ -55851,9 +55939,9 @@
fi
-done
-
-
-
-
+
-for ac_func in strsignal
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56065,11 +56153,11 @@
+ ac_cv_lib_resolv__dn_expand=yes
else
- ac_cv_search_getproplist=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+ ac_cv_lib_resolv__dn_expand=no
fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
-$as_echo "$ac_cv_search_getproplist" >&6; }
-ac_res=$ac_cv_search_getproplist
@@ -56181,61 +56269,70 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_resolv___dn_expand=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBRESOLV 1
-+_ACEOF
-+
+ _ACEOF
+
+ LIBS="-lresolv $LIBS"
+
-+fi
-+
-+
+ fi
+-done
+
+
+#
+# Check for the functions putprpwnam, set_auth_parameters,
+# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+# Needed for OSF1 and HPUX.
+#
-
-- eval "$as_ac_var=no"
--fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
++
++
+ for ac_func in putprpwnam
+do :
+ ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
+if test "x$ac_cv_func_putprpwnam" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_PUTPRPWNAM 1
- _ACEOF
-
--fi
--done
++_ACEOF
++
+ # putprpwnam was found in libc or existing $LIBS
-
-
++
++
+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
++
++
++
++else
++ # putprpwnam was not found, try adding libsecurity
++ case " $LIBS " in
++ *\ -lsecurity\ *)
++ # putprpwnam was not found and we already had libsecurity
++ # nothing to do here by default
++ true
-for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
-do
@@ -56243,48 +56340,39 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++ ;;
++ *)
++ # putprpwnam was not found, try adding libsecurity
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsecurity" >&5
++$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_putprpwnam+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsecurity $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ # putprpwnam was not found, try adding libsecurity
-+ case " $LIBS " in
-+ *\ -lsecurity\ *)
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ # putprpwnam was not found and we already had libsecurity
-+ # nothing to do here by default
-+ true
-
+-
-#undef $ac_func
-+ ;;
-+ *)
-+ # putprpwnam was not found, try adding libsecurity
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsecurity" >&5
-+$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_putprpwnam+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -56701,9 +56789,9 @@
fi
+done
-
-
-
++
++
++
+ for ac_func in set_auth_parameters
+do :
+ ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
@@ -56711,10 +56799,10 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SET_AUTH_PARAMETERS 1
+_ACEOF
-+
+
+ # set_auth_parameters was found in libc or existing $LIBS
-+
-+
+
+
+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
@@ -57213,18 +57301,8 @@
+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+ # getspnam was not found, try adding libsec
-+ case " $LIBS " in
-+ *\ -lsec\ *)
-+ # getspnam was not found and we already had libsec
-+ # nothing to do here by default
-+ true
-for ac_func in flistxattr removexattr lremovexattr fremovexattr
-do
@@ -57232,39 +57310,48 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ ;;
-+ *)
-+ # getspnam was not found, try adding libsec
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
-+$as_echo_n "checking for getspnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ # getspnam was not found, try adding libsec
++ case " $LIBS " in
++ *\ -lsec\ *)
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++ # getspnam was not found and we already had libsec
++ # nothing to do here by default
++ true
+
-#undef $ac_func
++ ;;
++ *)
++ # getspnam was not found, try adding libsec
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
++$as_echo_n "checking for getspnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsec $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -58205,6 +58292,9 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+for ac_lib in '' proplist; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -58222,28 +58312,24 @@
+fi
+done
+if test "${ac_cv_search_getproplist+set}" = set; then :
-+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
++else
+ ac_cv_search_getproplist=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getproplist" >&5
+$as_echo "$ac_cv_search_getproplist" >&6; }
+ac_res=$ac_cv_search_getproplist
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- eval "$as_ac_var=no"
- fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -58251,6 +58337,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
+ for ac_func in getproplist fgetproplist setproplist fsetproplist
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -60150,10 +60237,12 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52847,67 +18695,34 @@
+@@ -52845,69 +18693,36 @@
+ #endif
+ #include <stdio.h>
#include <sys/stat.h>
- main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
- _ACEOF
+-main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -60176,6 +60265,8 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
++main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
samba_cv_SIZEOF_DEV_T=yes
else
@@ -62132,12 +62223,11 @@
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_UT_UT_TV=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_UT_UT_TV=no
-+else
+ samba_cv_HAVE_UT_UT_TV=no
fi
-
@@ -63956,18 +64046,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56744,80 +20691,49 @@
- extern "C"
- #endif
- char FAMOpen2 ();
--int
--main ()
--{
--return FAMOpen2 ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -56752,119 +20699,61 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -63989,14 +64071,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+int
-+main ()
-+{
-+return FAMOpen2 ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ext_fam_FAMOpen2=yes;
ac_cv_lib_ext_fam=yes
@@ -64053,10 +64127,13 @@
/* end confdefs.h. */
#include <fam.h>
int
-@@ -56828,43 +20744,16 @@
- return 0;
- }
- _ACEOF
+-main ()
+-{
+-FAMCodes code = FAMChanged;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -64078,13 +64155,19 @@
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FAM_H_FAMCODES_TYPEDEF 1
--_ACEOF
--
++main ()
++{
++FAMCodes code = FAMChanged;
++ ;
++ return 0;
++}
+ _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
+-
+$as_echo "#define HAVE_FAM_H_FAMCODES_TYPEDEF 1" >>confdefs.h
fi
@@ -65921,13 +66004,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
- else
+- samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
++if ac_fn_c_try_link "$LINENO"; then :
++ samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
++else
+ samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
fi
-
@@ -67515,14 +67600,10 @@
$as_echo "$with_ldap_support" >&6; }
SMBLDAP=""
-@@ -60205,294 +22429,61 @@
+@@ -60209,290 +22433,57 @@
+ if test x"$with_ldap_support" != x"no"; then
- LDBLDAP=""
-
--
--if test x"$with_ldap_support" != x"no"; then
--
-- ##################################################################
+ ##################################################################
- # first test for ldap.h and lber.h
- # (ldap.h is required for this test)
-
@@ -67760,21 +67841,7 @@
- ;
- return 0;
-}
-+
-+if test x"$with_ldap_support" != x"no"; then
-+
-+ ##################################################################
-+ # first test for ldap.h and lber.h
-+ # (ldap.h is required for this test)
-+ for ac_header in ldap.h lber.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -67797,6 +67864,17 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ # first test for ldap.h and lber.h
++ # (ldap.h is required for this test)
++ for ac_header in ldap.h lber.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
- ac_cv_type_ber_tag_t=yes
fi
@@ -69757,12 +69835,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62693,56 +23816,30 @@
- return copy_Authenticator ();
- ;
+@@ -62695,54 +23818,28 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -69784,8 +69860,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ext_asn1_copy_Authenticator=yes;
ac_cv_lib_ext_asn1=yes
@@ -69851,10 +69925,13 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62794,54 +23884,28 @@
- return 0;
- }
- _ACEOF
+@@ -62791,57 +23881,31 @@
+ {
+ return roken_getaddrinfo_hostspec ();
+ ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -69876,6 +69953,9 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec=yes;
ac_cv_lib_ext_roken=yes
@@ -72090,10 +72170,17 @@
/* end confdefs.h. */
/* Define krb5_crypto_destroy to an innocuous variant, in case <limits.h> declares krb5_crypto_destroy.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65672,43 +25854,18 @@
- return 0;
- }
- _ACEOF
+@@ -65665,50 +25847,25 @@
+ #endif
+
+ int
+-main ()
+-{
+-return krb5_crypto_destroy ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -72115,6 +72202,13 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++main ()
++{
++return krb5_crypto_destroy ();
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_ext_krb5_crypto_destroy=yes
else
@@ -74326,7 +74420,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68298,56 +27543,29 @@
+@@ -68298,116 +27543,62 @@
return 0;
}
_ACEOF
@@ -74390,10 +74484,12 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68357,57 +27575,30 @@
- ;
- return 0;
- }
+ main ()
+ {
+-krb5_keyblock key; key.keyvalue.data = NULL;
+- ;
+- return 0;
+-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -74413,6 +74509,10 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
++krb5_keyblock key; key.keyvalue.data = NULL;
++ ;
++ return 0;
++}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes
@@ -76364,7 +76464,7 @@
$as_echo "no" >&6; }
fi
-@@ -70315,208 +28676,63 @@
+@@ -70315,34 +28676,30 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
@@ -76404,14 +76504,15 @@
+ as_fn_error "not on a linux system!" "$LINENO" 5
;;
esac
-- ;;
-- esac
--else
-- case "$host_os" in
-- *linux*)
+ ;;
+@@ -70350,173 +28707,32 @@
+ else
+ case "$host_os" in
+ *linux*)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
-cat >>confdefs.h <<\_ACEOF
-#define WITH_CIFSMOUNT 1
-_ACEOF
@@ -76562,20 +76663,13 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+ ;;
-+ esac
- else
+-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; }
-+ case "$host_os" in
-+ *linux*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
+$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
+
+ CIFSMOUNT_PROGS="bin/mount.cifs bin/umount.cifs"
@@ -77773,45 +77867,39 @@
-{ $as_echo "$as_me:$LINENO: checking whether to try the new lib/sysquotas.c interface" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try the new lib/sysquotas.c interface" >&5
- $as_echo_n "checking whether to try the new lib/sysquotas.c interface... " >&6; }
-
- # Check whether --with-sys-quotas was given.
+-$as_echo_n "checking whether to try the new lib/sysquotas.c interface... " >&6; }
+-
+-# Check whether --with-sys-quotas was given.
-if test "${with_sys_quotas+set}" = set; then
-+if test "${with_sys_quotas+set}" = set; then :
- withval=$with_sys_quotas; case "$withval" in
- yes)
+- withval=$with_sys_quotas; case "$withval" in
+- yes)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- samba_cv_WITH_SYS_QUOTAS=yes
- samba_cv_TRY_SYS_QUOTAS=yes
- samba_cv_RUN_QUOTA_TESTS=yes
- ;;
- auto)
+-$as_echo "yes" >&6; }
+- samba_cv_WITH_SYS_QUOTAS=yes
+- samba_cv_TRY_SYS_QUOTAS=yes
+- samba_cv_RUN_QUOTA_TESTS=yes
+- ;;
+- auto)
- { $as_echo "$as_me:$LINENO: result: auto" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5
- $as_echo "auto" >&6; }
- samba_cv_WITH_SYS_QUOTAS=auto
- samba_cv_TRY_SYS_QUOTAS=auto
- samba_cv_RUN_QUOTA_TESTS=auto
- ;;
- no)
+-$as_echo "auto" >&6; }
+- samba_cv_WITH_SYS_QUOTAS=auto
+- samba_cv_TRY_SYS_QUOTAS=auto
+- samba_cv_RUN_QUOTA_TESTS=auto
+- ;;
+- no)
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- samba_cv_WITH_SYS_QUOTAS=no
- samba_cv_TRY_SYS_QUOTAS=no
- ;;
- *)
+-$as_echo "no" >&6; }
+- samba_cv_WITH_SYS_QUOTAS=no
+- samba_cv_TRY_SYS_QUOTAS=no
+- ;;
+- *)
- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
- ;;
- esac
-else
- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
- $as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
+-$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
-
-fi
-
@@ -78118,7 +78206,9 @@
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try the new lib/sysquotas.c interface" >&5
++$as_echo_n "checking whether to try the new lib/sysquotas.c interface... " >&6; }
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -78127,7 +78217,16 @@
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
-- ;;
++# Check whether --with-sys-quotas was given.
++if test "${with_sys_quotas+set}" = set; then :
++ withval=$with_sys_quotas; case "$withval" in
++ yes)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ samba_cv_WITH_SYS_QUOTAS=yes
++ samba_cv_TRY_SYS_QUOTAS=yes
++ samba_cv_RUN_QUOTA_TESTS=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;}
@@ -78147,13 +78246,28 @@
-## ---------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
++ auto)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5
++$as_echo "auto" >&6; }
++ samba_cv_WITH_SYS_QUOTAS=auto
++ samba_cv_TRY_SYS_QUOTAS=auto
++ samba_cv_RUN_QUOTA_TESTS=auto
+ ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
++ no)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ samba_cv_WITH_SYS_QUOTAS=no
++ samba_cv_TRY_SYS_QUOTAS=no
+ ;;
++ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
++$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
++ ;;
+ esac
else
- eval "$as_ac_Header=\$ac_header_preproc"
@@ -78895,7 +79009,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_3 1
-@@ -72738,42 +29687,15 @@
+@@ -72738,473 +29687,46 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78930,42 +79044,41 @@
-
-( exit $ac_status )
-samba_cv_HAVE_QUOTACTL_3=no
-+ samba_cv_HAVE_QUOTACTL_3=no
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-fi
-
- CFLAGS="$old_CFLAGS";
- old_CFLAGS="";
- export CFLAGS;
-@@ -72785,15 +29707,13 @@
- export LDFLAGS;
-
- fi
+-
+- CFLAGS="$old_CFLAGS";
+- old_CFLAGS="";
+- export CFLAGS;
+- CPPFLAGS="$old_CPPFLAGS";
+- old_CPPFLAGS="";
+- export CPPFLAGS;
+- LDFLAGS="$old_LDFLAGS";
+- old_LDFLAGS="";
+- export LDFLAGS;
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_QUOTACTL_3" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_QUOTACTL_3" >&5
- $as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
- if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
- echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
- samba_cv_SYSQUOTA_FOUND=yes;
-
+-$as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
+-if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
+- echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
+- samba_cv_SYSQUOTA_FOUND=yes;
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_QUOTACTL_3 1
-_ACEOF
-+$as_echo "#define HAVE_QUOTACTL_3 1" >>confdefs.h
-
- samba_cv_sysquotas_file="lib/sysquotas_3.c"
- fi
-@@ -72801,151 +29721,12 @@
-
- #################################################
- # check for mntent.h and struct mntent
-
- for ac_header in mntent.h
+- samba_cv_sysquotas_file="lib/sysquotas_3.c"
+-fi
+-fi
+-
+-#################################################
+-# check for mntent.h and struct mntent
+-
+-for ac_header in mntent.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -79107,23 +79220,20 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
-+if test "x$ac_cv_header_mntent_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_MNTENT_H 1
- _ACEOF
-
- fi
-@@ -72954,361 +29735,42 @@
-
- #################################################
- # check for setmntent,getmntent,endmntent
+-_ACEOF
-
+-fi
-
+-done
-
- for ac_func in setmntent getmntent endmntent
+-#################################################
+-# check for setmntent,getmntent,endmntent
+-
+-
+-
+-for ac_func in setmntent getmntent endmntent
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -79317,12 +79427,25 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
--
++ samba_cv_HAVE_QUOTACTL_3=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -79359,30 +79482,42 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_QUOTACTL_3" >&5
++$as_echo "$samba_cv_HAVE_QUOTACTL_3" >&6; }
++if test x"$samba_cv_HAVE_QUOTACTL_3" = x"yes"; then
++ echo "CRAY int quotactl (char *spec, int request, char *arg) is NOT reworked for the sys_quota api"
++ samba_cv_SYSQUOTA_FOUND=yes;
+
++$as_echo "#define HAVE_QUOTACTL_3 1" >>confdefs.h
++
++ samba_cv_sysquotas_file="lib/sysquotas_3.c"
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++fi
++
++#################################################
++# check for mntent.h and struct mntent
++for ac_header in mntent.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
++if test "x$ac_cv_header_mntent_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--#################################################
++#define HAVE_MNTENT_H 1
+ _ACEOF
+
+ fi
+@@ -73212,103 +29734,43 @@
+ done
+
+ #################################################
-# check for devnm
-
-for ac_func in devnm
@@ -79395,7 +79530,16 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# check for setmntent,getmntent,endmntent
++for ac_func in setmntent getmntent endmntent
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -79413,9 +79557,11 @@
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
--
++fi
++done
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -79429,7 +79575,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
+
-int
-main ()
-{
@@ -79437,7 +79583,14 @@
- ;
- return 0;
-}
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#################################################
++# check for devnm.h and struct mntent
++for ac_header in devnm.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "devnm.h" "ac_cv_header_devnm_h" "$ac_includes_default"
++if test "x$ac_cv_header_devnm_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DEVNM_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -79467,23 +79620,11 @@
- eval "$as_ac_var=no"
fi
-+done
-+
-+
-+#################################################
-+# check for devnm.h and struct mntent
-+for ac_header in devnm.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "devnm.h" "ac_cv_header_devnm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_devnm_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DEVNM_H 1
-+_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -79491,7 +79632,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+done
+
+#################################################
@@ -79830,7 +79970,7 @@
fi
-@@ -73742,16 +30118,16 @@
+@@ -73744,16 +30120,16 @@
@@ -79850,7 +79990,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73777,7 +30153,7 @@
+@@ -73779,7 +30155,7 @@
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -79859,7 +79999,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
enable_static=yes
-@@ -73790,12 +30166,12 @@
+@@ -73792,12 +30168,12 @@
enable_static=yes
LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -79874,24 +80014,10 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -73807,6 +30183,13 @@
+@@ -73844,16 +30220,16 @@
-+if test "x$enable_external_libtalloc" = xyes
-+then
-+ NO_LIBTALLOC='#'
-+ LIBTALLOC_STATIC=
-+ tallocdir=../lib/talloc
-+fi
-+
-
-
-
-@@ -73833,16 +30216,16 @@
-
-
-
-{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtdb shared library" >&5
$as_echo_n "checking whether to build the libtdb shared library... " >&6; }
@@ -79908,7 +80034,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73868,7 +30251,7 @@
+@@ -73879,7 +30255,7 @@
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -79917,7 +80043,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
enable_static=yes
-@@ -73881,12 +30264,12 @@
+@@ -73892,12 +30268,12 @@
enable_static=yes
LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -79932,7 +80058,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -73924,16 +30307,16 @@
+@@ -73935,16 +30311,16 @@
@@ -79952,7 +80078,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73959,7 +30342,7 @@
+@@ -73970,7 +30346,7 @@
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -79961,7 +80087,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
enable_static=yes
-@@ -73972,12 +30355,12 @@
+@@ -73983,12 +30359,12 @@
enable_static=yes
LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -79976,7 +80102,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74015,16 +30398,16 @@
+@@ -74026,16 +30402,16 @@
@@ -79996,7 +80122,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74050,7 +30433,7 @@
+@@ -74061,7 +30437,7 @@
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -80005,7 +80131,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
enable_static=yes
-@@ -74063,12 +30446,12 @@
+@@ -74074,12 +30450,12 @@
enable_static=yes
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -80020,7 +80146,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74106,16 +30489,16 @@
+@@ -74117,16 +30493,16 @@
@@ -80040,7 +80166,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74141,7 +30524,7 @@
+@@ -74152,7 +30528,7 @@
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -80049,7 +80175,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
enable_static=yes
-@@ -74154,12 +30537,12 @@
+@@ -74165,12 +30541,12 @@
enable_static=yes
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -80064,7 +80190,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74197,19 +30580,19 @@
+@@ -74208,19 +30584,19 @@
@@ -80087,7 +80213,7 @@
$as_echo "yes" >&6; }
build_lib=no
;;
-@@ -74218,7 +30601,7 @@
+@@ -74229,7 +30605,7 @@
else
# if unspecified, default is not to build
@@ -80096,7 +80222,7 @@
$as_echo "yes" >&6; }
build_lib=no
-@@ -74234,7 +30617,7 @@
+@@ -74245,7 +30621,7 @@
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -80105,7 +80231,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
enable_static=yes
-@@ -74247,12 +30630,12 @@
+@@ -74258,12 +30634,12 @@
enable_static=yes
LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -80120,7 +80246,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74268,26 +30651,22 @@
+@@ -74279,26 +30655,22 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -80152,7 +80278,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -74301,51 +30680,22 @@
+@@ -74312,51 +30684,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -80210,7 +80336,7 @@
fi
fi
-@@ -74358,16 +30708,12 @@
+@@ -74369,16 +30712,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -80230,7 +80356,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74379,47 +30725,20 @@
+@@ -74390,47 +30729,20 @@
return 0;
}
_ACEOF
@@ -80284,7 +80410,7 @@
fi
fi
-@@ -74427,17 +30746,13 @@
+@@ -74438,17 +30750,13 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -80305,7 +80431,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74449,57 +30764,30 @@
+@@ -74460,57 +30768,30 @@
return 0;
}
_ACEOF
@@ -80370,7 +80496,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74511,56 +30799,29 @@
+@@ -74522,56 +30803,29 @@
return 0;
}
_ACEOF
@@ -80434,7 +80560,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74572,55 +30833,28 @@
+@@ -74583,55 +30837,28 @@
return 0;
}
_ACEOF
@@ -80497,7 +80623,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74632,59 +30866,32 @@
+@@ -74643,59 +30870,32 @@
return 0;
}
_ACEOF
@@ -80565,7 +80691,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -74697,71 +30904,38 @@
+@@ -74708,71 +30908,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -80647,7 +80773,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -74780,71 +30954,38 @@
+@@ -74791,71 +30958,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80729,7 +80855,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -74854,71 +30995,38 @@
+@@ -74865,71 +30999,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -80811,7 +80937,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -74934,71 +31042,38 @@
+@@ -74945,71 +31046,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80893,7 +81019,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -75018,52 +31093,23 @@
+@@ -75029,52 +31097,23 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -80952,7 +81078,7 @@
fi
fi
-@@ -75076,13 +31122,9 @@
+@@ -75087,13 +31126,9 @@
# If we don't have all of these then disable large
# file support.
#
@@ -80968,7 +81094,7 @@
/* end confdefs.h. */
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -75099,41 +31141,18 @@
+@@ -75110,41 +31145,18 @@
return 0;
}
_ACEOF
@@ -81014,7 +81140,7 @@
$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
#################################################
-@@ -75143,10 +31162,10 @@
+@@ -75154,10 +31166,10 @@
# Check whether --with-ctdb was given.
@@ -81027,7 +81153,7 @@
$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
;;
*)
-@@ -75160,71 +31179,23 @@
+@@ -75171,71 +31183,23 @@
CPPFLAGS="$CPPFLAGS $CTDB_CPPFLAGS"
ctdb_broken="missing or broken headers"
@@ -81109,31 +81235,41 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -75235,17 +31206,13 @@
+@@ -75246,265 +31210,13 @@
- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
- $as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
+-$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
-if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
+- $as_echo_n "(cached) " >&6
+-else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- #include "confdefs.h"
-@@ -75266,41 +31233,18 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-int
+-main ()
+-{
+-int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -81152,34 +81288,33 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
- else
+- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
-+ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
- $as_echo "$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
-
+-$as_echo "$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
-#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1
-_ACEOF
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1" >>confdefs.h
-
- fi
-
-@@ -75311,397 +31255,79 @@
- fi
-
- # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
+-
+- fi
+-
+-if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+- ctdb_broken=no
+-else
+- ctdb_broken="missing transaction support"
+-fi
+-
+-# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
-$as_echo_n "checking for struct ctdb_tcp_client... " >&6; }
-if test "${ac_cv_type_struct_ctdb_tcp_client+set}" = set; then
@@ -81310,8 +81445,11 @@
-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
-$as_echo_n "checking for struct ctdb_control_tcp... " >&6; }
-if test "${ac_cv_type_struct_ctdb_control_tcp+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
++$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
++if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_struct_ctdb_control_tcp=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -81330,7 +81468,7 @@
-#include <ctdb.h>
-#include <ctdb_private.h>
-
--
+
-int
-main ()
-{
@@ -81363,28 +81501,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include "confdefs.h"
+@@ -75517,202 +31229,109 @@
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+
-
--#include "confdefs.h"
--#define NO_CONFIG_H
--#include "replace.h"
--#include "system/wait.h"
--#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
--
--
--int
--main ()
--{
+ int
+ main ()
+ {
-if (sizeof ((struct ctdb_control_tcp)))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -81412,32 +81547,43 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
--fi
++ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
+ fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp" >&5
-$as_echo "$ac_cv_type_struct_ctdb_control_tcp" >&6; }
-if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then
-
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
++$as_echo "$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
-#define HAVE_STRUCT_CTDB_CONTROL_TCP 1
-_ACEOF
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1" >>confdefs.h
+
++ fi
+
++if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
++ ctdb_broken=no
+ else
-
--
--else
--
- ctdb_broken="missing struct ctdb_control_tcp"
-
--fi
++ ctdb_broken="missing transaction support"
+ fi
+
-
--
-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp_addr" >&5
-$as_echo_n "checking for struct ctdb_control_tcp_addr... " >&6; }
-if test "${ac_cv_type_struct_ctdb_control_tcp_addr+set}" = set; then
@@ -81452,6 +81598,7 @@
-/* end confdefs.h. */
-
-#include "confdefs.h"
++# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
+ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
+#include \"confdefs.h\"
#define NO_CONFIG_H
@@ -81502,9 +81649,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-#include "confdefs.h"
-+
+$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
+
+
@@ -81579,7 +81725,7 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp_addr" >&5
-$as_echo "$ac_cv_type_struct_ctdb_control_tcp_addr" >&6; }
-if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then
-
++
+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
+#include \"confdefs.h\"
+#define NO_CONFIG_H
@@ -81594,10 +81740,10 @@
+"
+if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1
-_ACEOF
-+
+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1" >>confdefs.h
@@ -81615,7 +81761,7 @@
withval=$with_cluster_support;
fi
-@@ -75712,44 +31338,38 @@
+@@ -75723,44 +31342,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -81667,7 +81813,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -75762,105 +31382,85 @@
+@@ -75773,105 +31386,85 @@
with_acl_support="auto"
fi
@@ -81794,7 +81940,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75878,60 +31478,31 @@
+@@ -75889,60 +31482,31 @@
return 0;
}
_ACEOF
@@ -81864,7 +82010,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75949,61 +31520,32 @@
+@@ -75960,61 +31524,32 @@
return 0;
}
_ACEOF
@@ -81935,7 +82081,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76022,64 +31564,33 @@
+@@ -76033,64 +31568,33 @@
return 0;
}
_ACEOF
@@ -82010,7 +82156,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76097,58 +31608,29 @@
+@@ -76108,58 +31612,29 @@
return 0;
}
_ACEOF
@@ -82077,7 +82223,7 @@
fi
;;
-@@ -76160,31 +31642,27 @@
+@@ -76171,31 +31646,27 @@
#################################################
# check for AIO support
@@ -82115,7 +82261,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76202,58 +31680,29 @@
+@@ -76213,58 +31684,29 @@
return 0;
}
_ACEOF
@@ -82183,7 +82329,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76271,59 +31720,30 @@
+@@ -76282,59 +31724,30 @@
return 0;
}
_ACEOF
@@ -82252,7 +82398,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76335,55 +31755,26 @@
+@@ -76346,55 +31759,26 @@
return 0;
}
_ACEOF
@@ -82316,7 +82462,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76395,716 +31786,317 @@
+@@ -76406,716 +31790,317 @@
return 0;
}
_ACEOF
@@ -83171,7 +83317,7 @@
$as_echo "no" >&6; }
fi
-@@ -77121,30 +32113,26 @@
+@@ -77132,30 +32117,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -83208,7 +83354,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77160,53 +32148,24 @@
+@@ -77171,53 +32152,24 @@
return 0;
}
_ACEOF
@@ -83235,11 +83381,12 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
samba_cv_HAVE_SENDFILE64=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_SENDFILE64=no
++else
+ samba_cv_HAVE_SENDFILE64=no
fi
-
@@ -83270,7 +83417,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77222,54 +32181,25 @@
+@@ -77233,54 +32185,25 @@
return 0;
}
_ACEOF
@@ -83333,7 +83480,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -77289,103 +32219,58 @@
+@@ -77300,103 +32223,58 @@
return 0;
}
_ACEOF
@@ -83454,7 +83601,7 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -77412,76 +32297,41 @@
+@@ -77423,76 +32301,41 @@
return 0;
}
_ACEOF
@@ -83543,7 +83690,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77505,73 +32355,38 @@
+@@ -77516,73 +32359,38 @@
return 0;
}
_ACEOF
@@ -83629,7 +83776,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77595,77 +32410,41 @@
+@@ -77606,77 +32414,41 @@
return 0;
}
_ACEOF
@@ -83719,7 +83866,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -77683,43 +32462,18 @@
+@@ -77694,43 +32466,18 @@
return 0;
}
_ACEOF
@@ -83769,7 +83916,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -77728,17 +32482,13 @@
+@@ -77739,17 +32486,13 @@
fi
@@ -83790,7 +83937,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77769,74 +32519,39 @@
+@@ -77780,74 +32523,39 @@
return 0;
}
_ACEOF
@@ -83877,7 +84024,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77867,75 +32582,40 @@
+@@ -77878,75 +32586,40 @@
return 0;
}
_ACEOF
@@ -83965,7 +84112,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77963,59 +32643,28 @@
+@@ -77974,59 +32647,28 @@
return 0;
}
_ACEOF
@@ -84034,7 +84181,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -78024,12 +32673,12 @@
+@@ -78035,12 +32677,12 @@
esac
;;
*)
@@ -84049,7 +84196,7 @@
$as_echo "yes" >&6; }
fi
-@@ -78038,17 +32687,13 @@
+@@ -78049,17 +32691,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -84070,7 +84217,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78063,62 +32708,31 @@
+@@ -78074,62 +32712,31 @@
return 0;
}
_ACEOF
@@ -84142,7 +84289,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78129,41 +32743,18 @@
+@@ -78140,41 +32747,18 @@
return 0;
}
_ACEOF
@@ -84188,7 +84335,7 @@
fi
-@@ -78171,17 +32762,13 @@
+@@ -78182,17 +32766,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -84209,7 +84356,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78196,47 +32783,20 @@
+@@ -78207,47 +32787,20 @@
return 0;
}
_ACEOF
@@ -84263,7 +84410,7 @@
fi
-@@ -78245,17 +32805,13 @@
+@@ -78256,17 +32809,13 @@
case "$host_os" in
*linux*)
@@ -84284,7 +84431,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78270,40 +32826,15 @@
+@@ -78281,40 +32830,15 @@
return 0;
}
_ACEOF
@@ -84330,7 +84477,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -78313,24 +32844,18 @@
+@@ -78324,24 +32848,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -84359,7 +84506,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78341,41 +32866,18 @@
+@@ -78352,41 +32870,18 @@
return 0;
}
_ACEOF
@@ -84405,7 +84552,7 @@
fi
-@@ -78383,68 +32885,35 @@
+@@ -78394,68 +32889,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -84484,7 +84631,7 @@
fi
-@@ -78452,7 +32921,7 @@
+@@ -78463,7 +32925,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -84493,7 +84640,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -78464,7 +32933,7 @@
+@@ -78475,7 +32937,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -84502,7 +84649,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -78565,7 +33034,7 @@
+@@ -78576,7 +33038,7 @@
# Check whether --with-winbind was given.
@@ -84511,7 +84658,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -78596,18 +33065,14 @@
+@@ -78607,18 +33069,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -84533,7 +84680,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78625,57 +33090,28 @@
+@@ -78636,57 +33094,28 @@
return 0;
}
_ACEOF
@@ -84600,7 +84747,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -78706,12 +33142,10 @@
+@@ -78717,12 +33146,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -84615,43 +84762,37 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -78722,624 +33156,112 @@
+@@ -78733,22 +33160,18 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
- { $as_echo "$as_me:$LINENO: result: no$winbind_no_reason" >&5
--$as_echo "no$winbind_no_reason" >&6; }
--fi
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no$winbind_no_reason" >&5
+ $as_echo "no$winbind_no_reason" >&6; }
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
--$as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
+ $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
++if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char pthread_mutex_lock ();
--int
--main ()
--{
--return pthread_mutex_lock ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -78766,48 +33189,21 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -84673,43 +84814,41 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_pthread_pthread_mutex_lock=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pthread_pthread_mutex_lock=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_mutex_lock=no
--fi
++ ac_cv_lib_pthread_pthread_mutex_lock=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
--$as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
-- WINBIND_NSS_PTHREAD="-lpthread"
--
++if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
+ WINBIND_NSS_PTHREAD="-lpthread"
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD 1
-_ACEOF
--
--fi
--
--
--
--
--
--
--
--
--
--
--
--
--
--# Solaris 10 does have new member in nss_XbyY_key
++$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+ fi
+
+@@ -78824,533 +33220,52 @@
+
+
+ # Solaris 10 does have new member in nss_XbyY_key
-{ $as_echo "$as_me:$LINENO: checking for union nss_XbyY_key.ipnode.af_family" >&5
-$as_echo_n "checking for union nss_XbyY_key.ipnode.af_family... " >&6; }
-if test "${ac_cv_member_union_nss_XbyY_key_ipnode_af_family+set}" = set; then
@@ -85023,14 +85162,18 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_age" >&5
-$as_echo "$ac_cv_member_struct_passwd_pw_age" >&6; }
-if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then
--
++ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
++"
++if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PASSWD_PW_AGE 1
-_ACEOF
--
--fi
--
--
++$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
+
+ fi
+
+
-# AIX 4.3.x and 5.1 do not have as many members in
-# struct secmethod_table as AIX 5.2
-{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_attrlist" >&5
@@ -85122,23 +85265,34 @@
-
- ac_cv_member_struct_secmethod_table_method_attrlist=no
-fi
--
++# Solaris has some extra fields in struct passwd that need to be
++# initialised otherwise nscd crashes.
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
++
++$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_attrlist" >&5
-$as_echo "$ac_cv_member_struct_secmethod_table_method_attrlist" >&6; }
-if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then
--
+
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-_ACEOF
--
--
+
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
+
-fi
--
++$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
+
-{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_version" >&5
-$as_echo_n "checking for struct secmethod_table.method_version... " >&6; }
-if test "${ac_cv_member_struct_secmethod_table_method_version+set}" = set; then
@@ -85151,7 +85305,8 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <usersec.h>
--
++fi
+
-int
-main ()
-{
@@ -85184,43 +85339,31 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no$winbind_no_reason" >&5
-+$as_echo "no$winbind_no_reason" >&6; }
-+fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
-+$as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
-+if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <usersec.h>
++# AIX 4.3.x and 5.1 do not have as many members in
++# struct secmethod_table as AIX 5.2
++ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
++"
++if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_mutex_lock ();
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct secmethod_table ac_aggr;
-if (sizeof ac_aggr.method_version)
-return 0;
-+return pthread_mutex_lock ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -85241,95 +85384,28 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_secmethod_table_method_version=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_pthread_pthread_mutex_lock=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_pthread_pthread_mutex_lock=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
-+ WINBIND_NSS_PTHREAD="-lpthread"
-+
-+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
- ac_cv_member_struct_secmethod_table_method_version=no
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Solaris 10 does have new member in nss_XbyY_key
-+ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
-+"
-+if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
-+
-+$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
-+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# Solaris has some extra fields in struct passwd that need to be
-+# initialised otherwise nscd crashes.
-+
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
-+
-+$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
-+
-+fi
-+
-+
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
-+
-+$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
-$as_echo "$ac_cv_member_struct_secmethod_table_method_version" >&6; }
-if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then
-+
-+
-+# AIX 4.3.x and 5.1 do not have as many members in
-+# struct secmethod_table as AIX 5.2
-+ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
-+"
-+if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-+_ACEOF
-+
-+
-+fi
-+
+ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_version" "ac_cv_member_struct_secmethod_table_method_version" "#include <usersec.h>
+"
+if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -79349,17 +33271,13 @@
+@@ -79360,17 +33275,13 @@
fi
@@ -85350,7 +85426,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -79374,41 +33292,18 @@
+@@ -79385,41 +33296,18 @@
return 0;
}
_ACEOF
@@ -85396,7 +85472,7 @@
fi
-@@ -79418,7 +33313,7 @@
+@@ -79429,7 +33317,7 @@
# Check whether --with-included-popt was given.
@@ -85405,7 +85481,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -79431,18 +33326,14 @@
+@@ -79442,18 +33330,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -85427,7 +85503,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79460,43 +33351,18 @@
+@@ -79471,43 +33355,18 @@
return 0;
}
_ACEOF
@@ -85477,7 +85553,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -79504,16 +33370,16 @@
+@@ -79515,16 +33374,16 @@
fi
@@ -85497,7 +85573,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -79526,7 +33392,7 @@
+@@ -79537,7 +33396,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -85506,7 +85582,7 @@
enableval=$enable_dnssd;
fi
-@@ -79535,151 +33401,12 @@
+@@ -79546,151 +33405,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -85663,7 +85739,7 @@
_ACEOF
fi
-@@ -79692,102 +33419,12 @@
+@@ -79703,102 +33423,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -85771,7 +85847,7 @@
_ACEOF
fi
-@@ -79795,23 +33432,17 @@
+@@ -79806,23 +33436,17 @@
@@ -85798,7 +85874,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79829,54 +33460,28 @@
+@@ -79840,54 +33464,28 @@
return 0;
}
_ACEOF
@@ -85860,7 +85936,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -79891,7 +33496,6 @@
+@@ -79902,7 +33500,6 @@
fi
@@ -85868,7 +85944,7 @@
if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
have_dnssd_support=no
-@@ -79899,15 +33503,11 @@
+@@ -79910,15 +33507,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -85886,7 +85962,7 @@
fi
fi
-@@ -79917,7 +33517,7 @@
+@@ -79928,7 +33521,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -85895,7 +85971,7 @@
enableval=$enable_avahi;
fi
-@@ -79926,151 +33526,12 @@
+@@ -79936,151 +33529,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -86052,7 +86128,7 @@
_ACEOF
fi
-@@ -80081,151 +33542,12 @@
+@@ -80091,151 +33545,12 @@
have_avahi_support=no
fi
@@ -86209,34 +86285,30 @@
_ACEOF
fi
-@@ -80238,23 +33560,17 @@
+@@ -80247,19 +33562,14 @@
+ fi
-
-
+ save_LIBS="$LIBS"
-
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lavahi-client $AVAHI_LIBS $LIBS"
-
-
-
--
-- { $as_echo "$as_me:$LINENO: checking for avahi_client_new in -lavahi-client" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
+-{ $as_echo "$as_me:$LINENO: checking for avahi_client_new in -lavahi-client" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
$as_echo_n "checking for avahi_client_new in -lavahi-client... " >&6; }
--if test "${ac_cv_lib_ext_avahi_client_avahi_client_new+set}" = set; then
-+if test "${ac_cv_lib_ext_avahi_client_avahi_client_new+set}" = set; then :
+-if test "${ac_cv_lib_avahi_client_avahi_client_new+set}" = set; then
++if test "${ac_cv_lib_avahi_client_avahi_client_new+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavahi-client $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80272,54 +33588,28 @@
+@@ -80277,43 +33587,18 @@
return 0;
}
_ACEOF
@@ -86262,15 +86334,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ext_avahi_client_avahi_client_new=yes;
- ac_cv_lib_ext_avahi_client=yes
+ ac_cv_lib_avahi_client_avahi_client_new=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_ext_avahi_client_avahi_client_new=no;
-+ ac_cv_lib_ext_avahi_client_avahi_client_new=no;
- ac_cv_lib_ext_avahi_client=no
+- ac_cv_lib_avahi_client_avahi_client_new=no
++ ac_cv_lib_avahi_client_avahi_client_new=no
fi
-
-rm -rf conftest.dSYM
@@ -86278,36 +86348,92 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
+ LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_avahi_client_avahi_client_new" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_avahi_client_avahi_client_new" >&5
- $as_echo "$ac_cv_lib_ext_avahi_client_avahi_client_new" >&6; }
-- if test $ac_cv_lib_ext_avahi_client_avahi_client_new = yes; then
-+ if test $ac_cv_lib_ext_avahi_client_avahi_client_new = yes; then :
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
+ $as_echo "$ac_cv_lib_avahi_client_avahi_client_new" >&6; }
+-if test "x$ac_cv_lib_avahi_client_avahi_client_new" = x""yes; then
++if test "x$ac_cv_lib_avahi_client_avahi_client_new" = x""yes; then :
cat >>confdefs.h <<_ACEOF
- #define HAVE_AVAHI_CLIENT_NEW 1
+ #define HAVE_LIBAVAHI_CLIENT 1
_ACEOF
+@@ -80322,19 +33607,14 @@
fi
+
-
- LIBS=$ac_check_lib_ext_save_LIBS
+-{ $as_echo "$as_me:$LINENO: checking for avahi_strerror in -lavahi-common" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_strerror in -lavahi-common" >&5
+ $as_echo_n "checking for avahi_strerror in -lavahi-common... " >&6; }
+-if test "${ac_cv_lib_avahi_common_avahi_strerror+set}" = set; then
++if test "${ac_cv_lib_avahi_common_avahi_strerror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavahi-common $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
--if test $ac_cv_lib_ext_avahi_client = yes; then
-+if test $ac_cv_lib_ext_avahi_client = yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBAVAHI_CLIENT 1
+ /* Override any GCC internal prototype to avoid an error.
+@@ -80352,43 +33632,18 @@
+ return 0;
+ }
_ACEOF
-@@ -80334,24 +33624,19 @@
-
-
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_avahi_common_avahi_strerror=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_avahi_common_avahi_strerror=no
++ ac_cv_lib_avahi_common_avahi_strerror=no
fi
-
- if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes"; then
- have_avahi_support=no
- fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avahi_common_avahi_strerror" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_common_avahi_strerror" >&5
+ $as_echo "$ac_cv_lib_avahi_common_avahi_strerror" >&6; }
+-if test "x$ac_cv_lib_avahi_common_avahi_strerror" = x""yes; then
++if test "x$ac_cv_lib_avahi_common_avahi_strerror" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAVAHI_COMMON 1
+ _ACEOF
+@@ -80408,17 +33663,13 @@
+ AVAHI_LIBS="-lavahi-client -lavahi-common"
- if test x"$have_avahi_support" = x"yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define WITH_AVAHI_SUPPORT 1
@@ -86325,7 +86451,7 @@
fi
fi
fi
-@@ -80361,7 +33646,7 @@
+@@ -80428,7 +33679,7 @@
# Check whether --with-included-iniparser was given.
@@ -86334,7 +86460,7 @@
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -80374,18 +33659,14 @@
+@@ -80441,18 +33692,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -86356,7 +86482,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80403,43 +33684,18 @@
+@@ -80470,43 +33717,18 @@
return 0;
}
_ACEOF
@@ -86406,7 +86532,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -80447,260 +33703,40 @@
+@@ -80514,260 +33736,40 @@
fi
@@ -86686,7 +86812,7 @@
_ACEOF
fi
-@@ -80708,20 +33744,16 @@
+@@ -80775,20 +33777,16 @@
done
@@ -86711,7 +86837,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -80733,46 +33765,19 @@
+@@ -80800,46 +33798,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -86763,7 +86889,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -80807,7 +33812,7 @@
+@@ -80874,7 +33845,7 @@
# Check whether --with-static-modules was given.
@@ -86772,7 +86898,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80819,7 +33824,7 @@
+@@ -80886,7 +33857,7 @@
# Check whether --with-shared-modules was given.
@@ -86781,7 +86907,7 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80830,7 +33835,7 @@
+@@ -80897,7 +33868,7 @@
@@ -86790,7 +86916,7 @@
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -80842,12 +33847,10 @@
+@@ -80909,12 +33880,10 @@
if test x"$DEST" = xSHARED; then
@@ -86805,7 +86931,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -80858,16 +33861,16 @@
+@@ -80925,16 +33894,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -86825,7 +86951,7 @@
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -80879,12 +33882,10 @@
+@@ -80946,12 +33915,10 @@
if test x"$DEST" = xSHARED; then
@@ -86840,7 +86966,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -80895,16 +33896,16 @@
+@@ -80962,16 +33929,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -86860,7 +86986,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -80916,12 +33917,10 @@
+@@ -80983,12 +33950,10 @@
if test x"$DEST" = xSHARED; then
@@ -86875,7 +87001,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -80932,16 +33931,16 @@
+@@ -80999,16 +33964,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -86895,7 +87021,7 @@
$as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
if test "$MODULE_pdb_wbc_sam"; then
DEST=$MODULE_pdb_wbc_sam
-@@ -80953,12 +33952,10 @@
+@@ -81020,12 +33985,10 @@
if test x"$DEST" = xSHARED; then
@@ -86910,7 +87036,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -80969,11 +33966,11 @@
+@@ -81036,11 +33999,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -86924,7 +87050,7 @@
$as_echo "not" >&6; }
fi
-@@ -80995,7 +33992,7 @@
+@@ -81062,7 +34025,7 @@
@@ -86933,7 +87059,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -81007,12 +34004,10 @@
+@@ -81074,12 +34037,10 @@
if test x"$DEST" = xSHARED; then
@@ -86948,7 +87074,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -81023,16 +34018,16 @@
+@@ -81090,16 +34051,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -86968,7 +87094,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -81044,12 +34039,10 @@
+@@ -81111,12 +34072,10 @@
if test x"$DEST" = xSHARED; then
@@ -86983,7 +87109,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -81060,16 +34053,16 @@
+@@ -81127,16 +34086,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -87003,7 +87129,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -81081,12 +34074,10 @@
+@@ -81148,12 +34107,10 @@
if test x"$DEST" = xSHARED; then
@@ -87018,7 +87144,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -81097,16 +34088,16 @@
+@@ -81164,16 +34121,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -87038,7 +87164,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -81118,12 +34109,10 @@
+@@ -81185,12 +34142,10 @@
if test x"$DEST" = xSHARED; then
@@ -87053,7 +87179,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -81134,16 +34123,16 @@
+@@ -81201,16 +34156,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -87073,7 +87199,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -81155,12 +34144,10 @@
+@@ -81222,12 +34177,10 @@
if test x"$DEST" = xSHARED; then
@@ -87088,7 +87214,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -81171,16 +34158,16 @@
+@@ -81238,16 +34191,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -87108,7 +87234,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -81192,12 +34179,10 @@
+@@ -81259,12 +34212,10 @@
if test x"$DEST" = xSHARED; then
@@ -87123,7 +87249,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -81208,16 +34193,16 @@
+@@ -81275,16 +34226,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -87143,7 +87269,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -81229,12 +34214,10 @@
+@@ -81296,12 +34247,10 @@
if test x"$DEST" = xSHARED; then
@@ -87158,7 +87284,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -81245,16 +34228,16 @@
+@@ -81312,16 +34261,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -87178,7 +87304,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -81266,12 +34249,10 @@
+@@ -81333,12 +34282,10 @@
if test x"$DEST" = xSHARED; then
@@ -87193,7 +87319,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -81282,16 +34263,16 @@
+@@ -81349,16 +34296,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -87213,7 +87339,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -81303,12 +34284,10 @@
+@@ -81370,12 +34317,10 @@
if test x"$DEST" = xSHARED; then
@@ -87228,7 +87354,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -81319,16 +34298,16 @@
+@@ -81386,16 +34331,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -87248,7 +87374,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -81340,12 +34319,10 @@
+@@ -81407,12 +34352,10 @@
if test x"$DEST" = xSHARED; then
@@ -87263,7 +87389,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -81356,16 +34333,16 @@
+@@ -81423,16 +34366,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -87283,7 +87409,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -81377,12 +34354,10 @@
+@@ -81444,12 +34387,10 @@
if test x"$DEST" = xSHARED; then
@@ -87298,7 +87424,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -81393,16 +34368,16 @@
+@@ -81460,16 +34401,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -87318,7 +87444,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -81414,12 +34389,10 @@
+@@ -81481,12 +34422,10 @@
if test x"$DEST" = xSHARED; then
@@ -87333,7 +87459,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -81430,16 +34403,16 @@
+@@ -81497,16 +34436,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -87353,7 +87479,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -81451,12 +34424,10 @@
+@@ -81518,12 +34457,10 @@
if test x"$DEST" = xSHARED; then
@@ -87368,7 +87494,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -81467,16 +34438,16 @@
+@@ -81534,16 +34471,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -87388,7 +87514,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -81488,12 +34459,10 @@
+@@ -81555,12 +34492,10 @@
if test x"$DEST" = xSHARED; then
@@ -87403,7 +87529,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -81504,11 +34473,11 @@
+@@ -81571,11 +34506,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -87417,7 +87543,7 @@
$as_echo "not" >&6; }
fi
-@@ -81529,7 +34498,7 @@
+@@ -81596,7 +34531,7 @@
@@ -87426,7 +87552,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -81541,12 +34510,10 @@
+@@ -81608,12 +34543,10 @@
if test x"$DEST" = xSHARED; then
@@ -87441,7 +87567,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -81557,16 +34524,16 @@
+@@ -81624,16 +34557,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -87461,7 +87587,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -81578,12 +34545,10 @@
+@@ -81645,12 +34578,10 @@
if test x"$DEST" = xSHARED; then
@@ -87476,7 +87602,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -81594,16 +34559,16 @@
+@@ -81661,16 +34592,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -87496,7 +87622,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -81615,12 +34580,10 @@
+@@ -81682,12 +34613,10 @@
if test x"$DEST" = xSHARED; then
@@ -87511,7 +87637,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -81631,16 +34594,16 @@
+@@ -81698,16 +34627,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -87531,7 +87657,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -81652,12 +34615,10 @@
+@@ -81719,12 +34648,10 @@
if test x"$DEST" = xSHARED; then
@@ -87546,7 +87672,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -81668,16 +34629,16 @@
+@@ -81735,16 +34662,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -87566,7 +87692,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -81689,12 +34650,10 @@
+@@ -81756,12 +34683,10 @@
if test x"$DEST" = xSHARED; then
@@ -87581,7 +87707,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -81705,16 +34664,16 @@
+@@ -81772,16 +34697,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -87601,7 +87727,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -81726,12 +34685,10 @@
+@@ -81793,12 +34718,10 @@
if test x"$DEST" = xSHARED; then
@@ -87616,7 +87742,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -81742,16 +34699,16 @@
+@@ -81809,16 +34732,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -87636,7 +87762,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -81763,12 +34720,10 @@
+@@ -81830,12 +34753,10 @@
if test x"$DEST" = xSHARED; then
@@ -87651,7 +87777,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -81779,16 +34734,16 @@
+@@ -81846,16 +34767,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -87671,7 +87797,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -81800,12 +34755,10 @@
+@@ -81867,12 +34788,10 @@
if test x"$DEST" = xSHARED; then
@@ -87686,7 +87812,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -81816,16 +34769,16 @@
+@@ -81883,16 +34802,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -87706,7 +87832,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -81837,12 +34790,10 @@
+@@ -81904,12 +34823,10 @@
if test x"$DEST" = xSHARED; then
@@ -87721,7 +87847,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -81853,11 +34804,11 @@
+@@ -81920,11 +34837,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -87735,7 +87861,7 @@
$as_echo "not" >&6; }
fi
-@@ -81878,7 +34829,7 @@
+@@ -81945,7 +34862,7 @@
@@ -87744,7 +87870,7 @@
$as_echo_n "checking how to build nss_info_template... " >&6; }
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
-@@ -81890,12 +34841,10 @@
+@@ -81957,12 +34874,10 @@
if test x"$DEST" = xSHARED; then
@@ -87759,7 +87885,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -81906,11 +34855,11 @@
+@@ -81973,11 +34888,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -87773,7 +87899,7 @@
$as_echo "not" >&6; }
fi
-@@ -81931,7 +34880,7 @@
+@@ -81998,7 +34913,7 @@
@@ -87782,7 +87908,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -81943,12 +34892,10 @@
+@@ -82010,12 +34925,10 @@
if test x"$DEST" = xSHARED; then
@@ -87797,7 +87923,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -81959,16 +34906,16 @@
+@@ -82026,16 +34939,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -87817,7 +87943,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -81980,12 +34927,10 @@
+@@ -82047,12 +34960,10 @@
if test x"$DEST" = xSHARED; then
@@ -87832,7 +87958,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -81996,16 +34941,16 @@
+@@ -82063,16 +34974,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -87852,7 +87978,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -82017,12 +34962,10 @@
+@@ -82084,12 +34995,10 @@
if test x"$DEST" = xSHARED; then
@@ -87867,7 +87993,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -82033,16 +34976,16 @@
+@@ -82100,16 +35009,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -87887,7 +88013,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -82054,12 +34997,10 @@
+@@ -82121,12 +35030,10 @@
if test x"$DEST" = xSHARED; then
@@ -87902,7 +88028,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -82070,11 +35011,11 @@
+@@ -82137,11 +35044,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -87916,7 +88042,7 @@
$as_echo "not" >&6; }
fi
-@@ -82095,7 +35036,7 @@
+@@ -82162,7 +35069,7 @@
@@ -87925,7 +88051,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -82107,12 +35048,10 @@
+@@ -82174,12 +35081,10 @@
if test x"$DEST" = xSHARED; then
@@ -87940,7 +88066,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -82123,16 +35062,16 @@
+@@ -82190,16 +35095,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -87960,7 +88086,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -82144,12 +35083,10 @@
+@@ -82211,12 +35116,10 @@
if test x"$DEST" = xSHARED; then
@@ -87975,7 +88101,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -82160,16 +35097,16 @@
+@@ -82227,16 +35130,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -87995,7 +88121,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -82181,12 +35118,10 @@
+@@ -82248,12 +35151,10 @@
if test x"$DEST" = xSHARED; then
@@ -88010,7 +88136,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -82197,16 +35132,16 @@
+@@ -82264,16 +35165,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -88030,7 +88156,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -82218,12 +35153,10 @@
+@@ -82285,12 +35186,10 @@
if test x"$DEST" = xSHARED; then
@@ -88045,7 +88171,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -82234,16 +35167,16 @@
+@@ -82301,16 +35200,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -88065,7 +88191,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -82255,12 +35188,10 @@
+@@ -82322,12 +35221,10 @@
if test x"$DEST" = xSHARED; then
@@ -88080,7 +88206,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -82271,16 +35202,16 @@
+@@ -82338,16 +35235,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -88100,7 +88226,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -82292,12 +35223,10 @@
+@@ -82359,12 +35256,10 @@
if test x"$DEST" = xSHARED; then
@@ -88115,7 +88241,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -82308,16 +35237,16 @@
+@@ -82375,16 +35270,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -88135,7 +88261,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -82329,12 +35258,10 @@
+@@ -82396,12 +35291,10 @@
if test x"$DEST" = xSHARED; then
@@ -88150,7 +88276,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -82345,16 +35272,16 @@
+@@ -82412,16 +35305,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -88170,7 +88296,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -82366,12 +35293,10 @@
+@@ -82433,12 +35326,10 @@
if test x"$DEST" = xSHARED; then
@@ -88185,7 +88311,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -82382,16 +35307,16 @@
+@@ -82449,16 +35340,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -88205,7 +88331,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -82403,12 +35328,10 @@
+@@ -82470,12 +35361,10 @@
if test x"$DEST" = xSHARED; then
@@ -88220,7 +88346,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -82419,11 +35342,11 @@
+@@ -82486,11 +35375,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -88234,7 +88360,7 @@
$as_echo "not" >&6; }
fi
-@@ -82444,7 +35367,7 @@
+@@ -82511,7 +35400,7 @@
@@ -88243,7 +88369,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -82456,12 +35379,10 @@
+@@ -82523,12 +35412,10 @@
if test x"$DEST" = xSHARED; then
@@ -88258,7 +88384,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -82472,16 +35393,16 @@
+@@ -82539,16 +35426,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -88278,7 +88404,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -82493,12 +35414,10 @@
+@@ -82560,12 +35447,10 @@
if test x"$DEST" = xSHARED; then
@@ -88293,7 +88419,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -82509,16 +35428,16 @@
+@@ -82576,16 +35461,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -88313,7 +88439,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -82530,12 +35449,10 @@
+@@ -82597,12 +35482,10 @@
if test x"$DEST" = xSHARED; then
@@ -88328,7 +88454,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -82546,16 +35463,16 @@
+@@ -82613,16 +35496,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -88348,7 +88474,7 @@
$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
-@@ -82567,12 +35484,10 @@
+@@ -82634,12 +35517,10 @@
if test x"$DEST" = xSHARED; then
@@ -88363,7 +88489,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -82583,16 +35498,16 @@
+@@ -82650,16 +35531,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -88383,7 +88509,7 @@
$as_echo_n "checking how to build vfs_full_audit... " >&6; }
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
-@@ -82604,12 +35519,10 @@
+@@ -82671,12 +35552,10 @@
if test x"$DEST" = xSHARED; then
@@ -88398,7 +88524,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -82620,16 +35533,16 @@
+@@ -82687,16 +35566,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -88418,7 +88544,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -82641,12 +35554,10 @@
+@@ -82708,12 +35587,10 @@
if test x"$DEST" = xSHARED; then
@@ -88433,7 +88559,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -82657,16 +35568,16 @@
+@@ -82724,16 +35601,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -88453,7 +88579,7 @@
$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
-@@ -82678,12 +35589,10 @@
+@@ -82745,12 +35622,10 @@
if test x"$DEST" = xSHARED; then
@@ -88468,7 +88594,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -82694,16 +35603,16 @@
+@@ -82761,16 +35636,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -88488,7 +88614,7 @@
$as_echo_n "checking how to build vfs_default_quota... " >&6; }
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
-@@ -82715,12 +35624,10 @@
+@@ -82782,12 +35657,10 @@
if test x"$DEST" = xSHARED; then
@@ -88503,7 +88629,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -82731,16 +35638,16 @@
+@@ -82798,16 +35671,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -88523,7 +88649,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -82752,12 +35659,10 @@
+@@ -82819,12 +35692,10 @@
if test x"$DEST" = xSHARED; then
@@ -88538,7 +88664,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -82768,16 +35673,16 @@
+@@ -82835,16 +35706,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -88558,7 +88684,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -82789,12 +35694,10 @@
+@@ -82856,12 +35727,10 @@
if test x"$DEST" = xSHARED; then
@@ -88573,7 +88699,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -82805,16 +35708,16 @@
+@@ -82872,16 +35741,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -88593,7 +88719,7 @@
$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
-@@ -82826,12 +35729,10 @@
+@@ -82893,12 +35762,10 @@
if test x"$DEST" = xSHARED; then
@@ -88608,7 +88734,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -82842,16 +35743,16 @@
+@@ -82909,16 +35776,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -88628,7 +88754,7 @@
$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
-@@ -82863,12 +35764,10 @@
+@@ -82930,12 +35797,10 @@
if test x"$DEST" = xSHARED; then
@@ -88643,7 +88769,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -82879,16 +35778,16 @@
+@@ -82946,16 +35811,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -88663,7 +88789,7 @@
$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
-@@ -82900,12 +35799,10 @@
+@@ -82967,12 +35832,10 @@
if test x"$DEST" = xSHARED; then
@@ -88678,7 +88804,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -82916,16 +35813,16 @@
+@@ -82983,16 +35846,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -88698,7 +88824,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -82937,12 +35834,10 @@
+@@ -83004,12 +35867,10 @@
if test x"$DEST" = xSHARED; then
@@ -88713,7 +88839,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -82953,16 +35848,16 @@
+@@ -83020,16 +35881,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -88733,7 +88859,7 @@
$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
-@@ -82974,12 +35869,10 @@
+@@ -83041,12 +35902,10 @@
if test x"$DEST" = xSHARED; then
@@ -88748,7 +88874,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -82990,16 +35883,16 @@
+@@ -83057,16 +35916,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -88768,7 +88894,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -83011,12 +35904,10 @@
+@@ -83078,12 +35937,10 @@
if test x"$DEST" = xSHARED; then
@@ -88783,7 +88909,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -83027,16 +35918,16 @@
+@@ -83094,16 +35951,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -88803,7 +88929,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -83048,12 +35939,10 @@
+@@ -83115,12 +35972,10 @@
if test x"$DEST" = xSHARED; then
@@ -88818,7 +88944,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -83064,16 +35953,16 @@
+@@ -83131,16 +35986,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -88838,7 +88964,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -83085,12 +35974,10 @@
+@@ -83152,12 +36007,10 @@
if test x"$DEST" = xSHARED; then
@@ -88853,7 +88979,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -83101,16 +35988,16 @@
+@@ -83168,16 +36021,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -88873,7 +88999,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -83122,12 +36009,10 @@
+@@ -83189,12 +36042,10 @@
if test x"$DEST" = xSHARED; then
@@ -88888,7 +89014,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -83138,16 +36023,16 @@
+@@ -83205,16 +36056,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -88908,7 +89034,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -83159,12 +36044,10 @@
+@@ -83226,12 +36077,10 @@
if test x"$DEST" = xSHARED; then
@@ -88923,7 +89049,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -83175,16 +36058,16 @@
+@@ -83242,16 +36091,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -88943,7 +89069,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -83196,12 +36079,10 @@
+@@ -83263,12 +36112,10 @@
if test x"$DEST" = xSHARED; then
@@ -88958,7 +89084,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -83212,16 +36093,16 @@
+@@ -83279,16 +36126,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -88978,7 +89104,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -83233,12 +36114,10 @@
+@@ -83300,12 +36147,10 @@
if test x"$DEST" = xSHARED; then
@@ -88993,7 +89119,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -83249,16 +36128,16 @@
+@@ -83316,16 +36161,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -89013,7 +89139,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -83270,12 +36149,10 @@
+@@ -83337,12 +36182,10 @@
if test x"$DEST" = xSHARED; then
@@ -89028,7 +89154,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -83286,16 +36163,16 @@
+@@ -83353,16 +36196,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -89048,7 +89174,7 @@
$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
-@@ -83307,12 +36184,10 @@
+@@ -83374,12 +36217,10 @@
if test x"$DEST" = xSHARED; then
@@ -89063,7 +89189,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -83323,16 +36198,16 @@
+@@ -83390,16 +36231,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -89083,7 +89209,7 @@
$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
-@@ -83344,12 +36219,10 @@
+@@ -83411,12 +36252,10 @@
if test x"$DEST" = xSHARED; then
@@ -89098,7 +89224,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -83360,16 +36233,16 @@
+@@ -83427,16 +36266,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -89118,7 +89244,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -83381,12 +36254,10 @@
+@@ -83448,12 +36287,10 @@
if test x"$DEST" = xSHARED; then
@@ -89133,7 +89259,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -83397,16 +36268,16 @@
+@@ -83464,16 +36301,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -89153,7 +89279,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -83418,12 +36289,10 @@
+@@ -83485,12 +36322,10 @@
if test x"$DEST" = xSHARED; then
@@ -89168,7 +89294,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -83434,16 +36303,16 @@
+@@ -83501,16 +36336,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -89188,7 +89314,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -83455,12 +36324,10 @@
+@@ -83522,12 +36357,10 @@
if test x"$DEST" = xSHARED; then
@@ -89203,7 +89329,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -83471,16 +36338,16 @@
+@@ -83538,16 +36371,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -89223,7 +89349,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -83492,12 +36359,10 @@
+@@ -83559,12 +36392,10 @@
if test x"$DEST" = xSHARED; then
@@ -89238,7 +89364,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -83508,16 +36373,16 @@
+@@ -83575,16 +36406,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -89258,7 +89384,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -83529,12 +36394,10 @@
+@@ -83596,12 +36427,10 @@
if test x"$DEST" = xSHARED; then
@@ -89273,7 +89399,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -83545,16 +36408,16 @@
+@@ -83612,16 +36441,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -89293,7 +89419,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -83566,12 +36429,10 @@
+@@ -83633,12 +36462,10 @@
if test x"$DEST" = xSHARED; then
@@ -89308,7 +89434,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -83582,16 +36443,16 @@
+@@ -83649,16 +36476,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -89328,7 +89454,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -83603,12 +36464,10 @@
+@@ -83670,12 +36497,10 @@
if test x"$DEST" = xSHARED; then
@@ -89343,7 +89469,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -83619,16 +36478,16 @@
+@@ -83686,16 +36511,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -89363,7 +89489,7 @@
$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
-@@ -83640,12 +36499,10 @@
+@@ -83707,12 +36532,10 @@
if test x"$DEST" = xSHARED; then
@@ -89378,7 +89504,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -83656,16 +36513,16 @@
+@@ -83723,16 +36546,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -89398,7 +89524,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -83677,12 +36534,10 @@
+@@ -83744,12 +36567,10 @@
if test x"$DEST" = xSHARED; then
@@ -89413,7 +89539,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -83693,16 +36548,16 @@
+@@ -83760,16 +36581,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -89433,7 +89559,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -83714,12 +36569,10 @@
+@@ -83781,12 +36602,10 @@
if test x"$DEST" = xSHARED; then
@@ -89448,7 +89574,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -83730,16 +36583,16 @@
+@@ -83797,16 +36616,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -89468,7 +89594,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -83751,12 +36604,10 @@
+@@ -83818,12 +36637,10 @@
if test x"$DEST" = xSHARED; then
@@ -89483,7 +89609,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -83767,16 +36618,16 @@
+@@ -83834,16 +36651,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -89503,7 +89629,7 @@
$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
-@@ -83788,12 +36639,10 @@
+@@ -83855,12 +36672,10 @@
if test x"$DEST" = xSHARED; then
@@ -89518,7 +89644,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -83804,16 +36653,16 @@
+@@ -83871,16 +36686,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -89538,7 +89664,7 @@
$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
-@@ -83825,12 +36674,10 @@
+@@ -83892,12 +36707,10 @@
if test x"$DEST" = xSHARED; then
@@ -89553,7 +89679,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -83841,16 +36688,16 @@
+@@ -83908,16 +36721,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -89573,7 +89699,7 @@
$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
-@@ -83862,12 +36709,10 @@
+@@ -83929,12 +36742,10 @@
if test x"$DEST" = xSHARED; then
@@ -89588,7 +89714,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -83878,16 +36723,16 @@
+@@ -83945,16 +36756,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -89608,7 +89734,7 @@
$as_echo_n "checking how to build vfs_smb_traffic_analyzer... " >&6; }
if test "$MODULE_vfs_smb_traffic_analyzer"; then
DEST=$MODULE_vfs_smb_traffic_analyzer
-@@ -83899,12 +36744,10 @@
+@@ -83966,12 +36777,10 @@
if test x"$DEST" = xSHARED; then
@@ -89623,7 +89749,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -83915,16 +36758,16 @@
+@@ -83982,16 +36791,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -89643,7 +89769,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -83936,12 +36779,10 @@
+@@ -84003,12 +36812,10 @@
if test x"$DEST" = xSHARED; then
@@ -89658,7 +89784,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -83952,16 +36793,16 @@
+@@ -84019,16 +36826,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -89678,7 +89804,7 @@
$as_echo_n "checking how to build vfs_onefs_shadow_copy... " >&6; }
if test "$MODULE_vfs_onefs_shadow_copy"; then
DEST=$MODULE_vfs_onefs_shadow_copy
-@@ -83973,12 +36814,10 @@
+@@ -84040,12 +36847,10 @@
if test x"$DEST" = xSHARED; then
@@ -89693,7 +89819,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -83989,16 +36828,16 @@
+@@ -84056,16 +36861,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -89713,7 +89839,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -84010,12 +36849,10 @@
+@@ -84077,12 +36882,10 @@
if test x"$DEST" = xSHARED; then
@@ -89728,7 +89854,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -84026,11 +36863,11 @@
+@@ -84093,11 +36896,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -89742,7 +89868,7 @@
$as_echo "not" >&6; }
fi
-@@ -84052,7 +36889,7 @@
+@@ -84119,7 +36922,7 @@
@@ -89751,7 +89877,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -84064,12 +36901,10 @@
+@@ -84131,12 +36934,10 @@
if test x"$DEST" = xSHARED; then
@@ -89766,7 +89892,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -84080,16 +36915,16 @@
+@@ -84147,16 +36948,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -89786,7 +89912,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -84101,12 +36936,10 @@
+@@ -84168,12 +36969,10 @@
if test x"$DEST" = xSHARED; then
@@ -89801,7 +89927,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -84117,11 +36950,11 @@
+@@ -84184,11 +36983,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -89815,7 +89941,7 @@
$as_echo "not" >&6; }
fi
-@@ -84142,7 +36975,7 @@
+@@ -84209,7 +37008,7 @@
@@ -89824,7 +89950,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -84154,12 +36987,10 @@
+@@ -84221,12 +37020,10 @@
if test x"$DEST" = xSHARED; then
@@ -89839,7 +89965,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -84170,16 +37001,16 @@
+@@ -84237,16 +37034,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -89859,7 +89985,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -84191,12 +37022,10 @@
+@@ -84258,12 +37055,10 @@
if test x"$DEST" = xSHARED; then
@@ -89874,7 +90000,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -84207,16 +37036,16 @@
+@@ -84274,16 +37069,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -89894,7 +90020,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -84228,12 +37057,10 @@
+@@ -84295,12 +37090,10 @@
if test x"$DEST" = xSHARED; then
@@ -89909,7 +90035,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -84244,11 +37071,11 @@
+@@ -84311,11 +37104,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -89923,7 +90049,7 @@
$as_echo "not" >&6; }
fi
-@@ -84284,18 +37111,16 @@
+@@ -84351,18 +37144,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -89946,7 +90072,7 @@
$as_echo "no" >&6; }
fi
-@@ -84312,11 +37137,11 @@
+@@ -84379,11 +37170,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -89961,7 +90087,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -84324,11 +37149,7 @@
+@@ -84391,11 +37182,7 @@
else
@@ -89974,7 +90100,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -84384,41 +37205,16 @@
+@@ -84451,41 +37238,16 @@
}
_ACEOF
@@ -90020,7 +90146,7 @@
/* end confdefs.h. */
int
-@@ -84429,61 +37225,31 @@
+@@ -84496,61 +37258,31 @@
return 0;
}
_ACEOF
@@ -90089,7 +90215,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -84497,13 +37263,9 @@
+@@ -84564,13 +37296,9 @@
# no RT_SIGNAL bug, we are golden
@@ -90105,7 +90231,7 @@
/* end confdefs.h. */
int
-@@ -84514,65 +37276,39 @@
+@@ -84581,65 +37309,39 @@
return 0;
}
_ACEOF
@@ -90180,7 +90306,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -84581,9 +37317,7 @@
+@@ -84648,9 +37350,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -90191,7 +90317,7 @@
fi
-@@ -84603,9 +37337,9 @@
+@@ -84670,9 +37370,9 @@
# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
set dummy python$PYTHON_VERSION; ac_word=$2
@@ -90203,7 +90329,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -84618,14 +37352,14 @@
+@@ -84685,14 +37385,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90221,7 +90347,7 @@
IFS=$as_save_IFS
;;
-@@ -84633,17 +37367,17 @@
+@@ -84700,17 +37400,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90242,7 +90368,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -84654,9 +37388,9 @@
+@@ -84721,9 +37421,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -90254,7 +90380,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84669,14 +37403,14 @@
+@@ -84736,14 +37436,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90272,7 +90398,7 @@
IFS=$as_save_IFS
;;
-@@ -84684,10 +37418,10 @@
+@@ -84751,10 +37451,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90285,7 +90411,7 @@
$as_echo "no" >&6; }
fi
-@@ -84698,9 +37432,9 @@
+@@ -84765,9 +37465,9 @@
else
# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
set dummy python$PYTHON_VERSION-config; ac_word=$2
@@ -90297,7 +90423,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84713,14 +37447,14 @@
+@@ -84780,14 +37480,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90315,7 +90441,7 @@
IFS=$as_save_IFS
;;
-@@ -84728,10 +37462,10 @@
+@@ -84795,10 +37495,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90328,7 +90454,7 @@
$as_echo "no" >&6; }
fi
-@@ -84739,7 +37473,7 @@
+@@ -84806,7 +37506,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90337,7 +90463,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -84749,11 +37483,7 @@
+@@ -84816,11 +37516,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90350,7 +90476,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84769,42 +37499,15 @@
+@@ -84836,42 +37532,15 @@
return 0;
}
_ACEOF
@@ -90396,7 +90522,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84816,11 +37519,7 @@
+@@ -84883,11 +37552,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90409,7 +90535,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84836,42 +37535,15 @@
+@@ -84903,42 +37568,15 @@
return 0;
}
_ACEOF
@@ -90455,7 +90581,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84886,11 +37558,7 @@
+@@ -84953,11 +37591,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90468,7 +90594,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84906,42 +37574,15 @@
+@@ -84973,42 +37607,15 @@
return 0;
}
_ACEOF
@@ -90514,7 +90640,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84953,11 +37594,7 @@
+@@ -85020,11 +37627,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90527,7 +90653,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -84973,42 +37610,15 @@
+@@ -85040,42 +37643,15 @@
return 0;
}
_ACEOF
@@ -90573,7 +90699,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85038,11 +37648,7 @@
+@@ -85105,11 +37681,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -90586,7 +90712,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85058,64 +37664,37 @@
+@@ -85125,64 +37697,37 @@
return 0;
}
_ACEOF
@@ -90659,7 +90785,7 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -85168,9 +37747,9 @@
+@@ -85235,9 +37780,9 @@
# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
set dummy python$PYTHON_VERSION; ac_word=$2
@@ -90671,7 +90797,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -85183,14 +37762,14 @@
+@@ -85250,14 +37795,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90689,7 +90815,7 @@
IFS=$as_save_IFS
;;
-@@ -85198,17 +37777,17 @@
+@@ -85265,17 +37810,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90710,7 +90836,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -85219,9 +37798,9 @@
+@@ -85286,9 +37831,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -90722,7 +90848,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85234,14 +37813,14 @@
+@@ -85301,14 +37846,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90740,7 +90866,7 @@
IFS=$as_save_IFS
;;
-@@ -85249,10 +37828,10 @@
+@@ -85316,10 +37861,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90753,7 +90879,7 @@
$as_echo "no" >&6; }
fi
-@@ -85263,9 +37842,9 @@
+@@ -85330,9 +37875,9 @@
else
# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
set dummy python$PYTHON_VERSION-config; ac_word=$2
@@ -90765,7 +90891,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85278,14 +37857,14 @@
+@@ -85345,14 +37890,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90783,7 +90909,7 @@
IFS=$as_save_IFS
;;
-@@ -85293,10 +37872,10 @@
+@@ -85360,10 +37905,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90796,7 +90922,7 @@
$as_echo "no" >&6; }
fi
-@@ -85304,7 +37883,7 @@
+@@ -85371,7 +37916,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90805,7 +90931,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -85314,11 +37893,7 @@
+@@ -85381,11 +37926,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90818,7 +90944,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85334,42 +37909,15 @@
+@@ -85401,42 +37942,15 @@
return 0;
}
_ACEOF
@@ -90864,7 +90990,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85381,11 +37929,7 @@
+@@ -85448,11 +37962,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90877,7 +91003,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85401,42 +37945,15 @@
+@@ -85468,42 +37978,15 @@
return 0;
}
_ACEOF
@@ -90923,7 +91049,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85451,11 +37968,7 @@
+@@ -85518,11 +38001,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90936,7 +91062,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85471,42 +37984,15 @@
+@@ -85538,42 +38017,15 @@
return 0;
}
_ACEOF
@@ -90982,7 +91108,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85518,11 +38004,7 @@
+@@ -85585,11 +38037,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90995,7 +91121,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85538,42 +38020,15 @@
+@@ -85605,42 +38053,15 @@
return 0;
}
_ACEOF
@@ -91041,7 +91167,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85603,11 +38058,7 @@
+@@ -85670,11 +38091,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -91054,7 +91180,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85623,52 +38074,25 @@
+@@ -85690,52 +38107,25 @@
return 0;
}
_ACEOF
@@ -91112,7 +91238,7 @@
$as_echo "yes" >&6; }
-@@ -85696,20 +38120,18 @@
+@@ -85763,20 +38153,18 @@
else
@@ -91137,7 +91263,7 @@
$as_echo "$pythondir" >&6; }
-@@ -85732,545 +38154,125 @@
+@@ -85799,545 +38187,125 @@
@@ -91763,7 +91889,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86288,63 +38290,32 @@
+@@ -86355,63 +38323,32 @@
return 0;
}
_ACEOF
@@ -91838,7 +91964,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86362,43 +38333,18 @@
+@@ -86429,43 +38366,18 @@
return 0;
}
_ACEOF
@@ -91888,7 +92014,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -86412,11 +38358,11 @@
+@@ -86479,11 +38391,11 @@
;;
no)
@@ -91902,7 +92028,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -86428,151 +38374,12 @@
+@@ -86495,151 +38407,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -92060,7 +92186,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -86581,151 +38388,12 @@
+@@ -86648,151 +38421,12 @@
done
@@ -92217,7 +92343,7 @@
_ACEOF
fi
-@@ -86733,168 +38401,26 @@
+@@ -86800,168 +38434,26 @@
done
@@ -92395,7 +92521,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86912,63 +38438,32 @@
+@@ -86979,63 +38471,32 @@
return 0;
}
_ACEOF
@@ -92470,7 +92596,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86986,43 +38481,18 @@
+@@ -87053,43 +38514,18 @@
return 0;
}
_ACEOF
@@ -92520,7 +92646,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -87042,7 +38512,7 @@
+@@ -87109,7 +38545,7 @@
;;
esac
else
@@ -92529,7 +92655,7 @@
$as_echo "no" >&6; }
fi
-@@ -87051,163 +38521,70 @@
+@@ -87118,163 +38554,70 @@
# The readline API changed slightly from readline3 to readline4, so
# code will generate warnings on one of them unless we have a few
# special cases.
@@ -92730,7 +92856,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87225,60 +38602,31 @@
+@@ -87292,60 +38635,31 @@
return 0;
}
_ACEOF
@@ -92801,7 +92927,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -87333,7 +38681,7 @@
+@@ -87400,7 +38714,7 @@
###################################
"
@@ -92810,7 +92936,7 @@
$as_echo "no" >&6; }
fi
-@@ -87342,102 +38690,9 @@
+@@ -87409,102 +38723,9 @@
@@ -92915,7 +93041,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87446,102 +38701,9 @@
+@@ -87513,102 +38734,9 @@
fi
@@ -93020,7 +93146,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87551,151 +38713,12 @@
+@@ -87618,151 +38746,12 @@
fi
@@ -93176,7 +93302,7 @@
_ACEOF
else
-@@ -87705,30 +38728,6 @@
+@@ -87772,30 +38761,6 @@
done
@@ -93207,7 +93333,7 @@
for ac_header in \
crypt.h \
curses.h \
-@@ -87755,147 +38754,11 @@
+@@ -87822,147 +38787,11 @@
netinet6/in6.h \
libintl.h
@@ -93360,7 +93486,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -87905,42 +38768,6 @@
+@@ -87972,42 +38801,6 @@
done
@@ -93403,7 +93529,7 @@
for ac_func in \
atexit \
cgetent \
-@@ -87979,98 +38806,11 @@
+@@ -88046,98 +38839,11 @@
freehostent \
writev
@@ -93507,7 +93633,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -88081,17 +38821,13 @@
+@@ -88148,17 +38854,13 @@
@@ -93528,7 +93654,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -88104,140 +38840,25 @@
+@@ -88171,140 +38873,25 @@
return 0;
}
_ACEOF
@@ -93678,7 +93804,7 @@
_ACEOF
fi
-@@ -88253,177 +38874,58 @@
+@@ -88320,177 +38907,58 @@
#define $ac_tr_func 1
_ACEOF
@@ -93883,7 +94009,7 @@
_ACEOF
fi
-@@ -88439,11 +38941,11 @@
+@@ -88506,11 +38974,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -93897,7 +94023,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -88454,25 +38956,21 @@
+@@ -88521,25 +38989,21 @@
@@ -93927,7 +94053,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -88482,63 +38980,45 @@
+@@ -88549,63 +39013,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -94002,7 +94128,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -88551,35 +39031,14 @@
+@@ -88618,35 +39064,14 @@
return 0;
}
_ACEOF
@@ -94041,7 +94167,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -88589,9 +39048,7 @@
+@@ -88656,9 +39081,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -94052,7 +94178,7 @@
fi
-@@ -88622,18 +39079,14 @@
+@@ -88689,18 +39112,14 @@
@@ -94074,7 +94200,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -88650,44 +39103,15 @@
+@@ -88717,44 +39136,15 @@
return 0;
}
_ACEOF
@@ -94124,7 +94250,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -88699,44 +39123,19 @@
+@@ -88766,44 +39156,19 @@
return 0;
}
_ACEOF
@@ -94174,7 +94300,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -88744,81 +39143,23 @@
+@@ -88811,81 +39176,23 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -94262,7 +94388,7 @@
fi
-@@ -88837,23 +39178,17 @@
+@@ -88904,23 +39211,17 @@
@@ -94289,7 +94415,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -88871,54 +39206,28 @@
+@@ -88938,54 +39239,28 @@
return 0;
}
_ACEOF
@@ -94351,7 +94477,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -88935,7 +39244,6 @@
+@@ -89002,7 +39277,6 @@
fi
@@ -94359,7 +94485,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -88955,23 +39263,17 @@
+@@ -89022,23 +39296,17 @@
@@ -94386,7 +94512,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -88989,54 +39291,28 @@
+@@ -89056,54 +39324,28 @@
return 0;
}
_ACEOF
@@ -94448,7 +94574,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -89053,7 +39329,6 @@
+@@ -89120,7 +39362,6 @@
fi
@@ -94456,7 +94582,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -89077,151 +39352,12 @@
+@@ -89144,151 +39385,12 @@
@@ -94612,7 +94738,7 @@
_ACEOF
fi
-@@ -89229,22 +39365,9 @@
+@@ -89296,22 +39398,9 @@
done
@@ -94637,7 +94763,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -89255,46 +39378,10 @@
+@@ -89322,46 +39411,10 @@
#include <arpa/nameser.h>
#endif
@@ -94687,7 +94813,7 @@
_ACEOF
fi
-@@ -89306,9 +39393,9 @@
+@@ -89373,9 +39426,9 @@
@@ -94699,7 +94825,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89323,11 +39410,7 @@
+@@ -89390,11 +39443,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94712,7 +94838,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89352,38 +39435,11 @@
+@@ -89419,38 +39468,11 @@
return 0;
}
_ACEOF
@@ -94754,7 +94880,7 @@
done
eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
LIBS="$ac_save_LIBS"
-@@ -89395,102 +39451,12 @@
+@@ -89462,102 +39484,12 @@
eval "ac_res=\$ac_cv_funclib_res_search"
if false; then
@@ -94862,7 +94988,7 @@
_ACEOF
fi
-@@ -89510,13 +39476,13 @@
+@@ -89577,13 +39509,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -94878,7 +95004,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89530,7 +39496,7 @@
+@@ -89597,7 +39529,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -94887,7 +95013,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89545,9 +39511,9 @@
+@@ -89612,9 +39544,9 @@
@@ -94899,7 +95025,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89562,11 +39528,7 @@
+@@ -89629,11 +39561,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94912,7 +95038,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89591,38 +39553,11 @@
+@@ -89658,38 +39586,11 @@
return 0;
}
_ACEOF
@@ -94954,7 +95080,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -89634,102 +39569,12 @@
+@@ -89701,102 +39602,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -95062,7 +95188,7 @@
_ACEOF
fi
-@@ -89749,13 +39594,13 @@
+@@ -89816,13 +39627,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95078,7 +95204,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89769,7 +39614,7 @@
+@@ -89836,7 +39647,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95087,7 +95213,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89784,9 +39629,9 @@
+@@ -89851,9 +39662,9 @@
@@ -95099,7 +95225,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89801,11 +39646,7 @@
+@@ -89868,11 +39679,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95112,7 +95238,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89830,38 +39671,11 @@
+@@ -89897,38 +39704,11 @@
return 0;
}
_ACEOF
@@ -95154,7 +95280,7 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -89872,103 +39686,13 @@
+@@ -89939,103 +39719,13 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
@@ -95264,7 +95390,7 @@
_ACEOF
fi
-@@ -89988,13 +39712,13 @@
+@@ -90055,13 +39745,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95280,7 +95406,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90008,7 +39732,7 @@
+@@ -90075,7 +39765,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95289,7 +95415,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90023,9 +39747,9 @@
+@@ -90090,9 +39780,9 @@
@@ -95301,7 +95427,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90040,11 +39764,7 @@
+@@ -90107,11 +39797,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95314,7 +95440,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -90069,38 +39789,11 @@
+@@ -90136,38 +39822,11 @@
return 0;
}
_ACEOF
@@ -95356,7 +95482,7 @@
done
eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
LIBS="$ac_save_LIBS"
-@@ -90112,102 +39805,12 @@
+@@ -90179,102 +39838,12 @@
eval "ac_res=\$ac_cv_funclib_dn_expand"
if false; then
@@ -95464,7 +95590,7 @@
_ACEOF
fi
-@@ -90227,13 +39830,13 @@
+@@ -90294,13 +39863,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95480,7 +95606,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90247,7 +39850,7 @@
+@@ -90314,7 +39883,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95489,7 +95615,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90259,18 +39862,14 @@
+@@ -90326,18 +39895,14 @@
@@ -95511,7 +95637,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -90294,44 +39893,15 @@
+@@ -90361,44 +39926,15 @@
return 0;
}
_ACEOF
@@ -95561,7 +95687,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -90343,44 +39913,19 @@
+@@ -90410,44 +39946,19 @@
return 0;
}
_ACEOF
@@ -95611,7 +95737,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -90388,18 +39933,7 @@
+@@ -90455,18 +39966,7 @@
#define HAVE__RES 1
_ACEOF
@@ -95631,7 +95757,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -90412,64 +39946,17 @@
+@@ -90479,64 +39979,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -95701,7 +95827,7 @@
fi
-@@ -90535,9 +40022,9 @@
+@@ -90602,9 +40055,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -95713,7 +95839,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -90548,24 +40035,24 @@
+@@ -90615,24 +40068,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -95743,7 +95869,7 @@
$as_echo "no" >&6; }
fi
-@@ -90594,20 +40081,20 @@
+@@ -90661,20 +40114,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -95771,7 +95897,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90616,19 +40103,17 @@
+@@ -90683,19 +40136,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -95795,7 +95921,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90636,55 +40121,29 @@
+@@ -90703,55 +40154,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -95859,7 +95985,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -90693,52 +40152,24 @@
+@@ -90760,52 +40185,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -95919,7 +96045,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -90748,9 +40179,9 @@
+@@ -90815,9 +40212,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -95931,7 +96057,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -90763,9 +40194,9 @@
+@@ -90830,9 +40227,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -95943,7 +96069,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -90776,24 +40207,24 @@
+@@ -90843,24 +40240,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -95973,7 +96099,7 @@
$as_echo "no" >&6; }
fi
-@@ -90806,9 +40237,9 @@
+@@ -90873,9 +40270,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -95985,7 +96111,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -90816,7 +40247,7 @@
+@@ -90883,7 +40280,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -95994,7 +96120,7 @@
$as_echo_n "checking working LEX YACC combination... " >&6; }
LEX_YACC="no"
if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-@@ -90832,7 +40263,7 @@
+@@ -90899,7 +40296,7 @@
LEX=false
YACC=false
fi
@@ -96003,7 +96129,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -90840,21 +40271,15 @@
+@@ -90907,21 +40304,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -96028,7 +96154,7 @@
HAVE_GSSAPI=YES
-@@ -90946,9 +40371,7 @@
+@@ -91013,9 +40404,7 @@
VPATH="$VPATH:\$(HEIMDAL_VPATH)"
@@ -96039,7 +96165,7 @@
-@@ -90957,170 +40380,27 @@
+@@ -91024,170 +40413,27 @@
"
@@ -96217,7 +96343,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91138,46 +40418,15 @@
+@@ -91205,46 +40451,15 @@
return 0;
}
_ACEOF
@@ -96268,7 +96394,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91195,65 +40444,32 @@
+@@ -91262,65 +40477,32 @@
return 0;
}
_ACEOF
@@ -96342,7 +96468,7 @@
/* end confdefs.h. */
/* Define backtrace to an innocuous variant, in case <limits.h> declares backtrace.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -91294,43 +40510,18 @@
+@@ -91361,43 +40543,18 @@
return 0;
}
_ACEOF
@@ -96392,7 +96518,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -91338,7 +40529,6 @@
+@@ -91405,7 +40562,6 @@
fi
@@ -96400,7 +96526,7 @@
if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -91369,362 +40559,43 @@
+@@ -91436,362 +40592,43 @@
"
@@ -96797,7 +96923,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -91734,65 +40605,16 @@
+@@ -91801,65 +40638,16 @@
done
@@ -96868,7 +96994,7 @@
_ACEOF
fi
-@@ -91805,19 +40627,15 @@
+@@ -91872,19 +40660,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -96892,7 +97018,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -91831,51 +40649,22 @@
+@@ -91898,51 +40682,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -96950,7 +97076,7 @@
fi
fi
-@@ -91888,16 +40677,12 @@
+@@ -91955,16 +40710,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -96970,7 +97096,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -91909,64 +40694,33 @@
+@@ -91976,64 +40727,33 @@
return 0;
}
_ACEOF
@@ -97044,7 +97170,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -91978,59 +40732,32 @@
+@@ -92045,59 +40765,32 @@
return 0;
}
_ACEOF
@@ -97112,7 +97238,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -92043,71 +40770,38 @@
+@@ -92110,71 +40803,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -97194,7 +97320,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -92126,71 +40820,38 @@
+@@ -92193,71 +40853,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97276,7 +97402,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -92200,71 +40861,38 @@
+@@ -92267,71 +40894,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -97358,7 +97484,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92280,71 +40908,38 @@
+@@ -92347,71 +40941,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97440,7 +97566,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92364,201 +40959,33 @@
+@@ -92431,201 +40992,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -97653,7 +97779,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92567,19 +40994,15 @@
+@@ -92634,19 +41027,15 @@
done
@@ -97676,7 +97802,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92597,46 +41020,15 @@
+@@ -92664,46 +41053,15 @@
return 0;
}
_ACEOF
@@ -97727,7 +97853,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92654,65 +41046,32 @@
+@@ -92721,65 +41079,32 @@
return 0;
}
_ACEOF
@@ -97801,7 +97927,7 @@
/* end confdefs.h. */
/* Define flistxattr to an innocuous variant, in case <limits.h> declares flistxattr.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -92753,50 +41112,24 @@
+@@ -92820,50 +41145,24 @@
return 0;
}
_ACEOF
@@ -97858,7 +97984,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -92806,18 +41139,14 @@
+@@ -92873,18 +41172,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -97880,7 +98006,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -92840,48 +41169,23 @@
+@@ -92907,48 +41202,23 @@
return 0;
}
_ACEOF
@@ -97934,7 +98060,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -92893,20 +41197,16 @@
+@@ -92960,20 +41230,16 @@
fi
@@ -97959,7 +98085,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -92921,117 +41221,55 @@
+@@ -92988,117 +41254,55 @@
}
_ACEOF
@@ -98093,7 +98219,7 @@
fi
-@@ -93039,7 +41277,7 @@
+@@ -93106,7 +41310,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -98102,7 +98228,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -93048,169 +41286,26 @@
+@@ -93115,169 +41319,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -98280,7 +98406,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -93228,43 +41323,18 @@
+@@ -93295,43 +41356,18 @@
return 0;
}
_ACEOF
@@ -98330,7 +98456,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -93276,9 +41346,9 @@
+@@ -93343,9 +41379,9 @@
fi
fi
@@ -98342,7 +98468,7 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -93291,157 +41361,17 @@
+@@ -93358,157 +41394,17 @@
break
fi
done
@@ -98510,7 +98636,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -93480,12 +41410,10 @@
+@@ -93547,12 +41443,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -98525,7 +98651,7 @@
else
if test "$withval" != "yes" ; then
-@@ -93497,26 +41425,20 @@
+@@ -93564,26 +41458,20 @@
LIBS=-liconv
@@ -98560,7 +98686,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93529,33 +41451,10 @@
+@@ -93596,33 +41484,10 @@
}
_ACEOF
@@ -98597,7 +98723,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93563,29 +41462,17 @@
+@@ -93630,29 +41495,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98632,7 +98758,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93598,33 +41485,10 @@
+@@ -93665,33 +41518,10 @@
}
_ACEOF
@@ -98669,7 +98795,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93632,28 +41496,17 @@
+@@ -93699,28 +41529,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98704,7 +98830,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93666,33 +41519,10 @@
+@@ -93733,33 +41552,10 @@
}
_ACEOF
@@ -98741,7 +98867,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93700,31 +41530,22 @@
+@@ -93767,31 +41563,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98779,7 +98905,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -93737,17 +41558,13 @@
+@@ -93804,17 +41591,13 @@
if test x$ICONV_FOUND = xno; then
@@ -98801,7 +98927,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93760,49 +41577,20 @@
+@@ -93827,49 +41610,20 @@
}
_ACEOF
@@ -98857,7 +98983,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -93819,24 +41607,20 @@
+@@ -93886,24 +41640,20 @@
LIBS=-liconv
@@ -98889,7 +99015,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93849,33 +41633,10 @@
+@@ -93916,33 +41666,10 @@
}
_ACEOF
@@ -98926,7 +99052,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93883,27 +41644,17 @@
+@@ -93950,27 +41677,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98958,7 +99084,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93916,33 +41667,10 @@
+@@ -93983,33 +41700,10 @@
}
_ACEOF
@@ -98995,7 +99121,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93950,26 +41678,17 @@
+@@ -94017,26 +41711,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99027,7 +99153,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93982,33 +41701,10 @@
+@@ -94049,33 +41734,10 @@
}
_ACEOF
@@ -99064,7 +99190,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94016,29 +41712,22 @@
+@@ -94083,29 +41745,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99099,7 +99225,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -94046,7 +41735,7 @@
+@@ -94113,7 +41768,7 @@
done
if test x"$ICONV_FOUND" = x"no"; then
@@ -99108,7 +99234,7 @@
Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
-@@ -94059,9 +41748,7 @@
+@@ -94126,9 +41781,7 @@
else
@@ -99119,7 +99245,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94082,203 +41769,23 @@
+@@ -94149,203 +41802,23 @@
@@ -99331,7 +99457,7 @@
_ACEOF
fi
-@@ -94357,151 +41864,12 @@
+@@ -94424,151 +41897,12 @@
@@ -99487,7 +99613,7 @@
_ACEOF
fi
-@@ -94511,23 +41879,17 @@
+@@ -94578,23 +41912,17 @@
@@ -99514,7 +99640,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94545,54 +41907,28 @@
+@@ -94612,54 +41940,28 @@
return 0;
}
_ACEOF
@@ -99576,7 +99702,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -94608,18 +41944,13 @@
+@@ -94675,18 +41977,13 @@
fi
@@ -99598,7 +99724,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -94637,40 +41968,19 @@
+@@ -94704,40 +42001,19 @@
return 0;
}
_ACEOF
@@ -99641,7 +99767,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -94729,9 +42039,9 @@
+@@ -94796,9 +42072,9 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -99653,7 +99779,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94744,14 +42054,14 @@
+@@ -94811,14 +42087,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99671,7 +99797,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94760,10 +42070,10 @@
+@@ -94827,10 +42103,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99684,7 +99810,7 @@
$as_echo "no" >&6; }
fi
-@@ -94779,52 +42089,27 @@
+@@ -94846,52 +42122,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -99744,7 +99870,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -94832,22 +42117,16 @@
+@@ -94899,22 +42150,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTALLOC} = \"YES\";"
@@ -99771,7 +99897,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -94862,7 +42141,7 @@
+@@ -94929,7 +42174,7 @@
ac_cv_LIBTALLOC_found=yes
else
@@ -99780,7 +99906,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= $TALLOC_MIN_VERSION'
ac_cv_LIBTALLOC_found=no
-@@ -94892,9 +42171,9 @@
+@@ -94959,9 +42204,9 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -99792,7 +99918,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94907,14 +42186,14 @@
+@@ -94974,14 +42219,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99810,7 +99936,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94923,10 +42202,10 @@
+@@ -94990,10 +42235,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99823,7 +99949,7 @@
$as_echo "no" >&6; }
fi
-@@ -94942,52 +42221,27 @@
+@@ -95009,52 +42254,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -99883,7 +100009,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -94995,22 +42249,16 @@
+@@ -95062,22 +42282,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTDB} = \"YES\";"
@@ -99910,7 +100036,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95025,7 +42273,7 @@
+@@ -95092,7 +42306,7 @@
ac_cv_LIBTDB_found=yes
else
@@ -99919,7 +100045,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= $TDB_MIN_VERSION'
ac_cv_LIBTDB_found=no
-@@ -95050,9 +42298,7 @@
+@@ -95117,9 +42331,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -99930,7 +100056,7 @@
fi
TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"
-@@ -95065,104 +42311,12 @@
+@@ -95132,104 +42344,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -100040,7 +100166,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -95170,151 +42324,12 @@
+@@ -95237,151 +42357,12 @@
fi
done
@@ -100198,7 +100324,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95325,17 +42340,13 @@
+@@ -95392,17 +42373,13 @@
@@ -100219,7 +100345,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95346,56 +42357,29 @@
+@@ -95413,56 +42390,29 @@
return 0;
}
_ACEOF
@@ -100283,7 +100409,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95406,41 +42390,18 @@
+@@ -95473,41 +42423,18 @@
return 0;
}
_ACEOF
@@ -100329,7 +100455,7 @@
fi
-@@ -95466,9 +42427,9 @@
+@@ -95533,9 +42460,9 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -100341,7 +100467,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95481,14 +42442,14 @@
+@@ -95548,14 +42475,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100359,7 +100485,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95497,10 +42458,10 @@
+@@ -95564,10 +42491,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100372,7 +100498,7 @@
$as_echo "no" >&6; }
fi
-@@ -95516,52 +42477,27 @@
+@@ -95583,52 +42510,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100432,7 +100558,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -95569,22 +42505,16 @@
+@@ -95636,22 +42538,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTEVENT} = \"YES\";"
@@ -100459,7 +100585,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95599,7 +42529,7 @@
+@@ -95666,7 +42562,7 @@
ac_cv_LIBTEVENT_found=yes
else
@@ -100468,7 +100594,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = $TEVENT_REQUIRED_VERSION'
ac_cv_LIBTEVENT_found=no
-@@ -95628,9 +42558,7 @@
+@@ -95695,9 +42591,7 @@
fi
done
if test x"$teventdir" = "x"; then
@@ -100479,7 +100605,7 @@
fi
fi
-@@ -95648,253 +42576,24 @@
+@@ -95715,253 +42609,24 @@
TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
@@ -100741,7 +100867,7 @@
_ACEOF
fi
-@@ -95903,9 +42602,7 @@
+@@ -95970,9 +42635,7 @@
if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
@@ -100752,7 +100878,7 @@
fi
-@@ -95971,9 +42668,9 @@
+@@ -96034,9 +42697,9 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -100764,7 +100890,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95986,14 +42683,14 @@
+@@ -96049,14 +42712,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100782,7 +100908,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96002,10 +42699,10 @@
+@@ -96065,10 +42728,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100795,7 +100921,7 @@
$as_echo "no" >&6; }
fi
-@@ -96021,52 +42718,27 @@
+@@ -96084,52 +42747,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100855,7 +100981,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -96074,22 +42746,16 @@
+@@ -96137,22 +42775,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBLDB} = \"YES\";"
@@ -100882,7 +101008,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96104,7 +42770,7 @@
+@@ -96167,7 +42799,7 @@
ac_cv_LIBLDB_found=yes
else
@@ -100891,7 +101017,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = $LDB_REQUIRED_VERSION'
ac_cv_LIBLDB_found=no
-@@ -96150,12 +42816,12 @@
+@@ -96213,12 +42845,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -100906,7 +101032,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -96164,157 +42830,18 @@
+@@ -96227,157 +42859,18 @@
fi
@@ -101070,7 +101196,7 @@
_ACEOF
fi
-@@ -96324,11 +42851,9 @@
+@@ -96387,11 +42880,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101084,7 +101210,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -96343,23 +42868,17 @@
+@@ -96406,23 +42897,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -101111,7 +101237,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96377,54 +42896,28 @@
+@@ -96440,54 +42925,28 @@
return 0;
}
_ACEOF
@@ -101173,7 +101299,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -96440,21 +42933,16 @@
+@@ -96503,21 +42962,16 @@
fi
@@ -101199,7 +101325,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -96466,11 +42954,9 @@
+@@ -96529,11 +42983,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101213,7 +101339,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -96531,7 +43017,7 @@
+@@ -96594,7 +43046,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -101222,7 +101348,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -96545,9 +43031,9 @@
+@@ -96608,9 +43060,9 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -101234,7 +101360,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96560,14 +43046,14 @@
+@@ -96623,14 +43075,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -101252,7 +101378,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96576,10 +43062,10 @@
+@@ -96639,10 +43091,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -101265,7 +101391,7 @@
$as_echo "no" >&6; }
fi
-@@ -96595,52 +43081,27 @@
+@@ -96658,52 +43110,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -101325,7 +101451,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -96648,22 +43109,16 @@
+@@ -96711,22 +43138,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{GNUTLS} = \"YES\";"
@@ -101352,7 +101478,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96678,7 +43133,7 @@
+@@ -96741,7 +43162,7 @@
ac_cv_GNUTLS_found=yes
else
@@ -101361,7 +101487,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls < 2.6.0'
ac_cv_GNUTLS_found=no
-@@ -96695,770 +43150,161 @@
+@@ -96758,770 +43179,161 @@
use_gnutls=no
fi
@@ -102227,7 +102353,7 @@
_ACEOF
fi
-@@ -97467,23 +43313,17 @@
+@@ -97530,23 +43342,17 @@
@@ -102254,7 +102380,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97501,54 +43341,28 @@
+@@ -97564,54 +43370,28 @@
return 0;
}
_ACEOF
@@ -102316,7 +102442,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -97564,7 +43378,6 @@
+@@ -97627,7 +43407,6 @@
fi
@@ -102324,7 +102450,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -97602,19 +43415,17 @@
+@@ -97665,19 +43444,17 @@
#################################################
# check for pthread support
@@ -102348,7 +102474,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97632,12 +43443,12 @@
+@@ -97695,12 +43472,12 @@
;;
*)
@@ -102363,7 +102489,7 @@
$as_echo "no" >&6; }
fi
-@@ -97653,274 +43464,45 @@
+@@ -97716,274 +43493,45 @@
@@ -102651,7 +102777,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97938,54 +43520,28 @@
+@@ -98001,54 +43549,28 @@
return 0;
}
_ACEOF
@@ -102713,7 +102839,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -98001,15 +43557,14 @@
+@@ -98064,15 +43586,14 @@
fi
@@ -102731,7 +102857,7 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98019,22 +43574,20 @@
+@@ -98082,22 +43603,20 @@
\$enabled{SETPROCTITLE} = \"YES\";"
@@ -102758,7 +102884,7 @@
$as_echo "no" >&6; }
fi
-@@ -98052,17 +43605,13 @@
+@@ -98115,17 +43634,13 @@
@@ -102779,7 +102905,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -98081,209 +43630,43 @@
+@@ -98144,209 +43659,43 @@
return 0;
}
_ACEOF
@@ -103000,7 +103126,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98301,46 +43684,15 @@
+@@ -98364,46 +43713,15 @@
return 0;
}
_ACEOF
@@ -103051,7 +103177,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98353,70 +43705,37 @@
+@@ -98416,70 +43734,37 @@
int
main ()
{
@@ -103135,7 +103261,7 @@
/* end confdefs.h. */
/* Define blkid_get_cache to an innocuous variant, in case <limits.h> declares blkid_get_cache.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -98457,50 +43776,24 @@
+@@ -98520,50 +43805,24 @@
return 0;
}
_ACEOF
@@ -103192,7 +103318,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -98511,9 +43804,7 @@
+@@ -98574,9 +43833,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -103203,7 +103329,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98541,102 +43832,12 @@
+@@ -98604,102 +43861,12 @@
fi
@@ -103310,7 +103436,7 @@
_ACEOF
fi
-@@ -98646,151 +43847,12 @@
+@@ -98709,151 +43876,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -103466,7 +103592,7 @@
_ACEOF
fi
-@@ -98799,23 +43861,17 @@
+@@ -98862,23 +43890,17 @@
@@ -103493,7 +103619,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98833,54 +43889,28 @@
+@@ -98896,54 +43918,28 @@
return 0;
}
_ACEOF
@@ -103555,7 +103681,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -98895,7 +43925,6 @@
+@@ -98958,7 +43954,6 @@
fi
@@ -103563,7 +103689,7 @@
if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98921,23 +43950,17 @@
+@@ -98984,23 +43979,17 @@
# test for where we get crypt() from
@@ -103590,7 +103716,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98955,54 +43978,28 @@
+@@ -99018,54 +44007,28 @@
return 0;
}
_ACEOF
@@ -103652,7 +103778,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -99018,7 +44015,6 @@
+@@ -99081,7 +44044,6 @@
fi
@@ -103660,7 +103786,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -99035,102 +44031,12 @@
+@@ -99098,102 +44060,12 @@
@@ -103768,7 +103894,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -99139,151 +44045,12 @@
+@@ -99202,151 +44074,12 @@
done
@@ -103924,7 +104050,7 @@
_ACEOF
fi
-@@ -99292,330 +44059,18 @@
+@@ -99355,330 +44088,18 @@
@@ -104259,7 +104385,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -99623,70 +44078,125 @@
+@@ -99686,70 +44107,125 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -104431,7 +104557,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -99697,41 +44207,18 @@
+@@ -99760,41 +44236,18 @@
return 0;
}
_ACEOF
@@ -104477,7 +104603,7 @@
fi
-@@ -99775,17 +44262,13 @@
+@@ -99838,17 +44291,13 @@
fi
@@ -104498,7 +104624,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -99796,56 +44279,29 @@
+@@ -99859,56 +44308,29 @@
return 0;
}
_ACEOF
@@ -104562,7 +104688,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -99856,41 +44312,18 @@
+@@ -99919,41 +44341,18 @@
return 0;
}
_ACEOF
@@ -104608,7 +104734,7 @@
fi
-@@ -99914,151 +44347,12 @@
+@@ -99977,151 +44376,12 @@
fi
@@ -104765,7 +104891,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -100372,151 +44666,12 @@
+@@ -100435,151 +44695,12 @@
@@ -104921,7 +105047,7 @@
_ACEOF
fi
-@@ -100526,23 +44681,17 @@
+@@ -100589,23 +44710,17 @@
@@ -104948,7 +105074,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100560,54 +44709,28 @@
+@@ -100623,54 +44738,28 @@
return 0;
}
_ACEOF
@@ -105010,7 +105136,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -100623,18 +44746,13 @@
+@@ -100686,18 +44775,13 @@
fi
@@ -105032,7 +105158,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -100652,40 +44770,19 @@
+@@ -100715,40 +44799,19 @@
return 0;
}
_ACEOF
@@ -105075,7 +105201,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -100799,87 +44896,54 @@
+@@ -100862,87 +44925,54 @@
#################################################
# Display summary of libraries detected
@@ -105179,7 +105305,7 @@
if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes" -o x"$picky_developer" = x"yes"; then
CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS)"
fi
-@@ -100938,13 +45002,13 @@
+@@ -101001,13 +45031,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -105195,7 +105321,7 @@
esac ;;
esac
done
-@@ -100952,8 +45016,8 @@
+@@ -101015,8 +45045,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -105206,7 +105332,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -100976,11 +45040,11 @@
+@@ -101039,11 +45069,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -105220,7 +105346,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -101000,8 +45064,8 @@
+@@ -101063,8 +45093,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -105231,7 +105357,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -101025,9 +45089,10 @@
+@@ -101088,9 +45118,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -105244,7 +105370,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -101037,17 +45102,18 @@
+@@ -101100,17 +45131,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -105270,7 +105396,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -101055,23 +45121,15 @@
+@@ -101118,23 +45150,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -105299,7 +105425,7 @@
as_nl='
'
export as_nl
-@@ -101079,7 +45137,13 @@
+@@ -101142,7 +45166,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -105314,7 +105440,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -101090,7 +45154,7 @@
+@@ -101153,7 +45183,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -105323,7 +105449,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -101113,13 +45177,6 @@
+@@ -101176,13 +45206,6 @@
}
fi
@@ -105337,7 +105463,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -101129,15 +45186,15 @@
+@@ -101192,15 +45215,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -105356,7 +105482,7 @@
IFS=$as_save_IFS
;;
-@@ -101149,12 +45206,16 @@
+@@ -101212,12 +45235,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -105377,7 +105503,7 @@
done
PS1='$ '
PS2='> '
-@@ -101166,7 +45227,89 @@
+@@ -101229,7 +45256,89 @@
LANGUAGE=C
export LANGUAGE
@@ -105468,7 +105594,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -101180,8 +45323,12 @@
+@@ -101243,8 +45352,12 @@
as_basename=false
fi
@@ -105482,7 +105608,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -101201,76 +45348,25 @@
+@@ -101264,76 +45377,25 @@
}
s/.*/./; q'`
@@ -105570,7 +105696,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -101299,8 +45395,56 @@
+@@ -101362,8 +45424,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -105628,7 +105754,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -101319,10 +45463,10 @@
+@@ -101382,10 +45492,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -105641,7 +105767,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -101337,13 +45481,19 @@
+@@ -101400,13 +45510,19 @@
exec 6>&1
@@ -105663,7 +105789,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -101375,10 +45525,11 @@
+@@ -101438,10 +45554,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -105678,7 +105804,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -101400,16 +45551,16 @@
+@@ -101463,16 +45580,16 @@
Configuration commands:
$config_commands
@@ -105698,7 +105824,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -101451,20 +45602,19 @@
+@@ -101514,20 +45631,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -105723,7 +105849,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -101472,11 +45622,10 @@
+@@ -101535,11 +45651,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -105738,7 +105864,7 @@
ac_need_defaults=false ;;
esac
-@@ -101569,9 +45718,7 @@
+@@ -101632,9 +45747,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -105749,7 +105875,7 @@
esac
done
-@@ -101598,7 +45745,7 @@
+@@ -101661,7 +45774,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -105758,7 +105884,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -101609,11 +45756,7 @@
+@@ -101672,11 +45785,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -105771,7 +105897,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -101621,10 +45764,16 @@
+@@ -101684,10 +45793,16 @@
if test -n "$CONFIG_FILES"; then
@@ -105791,7 +105917,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -101638,24 +45787,18 @@
+@@ -101701,24 +45816,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -105819,7 +105945,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101744,9 +45887,7 @@
+@@ -101807,9 +45916,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -105830,7 +105956,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -101787,9 +45928,7 @@
+@@ -101850,9 +45957,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -105841,7 +105967,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101874,9 +46013,7 @@
+@@ -101937,9 +46042,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -105852,7 +105978,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -101889,9 +46026,7 @@
+@@ -101952,9 +46055,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -105863,7 +105989,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -101919,12 +46054,10 @@
+@@ -101982,12 +46083,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -105878,7 +106004,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -101935,7 +46068,7 @@
+@@ -101998,7 +46097,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -105887,7 +106013,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -101948,9 +46081,7 @@
+@@ -102011,9 +46110,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -105898,7 +106024,7 @@
esac
;;
esac
-@@ -101978,47 +46109,7 @@
+@@ -102041,47 +46138,7 @@
q
}
s/.*/./; q'`
@@ -105947,7 +106073,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -102070,7 +46161,6 @@
+@@ -102133,7 +46190,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -105955,7 +106081,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -102080,12 +46170,11 @@
+@@ -102143,12 +46199,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -105970,7 +106096,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -102095,7 +46184,7 @@
+@@ -102158,7 +46213,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -105979,7 +106105,7 @@
esac
_ACEOF
-@@ -102123,14 +46212,12 @@
+@@ -102186,14 +46241,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -105996,7 +106122,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -102140,9 +46227,7 @@
+@@ -102203,9 +46256,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -106007,7 +106133,7 @@
;;
:H)
#
-@@ -102153,29 +46238,23 @@
+@@ -102216,29 +46267,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -106042,7 +106168,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -102201,15 +46280,12 @@
+@@ -102264,15 +46309,12 @@
done # for ac_tag
@@ -106060,7 +106186,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -102230,10 +46306,10 @@
+@@ -102293,10 +46335,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -106073,7 +106199,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -102244,8 +46320,8 @@
+@@ -102307,8 +46349,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
Modified: trunk/samba/debian/patches/external-talloc-support.patch
===================================================================
--- trunk/samba/debian/patches/external-talloc-support.patch 2009-09-13 20:20:40 UTC (rev 3049)
+++ trunk/samba/debian/patches/external-talloc-support.patch 2009-09-14 07:48:53 UTC (rev 3050)
@@ -3,49 +3,16 @@
make error when libtalloc is not being built.
Author: Steve Langasek <vorlon at debian.org>
-Index: samba-deb.clean/source3/Makefile.in
-===================================================================
---- samba-deb.clean.orig/source3/Makefile.in
-+++ samba-deb.clean/source3/Makefile.in
-@@ -1694,11 +1694,11 @@
- LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
- LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
- LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
--LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
--LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-+ at NO_LIBTALLOC@LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
-+ at NO_LIBTALLOC@LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
--$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-- @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-+ at NO_LIBTALLOC@$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-+ at NO_LIBTALLOC@ @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-
- $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
- @echo Linking shared library $@
Index: samba-deb.clean/source3/configure.in
===================================================================
--- samba-deb.clean.orig/source3/configure.in
+++ samba-deb.clean/source3/configure.in
-@@ -49,6 +49,7 @@
- LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
- done
- AC_SUBST(LIBTALLOC_OBJ0)
-+AC_SUBST(NO_LIBTALLOC)
+@@ -42,6 +42,8 @@
+ if test "x$enable_external_libtalloc" != xyes
+ then
+ m4_include(../lib/talloc/libtalloc.m4)
++else
++ tallocdir=../lib/talloc
+ fi
m4_include(../lib/tevent/libtevent.m4)
-
-@@ -4749,6 +4750,13 @@
- # be extracted from their respective source directories
- #
- SMB_LIBRARY(talloc, 1)
-+if test "x$enable_external_libtalloc" = xyes
-+then
-+ NO_LIBTALLOC='#'
-+ LIBTALLOC_STATIC=
-+ tallocdir=../lib/talloc
-+fi
-+
- SMB_LIBRARY(tdb, 1)
- SMB_LIBRARY(netapi, 0)
- SMB_LIBRARY(smbclient, 0)
More information about the Pkg-samba-maint
mailing list